Compare revisions

Ryan Hendrickson · Marge Bot · Sebastian Graf · Marge Bot · Sebastian Graf · Marge Bot
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -101,10 +101,10 @@ workflow:
 # which versions of GHC to allow bootstrap with
 .bootstrap_matrix : &bootstrap_matrix
  matrix:
-    - GHC_VERSION: 9.6.4
-      DOCKER_IMAGE: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10-ghc9_6:$DOCKER_REV"
    - GHC_VERSION: 9.8.1
      DOCKER_IMAGE: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10-ghc9_8:$DOCKER_REV"
+    - GHC_VERSION: 9.10.1
+      DOCKER_IMAGE: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10-ghc9_10:$DOCKER_REV"

 # Allow linters to fail on draft MRs.
 # This must be explicitly transcluded in lint jobs which

--- a/.gitlab/ci.sh
+++ b/.gitlab/ci.sh
@@ -556,7 +556,7 @@ function install_bindist() {

      run ${CONFIGURE_WRAPPER:-} ./configure \
          --prefix="$instdir" \
-          "${args[@]+"${args[@]}"}"
+          "${args[@]+"${args[@]}"}" || fail "bindist configure failed"
      make_install_destdir "$TOP"/destdir "$instdir"
      # And check the `--info` of the installed compiler, sometimes useful in CI log.
      "$instdir"/bin/ghc --info

--- a/.gitlab/darwin/toolchain.nix
+++ b/.gitlab/darwin/toolchain.nix
@@ -36,6 +36,7 @@ let
      "AR=/usr/bin/ar"
      "LLC=${llvm}/bin/llc"
      "OPT=${llvm}/bin/opt"
+      "LLVMAS=${llvm_clang}/bin/clang"
      "CONF_CC_OPTS_STAGE2=--target=${targetTriple}"
      "CONF_CXX_OPTS_STAGE2=--target=${targetTriple}"
      "CONF_GCC_LINKER_OPTS_STAGE2=--target=${targetTriple}"
@@ -97,6 +98,7 @@ let
  fonts = with pkgs; makeFontsConf { fontDirectories = [ dejavu_fonts ]; };

  llvm = pkgs.llvm_15;
+  llvm_clang = pkgs.llvmPackages_15.clang-unwrapped;
 in
 pkgs.writeTextFile {
  name = "toolchain";
@@ -112,6 +114,7 @@ pkgs.writeTextFile {
    export GHC="${ghc}/bin/ghc"
    export LLC="${llvm}/bin/llc"
    export OPT="${llvm}/bin/opt"
+    export LLVMAS="${llvm_clang}/bin/clang"
    export SPHINXBUILD="${pkgs.python3Packages.sphinx}/bin/sphinx-build"
    export CABAL_INSTALL="${pkgs.cabal-install}/bin/cabal"
    export CABAL="$CABAL_INSTALL"

--- a/.gitlab/generate-ci/gen_ci.hs
+++ b/.gitlab/generate-ci/gen_ci.hs
@@ -752,6 +752,7 @@ job arch opsys buildConfig = NamedJob { name = jobName, jobInfo = Job {..} }
      , "BUILD_FLAVOUR" =: flavourString jobFlavour
      , "BIGNUM_BACKEND" =: bignumString (bignumBackend buildConfig)
      , "CONFIGURE_ARGS" =: configureArgsStr buildConfig
+      , "INSTALL_CONFIGURE_ARGS" =: "--enable-strict-ghc-toolchain-check"
      , maybe mempty ("CONFIGURE_WRAPPER" =:) (configureWrapper buildConfig)
      , maybe mempty ("CROSS_TARGET" =:) (crossTarget buildConfig)
      , case crossEmulator buildConfig of

--- a/.gitlab/jobs.yaml
+++ b/.gitlab/jobs.yaml
@@ -58,6 +58,7 @@
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--docs=no-sphinx-pdfs",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "LANG": "en_US.UTF-8",
      "MACOSX_DEPLOYMENT_TARGET": "11.0",
      "NIX_SYSTEM": "aarch64-darwin",
@@ -122,6 +123,7 @@
      "BIN_DIST_NAME": "ghc-aarch64-linux-deb10-validate",
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "aarch64-linux-deb10-validate"
    }
@@ -183,6 +185,7 @@
      "BIN_DIST_NAME": "ghc-aarch64-linux-deb12-validate+llvm",
      "BUILD_FLAVOUR": "validate+llvm",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "aarch64-linux-deb12-validate+llvm"
    }
@@ -244,6 +247,7 @@
      "BIN_DIST_NAME": "ghc-i386-linux-deb10-validate",
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "i386-linux-deb10-validate"
    }
@@ -306,6 +310,7 @@
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--docs=no-sphinx-pdfs",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "LANG": "en_US.UTF-8",
      "MACOSX_DEPLOYMENT_TARGET": "11.0",
      "NIX_SYSTEM": "aarch64-darwin",
@@ -372,7 +377,7 @@
      "BROKEN_TESTS": "encoding004 T10458",
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
-      "INSTALL_CONFIGURE_ARGS": "--disable-ld-override",
+      "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "aarch64-linux-alpine3_18-validate",
      "XZ_OPT": "-9"
@@ -435,6 +440,7 @@
      "BIN_DIST_NAME": "ghc-aarch64-linux-deb10-validate",
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "aarch64-linux-deb10-validate",
      "XZ_OPT": "-9"
@@ -497,6 +503,7 @@
      "BIN_DIST_NAME": "ghc-aarch64-linux-deb11-validate",
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "aarch64-linux-deb11-validate",
      "XZ_OPT": "-9"
@@ -559,6 +566,7 @@
      "BIN_DIST_NAME": "ghc-aarch64-linux-deb12-validate+llvm",
      "BUILD_FLAVOUR": "validate+llvm",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "aarch64-linux-deb12-validate+llvm",
      "XZ_OPT": "-9"
@@ -621,6 +629,7 @@
      "BIN_DIST_NAME": "ghc-i386-linux-deb10-validate",
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "i386-linux-deb10-validate",
      "XZ_OPT": "-9"
@@ -684,6 +693,7 @@
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--docs=no-sphinx-pdfs",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "LANG": "en_US.UTF-8",
      "MACOSX_DEPLOYMENT_TARGET": "10.13",
      "NIX_SYSTEM": "x86_64-darwin",
@@ -753,7 +763,7 @@
      "BROKEN_TESTS": "ghcilink002 linker_unload_native encoding004 T10458",
      "BUILD_FLAVOUR": "validate+fully_static",
      "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
-      "INSTALL_CONFIGURE_ARGS": "--disable-ld-override",
+      "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-alpine3_12-int_native-validate+fully_static",
      "XZ_OPT": "-9"
@@ -817,7 +827,7 @@
      "BROKEN_TESTS": "encoding004 T10458",
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
-      "INSTALL_CONFIGURE_ARGS": "--disable-ld-override",
+      "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-alpine3_12-validate",
      "XZ_OPT": "-9"
@@ -881,7 +891,7 @@
      "BROKEN_TESTS": "ghcilink002 linker_unload_native encoding004 T10458",
      "BUILD_FLAVOUR": "validate+fully_static",
      "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
-      "INSTALL_CONFIGURE_ARGS": "--disable-ld-override",
+      "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-alpine3_12-validate+fully_static",
      "XZ_OPT": "-9"
@@ -945,7 +955,7 @@
      "BROKEN_TESTS": "encoding004 T10458",
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
-      "INSTALL_CONFIGURE_ARGS": "--disable-ld-override",
+      "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-alpine3_18-validate",
      "XZ_OPT": "-9"
@@ -1202,6 +1212,7 @@
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--docs=no-sphinx",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-centos7-validate",
      "XZ_OPT": "-9"
@@ -1264,6 +1275,7 @@
      "BIN_DIST_NAME": "ghc-x86_64-linux-deb10-int_native-validate",
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb10-int_native-validate",
      "XZ_OPT": "-9"
@@ -1326,6 +1338,7 @@
      "BIN_DIST_NAME": "ghc-x86_64-linux-deb10-no_tntc-validate",
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--disable-tables-next-to-code --enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb10-no_tntc-validate",
      "XZ_OPT": "-9"
@@ -1389,6 +1402,7 @@
      "BUILD_FLAVOUR": "slow-validate",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "ENABLE_NUMA": "1",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb10-numa-slow-validate",
      "XZ_OPT": "-9"
@@ -1451,6 +1465,7 @@
      "BIN_DIST_NAME": "ghc-x86_64-linux-deb10-unreg-validate",
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--enable-unregisterised --enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb10-unreg-validate",
      "XZ_OPT": "-9"
@@ -1513,6 +1528,7 @@
      "BIN_DIST_NAME": "ghc-x86_64-linux-deb10-validate",
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb10-validate",
      "XZ_OPT": "-9"
@@ -1575,6 +1591,7 @@
      "BIN_DIST_NAME": "ghc-x86_64-linux-deb10-validate+debug_info",
      "BUILD_FLAVOUR": "validate+debug_info",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb10-validate+debug_info",
      "XZ_OPT": "-9"
@@ -1637,6 +1654,7 @@
      "BIN_DIST_NAME": "ghc-x86_64-linux-deb10-zstd-validate",
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--enable-ipe-data-compression --enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb10-zstd-validate",
      "XZ_OPT": "-9"
@@ -1701,6 +1719,7 @@
      "CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check",
      "CROSS_EMULATOR": "qemu-aarch64 -L /usr/aarch64-linux-gnu",
      "CROSS_TARGET": "aarch64-linux-gnu",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb11-cross_aarch64-linux-gnu-validate",
      "XZ_OPT": "-9"
@@ -1766,6 +1785,7 @@
      "CONFIGURE_WRAPPER": "emconfigure",
      "CROSS_EMULATOR": "js-emulator",
      "CROSS_TARGET": "javascript-unknown-ghcjs",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb11-emsdk-closure-int_native-cross_javascript-unknown-ghcjs-validate",
      "XZ_OPT": "-9"
@@ -1828,6 +1848,7 @@
      "BIN_DIST_NAME": "ghc-x86_64-linux-deb11-validate",
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb11-validate",
      "XZ_OPT": "-9"
@@ -1890,6 +1911,7 @@
      "BIN_DIST_NAME": "ghc-x86_64-linux-deb11-validate+boot_nonmoving_gc",
      "BUILD_FLAVOUR": "validate+boot_nonmoving_gc",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "--way=nonmoving --way=nonmoving_thr --way=nonmoving_thr_sanity",
      "TEST_ENV": "x86_64-linux-deb11-validate+boot_nonmoving_gc",
      "XZ_OPT": "-9"
@@ -1952,6 +1974,7 @@
      "BIN_DIST_NAME": "ghc-x86_64-linux-deb12-validate",
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb12-validate",
      "XZ_OPT": "-9"
@@ -2014,6 +2037,7 @@
      "BIN_DIST_NAME": "ghc-x86_64-linux-deb12-validate+llvm",
      "BUILD_FLAVOUR": "validate+llvm",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb12-validate+llvm",
      "XZ_OPT": "-9"
@@ -2077,6 +2101,7 @@
      "BUILD_FLAVOUR": "validate+thread_sanitizer_cmm",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--docs=none",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb12-validate+thread_sanitizer_cmm",
      "TSAN_OPTIONS": "suppressions=$CI_PROJECT_DIR/rts/.tsan-suppressions",
@@ -2140,6 +2165,7 @@
      "BIN_DIST_NAME": "ghc-x86_64-linux-deb9-validate",
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb9-validate",
      "XZ_OPT": "-9"
@@ -2202,6 +2228,7 @@
      "BIN_DIST_NAME": "ghc-x86_64-linux-fedora33-release",
      "BUILD_FLAVOUR": "release",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "LLC": "/bin/false",
      "OPT": "/bin/false",
      "RUNTEST_ARGS": "",
@@ -2267,6 +2294,7 @@
      "BUILD_FLAVOUR": "release",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--haddock-for-hackage",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "LLC": "/bin/false",
      "OPT": "/bin/false",
      "RUNTEST_ARGS": "",
@@ -2331,6 +2359,7 @@
      "BIN_DIST_NAME": "ghc-x86_64-linux-fedora33-validate+debug_info",
      "BUILD_FLAVOUR": "validate+debug_info",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "LLC": "/bin/false",
      "OPT": "/bin/false",
      "RUNTEST_ARGS": "",
@@ -2395,6 +2424,7 @@
      "BIN_DIST_NAME": "ghc-x86_64-linux-fedora38-validate",
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-fedora38-validate",
      "XZ_OPT": "-9"
@@ -2457,6 +2487,7 @@
      "BIN_DIST_NAME": "ghc-x86_64-linux-rocky8-validate",
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-rocky8-validate",
      "XZ_OPT": "-9"
@@ -2519,6 +2550,7 @@
      "BIN_DIST_NAME": "ghc-x86_64-linux-ubuntu18_04-validate",
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-ubuntu18_04-validate",
      "XZ_OPT": "-9"
@@ -2581,6 +2613,7 @@
      "BIN_DIST_NAME": "ghc-x86_64-linux-ubuntu20_04-validate",
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-ubuntu20_04-validate",
      "XZ_OPT": "-9"
@@ -2641,6 +2674,7 @@
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "GHC_VERSION": "9.6.4",
      "HADRIAN_ARGS": "--docs=no-sphinx-pdfs",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "LANG": "en_US.UTF-8",
      "MSYSTEM": "CLANG64",
      "RUNTEST_ARGS": "",
@@ -2703,6 +2737,7 @@
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "GHC_VERSION": "9.6.4",
      "HADRIAN_ARGS": "--docs=no-sphinx-pdfs",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "LANG": "en_US.UTF-8",
      "MSYSTEM": "CLANG64",
      "RUNTEST_ARGS": "",
@@ -2769,6 +2804,7 @@
      "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--hash-unit-ids --docs=no-sphinx-pdfs",
      "IGNORE_PERF_FAILURES": "all",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "LANG": "en_US.UTF-8",
      "MACOSX_DEPLOYMENT_TARGET": "11.0",
      "NIX_SYSTEM": "aarch64-darwin",
@@ -2837,7 +2873,7 @@
      "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--hash-unit-ids",
      "IGNORE_PERF_FAILURES": "all",
-      "INSTALL_CONFIGURE_ARGS": "--disable-ld-override",
+      "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "aarch64-linux-alpine3_18-release+no_split_sections",
      "XZ_OPT": "-9"
@@ -2902,6 +2938,7 @@
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--hash-unit-ids",
      "IGNORE_PERF_FAILURES": "all",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "aarch64-linux-deb10-release+no_split_sections",
      "XZ_OPT": "-9"
@@ -2966,6 +3003,7 @@
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--hash-unit-ids",
      "IGNORE_PERF_FAILURES": "all",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "aarch64-linux-deb11-release+no_split_sections",
      "XZ_OPT": "-9"
@@ -3030,6 +3068,7 @@
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--hash-unit-ids",
      "IGNORE_PERF_FAILURES": "all",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "i386-linux-deb10-release+no_split_sections",
      "XZ_OPT": "-9"
@@ -3094,6 +3133,7 @@
      "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--hash-unit-ids --docs=no-sphinx-pdfs",
      "IGNORE_PERF_FAILURES": "all",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "LANG": "en_US.UTF-8",
      "MACOSX_DEPLOYMENT_TARGET": "10.13",
      "NIX_SYSTEM": "x86_64-darwin",
@@ -3165,7 +3205,7 @@
      "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--hash-unit-ids",
      "IGNORE_PERF_FAILURES": "all",
-      "INSTALL_CONFIGURE_ARGS": "--disable-ld-override",
+      "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-alpine3_12-int_native-release+fully_static",
      "XZ_OPT": "-9"
@@ -3231,7 +3271,7 @@
      "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--hash-unit-ids",
      "IGNORE_PERF_FAILURES": "all",
-      "INSTALL_CONFIGURE_ARGS": "--disable-ld-override",
+      "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-alpine3_12-release+fully_static+no_split_sections",
      "XZ_OPT": "-9"
@@ -3297,7 +3337,7 @@
      "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--hash-unit-ids",
      "IGNORE_PERF_FAILURES": "all",
-      "INSTALL_CONFIGURE_ARGS": "--disable-ld-override",
+      "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-alpine3_12-release+no_split_sections",
      "XZ_OPT": "-9"
@@ -3363,7 +3403,7 @@
      "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--hash-unit-ids",
      "IGNORE_PERF_FAILURES": "all",
-      "INSTALL_CONFIGURE_ARGS": "--disable-ld-override",
+      "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-alpine3_18-release+no_split_sections",
      "XZ_OPT": "-9"
@@ -3429,6 +3469,7 @@
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--hash-unit-ids --docs=no-sphinx",
      "IGNORE_PERF_FAILURES": "all",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-centos7-release+no_split_sections",
      "XZ_OPT": "-9"
@@ -3493,6 +3534,7 @@
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--hash-unit-ids",
      "IGNORE_PERF_FAILURES": "all",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb10-release",
      "XZ_OPT": "-9"
@@ -3557,6 +3599,7 @@
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--hash-unit-ids",
      "IGNORE_PERF_FAILURES": "all",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb10-release+debug_info",
      "XZ_OPT": "-9"
@@ -3621,6 +3664,7 @@
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--hash-unit-ids",
      "IGNORE_PERF_FAILURES": "all",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb11-release",
      "XZ_OPT": "-9"
@@ -3685,6 +3729,7 @@
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--hash-unit-ids",
      "IGNORE_PERF_FAILURES": "all",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb12-release",
      "XZ_OPT": "-9"
@@ -3749,6 +3794,7 @@
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--hash-unit-ids",
      "IGNORE_PERF_FAILURES": "all",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb9-release+no_split_sections",
      "XZ_OPT": "-9"
@@ -3813,6 +3859,7 @@
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--hash-unit-ids",
      "IGNORE_PERF_FAILURES": "all",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "LLC": "/bin/false",
      "OPT": "/bin/false",
      "RUNTEST_ARGS": "",
@@ -3879,6 +3926,7 @@
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--hash-unit-ids",
      "IGNORE_PERF_FAILURES": "all",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "LLC": "/bin/false",
      "OPT": "/bin/false",
      "RUNTEST_ARGS": "",
@@ -3945,6 +3993,7 @@
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--haddock-for-hackage --hash-unit-ids",
      "IGNORE_PERF_FAILURES": "all",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "LLC": "/bin/false",
      "OPT": "/bin/false",
      "RUNTEST_ARGS": "",
@@ -4011,6 +4060,7 @@
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--hash-unit-ids",
      "IGNORE_PERF_FAILURES": "all",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-fedora38-release",
      "XZ_OPT": "-9"
@@ -4075,6 +4125,7 @@
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--hash-unit-ids",
      "IGNORE_PERF_FAILURES": "all",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-rocky8-release",
      "XZ_OPT": "-9"
@@ -4139,6 +4190,7 @@
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--hash-unit-ids",
      "IGNORE_PERF_FAILURES": "all",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-ubuntu18_04-release",
      "XZ_OPT": "-9"
@@ -4203,6 +4255,7 @@
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--hash-unit-ids",
      "IGNORE_PERF_FAILURES": "all",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-ubuntu20_04-release",
      "XZ_OPT": "-9"
@@ -4264,6 +4317,7 @@
      "GHC_VERSION": "9.6.4",
      "HADRIAN_ARGS": "--hash-unit-ids --docs=no-sphinx-pdfs",
      "IGNORE_PERF_FAILURES": "all",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "LANG": "en_US.UTF-8",
      "MSYSTEM": "CLANG64",
      "RUNTEST_ARGS": "",
@@ -4327,6 +4381,7 @@
      "GHC_VERSION": "9.6.4",
      "HADRIAN_ARGS": "--hash-unit-ids --docs=no-sphinx-pdfs",
      "IGNORE_PERF_FAILURES": "all",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "LANG": "en_US.UTF-8",
      "MSYSTEM": "CLANG64",
      "RUNTEST_ARGS": "",
@@ -4392,6 +4447,7 @@
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--docs=no-sphinx-pdfs",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "LANG": "en_US.UTF-8",
      "MACOSX_DEPLOYMENT_TARGET": "10.13",
      "NIX_SYSTEM": "x86_64-darwin",
@@ -4460,7 +4516,7 @@
      "BROKEN_TESTS": "ghcilink002 linker_unload_native encoding004 T10458",
      "BUILD_FLAVOUR": "validate+fully_static",
      "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
-      "INSTALL_CONFIGURE_ARGS": "--disable-ld-override",
+      "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-alpine3_12-validate+fully_static"
    }
@@ -4713,6 +4769,7 @@
      "BIN_DIST_NAME": "ghc-x86_64-linux-deb10-int_native-validate",
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb10-int_native-validate"
    }
@@ -4775,6 +4832,7 @@
      "BIN_DIST_NAME": "ghc-x86_64-linux-deb10-no_tntc-validate",
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--disable-tables-next-to-code --enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb10-no_tntc-validate"
    }
@@ -4837,6 +4895,7 @@
      "BUILD_FLAVOUR": "slow-validate",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "ENABLE_NUMA": "1",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb10-numa-slow-validate"
    }
@@ -4898,6 +4957,7 @@
      "BIN_DIST_NAME": "ghc-x86_64-linux-deb10-unreg-validate",
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--enable-unregisterised --enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb10-unreg-validate"
    }
@@ -4959,6 +5019,7 @@
      "BIN_DIST_NAME": "ghc-x86_64-linux-deb10-validate+debug_info",
      "BUILD_FLAVOUR": "validate+debug_info",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb10-validate+debug_info"
    }
@@ -5020,6 +5081,7 @@
      "BIN_DIST_NAME": "ghc-x86_64-linux-deb10-zstd-validate",
      "BUILD_FLAVOUR": "validate",
      "CONFIGURE_ARGS": "--enable-ipe-data-compression --enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb10-zstd-validate"
    }
@@ -5083,6 +5145,7 @@
      "CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check",
      "CROSS_EMULATOR": "qemu-aarch64 -L /usr/aarch64-linux-gnu",
      "CROSS_TARGET": "aarch64-linux-gnu",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb11-cross_aarch64-linux-gnu-validate"
    }
@@ -5147,6 +5210,7 @@
      "CONFIGURE_WRAPPER": "emconfigure",
      "CROSS_EMULATOR": "js-emulator",
      "CROSS_TARGET": "javascript-unknown-ghcjs",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb11-emsdk-closure-int_native-cross_javascript-unknown-ghcjs-validate"
    }
@@ -5208,6 +5272,7 @@
      "BIN_DIST_NAME": "ghc-x86_64-linux-deb11-validate+boot_nonmoving_gc",
      "BUILD_FLAVOUR": "validate+boot_nonmoving_gc",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "--way=nonmoving --way=nonmoving_thr --way=nonmoving_thr_sanity",
      "TEST_ENV": "x86_64-linux-deb11-validate+boot_nonmoving_gc"
    }
@@ -5269,6 +5334,7 @@
      "BIN_DIST_NAME": "ghc-x86_64-linux-deb12-validate+llvm",
      "BUILD_FLAVOUR": "validate+llvm",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb12-validate+llvm"
    }
@@ -5332,6 +5398,7 @@
      "BUILD_FLAVOUR": "validate+thread_sanitizer_cmm",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "HADRIAN_ARGS": "--docs=none",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "RUNTEST_ARGS": "",
      "TEST_ENV": "x86_64-linux-deb12-validate+thread_sanitizer_cmm",
      "TSAN_OPTIONS": "suppressions=$CI_PROJECT_DIR/rts/.tsan-suppressions"
@@ -5394,6 +5461,7 @@
      "BIN_DIST_NAME": "ghc-x86_64-linux-fedora33-release",
      "BUILD_FLAVOUR": "release",
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "LLC": "/bin/false",
      "OPT": "/bin/false",
      "RUNTEST_ARGS": "",
@@ -5455,6 +5523,7 @@
      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "GHC_VERSION": "9.6.4",
      "HADRIAN_ARGS": "--docs=no-sphinx-pdfs",
+      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
      "LANG": "en_US.UTF-8",
      "MSYSTEM": "CLANG64",
      "RUNTEST_ARGS": "",

--- a/compiler/GHC/CmmToAsm/PPC/CodeGen.hs
+++ b/compiler/GHC/CmmToAsm/PPC/CodeGen.hs
@@ -1770,7 +1770,7 @@ genCCall' config gcp target dest_regs args
                                _ -> panic "genCall': unknown calling conv."

        argReps = map (cmmExprType platform) args
-        (argHints, _) = foreignTargetHints target
+        (_, argHints) = foreignTargetHints target

        roundTo a x | x `mod` a == 0 = x
                    | otherwise = x + a - (x `mod` a)

--- a/configure.ac
+++ b/configure.ac
@@ -299,16 +299,16 @@ if test "$HostOS" = "mingw32" -a "$EnableDistroToolchain" = "NO"; then
    FP_INSTALL_WINDOWS_TOOLCHAIN
    FP_SETUP_WINDOWS_TOOLCHAIN([$hardtop/inplace/mingw], [$hardtop/inplace/mingw])
 else
-    AC_PATH_TOOL([CC],[gcc], [clang])
-    AC_PATH_TOOL([CXX],[g++], [clang++])
-    AC_PATH_TOOL([NM],[nm])
+    AC_CHECK_TOOL([CC],[gcc], [clang])
+    AC_CHECK_TOOL([CXX],[g++], [clang++])
+    AC_CHECK_TOOL([NM],[nm])
    # N.B. we don't probe for LD here but instead
    # do so in FIND_LD to avoid #21778.
-    AC_PATH_TOOL([AR],[ar])
-    AC_PATH_TOOL([RANLIB],[ranlib])
-    AC_PATH_TOOL([OBJDUMP],[objdump])
-    AC_PATH_TOOL([WindresCmd],[windres])
-    AC_PATH_TOOL([Genlib],[genlib])
+    AC_CHECK_TOOL([AR],[ar])
+    AC_CHECK_TOOL([RANLIB],[ranlib])
+    AC_CHECK_TOOL([OBJDUMP],[objdump])
+    AC_CHECK_TOOL([WindresCmd],[windres])
+    AC_CHECK_TOOL([Genlib],[genlib])

    if test "$HostOS" = "mingw32"; then
        AC_CHECK_TARGET_TOOL([WindresCmd],[windres])

--- a/distrib/configure.ac.in
+++ b/distrib/configure.ac.in
@@ -119,6 +119,22 @@ if test "$HostOS" = "darwin"; then
    fi
 fi

+AC_ARG_ENABLE(ghc-toolchain,
+[AS_HELP_STRING([--enable-ghc-toolchain],
+                [Whether to use the newer ghc-toolchain tool to configure ghc targets])],
+  [FP_CAPITALIZE_YES_NO(["$enableval"], [EnableGhcToolchain])],
+  [EnableGhcToolchain=NO]
+)
+AC_SUBST([EnableGhcToolchain])
+
+AC_ARG_ENABLE(strict-ghc-toolchain-check,
+[AS_HELP_STRING([--enable-strict-ghc-toolchain-check],
+                [Whether to raise an error if the output of ghc-toolchain differs from configure])],
+  [FP_CAPITALIZE_YES_NO(["$enableval"], [EnableStrictGhcToolchainCheck])],
+  [EnableStrictGhcToolchainCheck=NO]
+)
+AC_SUBST([EnableStrictGhcToolchainCheck])
+
 dnl ** Which gcc to use?
 dnl --------------------------------------------------------------
 AC_PROG_CC([gcc clang])
@@ -135,6 +151,11 @@ FP_HSCPP_CMD_WITH_ARGS(HaskellCPPCmd, HaskellCPPArgs)
 AC_SUBST([HaskellCPPCmd])
 AC_SUBST([HaskellCPPArgs])

+# --with-js-cpp/--with-js-cpp-flags
+FP_JSCPP_CMD_WITH_ARGS(JavaScriptCPPCmd, JavaScriptCPPArgs)
+AC_SUBST([JavaScriptCPPCmd])
+AC_SUBST([JavaScriptCPPArgs])
+
 # --with-cmm-cpp/--with-cmm-cpp-flags
 FP_CMM_CPP_CMD_WITH_ARGS([$CC], [CmmCPPCmd], [CmmCPPArgs], [CmmCPPSupportsG0])
 AC_SUBST([CmmCPPCmd])
@@ -272,6 +293,9 @@ AC_SUBST(TargetHasIdentDirective)
 GHC_GNU_NONEXEC_STACK
 AC_SUBST(TargetHasGnuNonexecStack)

+GHC_LLVM_TARGET_SET_VAR
+AC_SUBST(LlvmTarget)
+
 dnl ** See whether cc supports --target=<triple> and set
 dnl CONF_CC_OPTS_STAGE[12] accordingly.
 FP_CC_SUPPORTS_TARGET([$CC], [CONF_CC_OPTS_STAGE1], [CONF_CXX_OPTS_STAGE1])
@@ -342,15 +366,8 @@ if test "x$UseLibdw" = "xYES" ; then
 fi
 AC_SUBST(UseLibdw)

-
 FP_SETTINGS

-AC_CONFIG_FILES([config.mk])
-AC_CONFIG_FILES([default.host.target])
-AC_CONFIG_FILES([default.target])
-AC_CONFIG_FILES([mk/hsc2hs])
-AC_OUTPUT
-
 # We get caught by
 #     http://savannah.gnu.org/bugs/index.php?1516
 #     $(eval ...) inside conditionals causes errors
@@ -375,6 +392,12 @@ FIND_GHC_TOOLCHAIN_BIN([YES])
 PREP_TARGET_FILE
 FIND_GHC_TOOLCHAIN([.])

+AC_CONFIG_FILES([config.mk])
+AC_CONFIG_FILES([default.host.target])
+AC_CONFIG_FILES([default.target])
+AC_CONFIG_FILES([mk/hsc2hs])
+AC_OUTPUT
+
 VALIDATE_GHC_TOOLCHAIN([default.target],[default.target.ghc-toolchain])

 rm -Rf acargs acghc-toolchain actmp-ghc-toolchain

--- a/hadrian/bindist/Makefile
+++ b/hadrian/bindist/Makefile
@@ -169,7 +169,7 @@ install_lib: lib/settings
 	$(INSTALL_DIR) "$(DESTDIR)$(ActualLibsDir)"

 	@dest="$(DESTDIR)$(ActualLibsDir)"; \
-	cd lib; \
+	cd ./lib; \
 	for i in `$(FIND) . -type f`; do \
 		dir="`dirname $$i`" ; \
 		$(INSTALL_DIR) "$$dest/$$dir" ; \
@@ -197,7 +197,7 @@ install_docs:
 	$(INSTALL_DIR) "$(DESTDIR)$(docdir)"

 	if [ -d doc ]; then \
-		cd doc; $(FIND) . -type f -exec sh -c \
+		cd ./doc; $(FIND) . -type f -exec sh -c \
 			'$(INSTALL_DIR) "$(DESTDIR)$(docdir)/`dirname $$1`" && $(INSTALL_DATA) "$$1" "$(DESTDIR)$(docdir)/`dirname $$1`"' \
 			sh '{}' ';'; \
 	fi
@@ -213,7 +213,7 @@ install_data:
 	@echo "Copying data to $(DESTDIR)share"
 	$(INSTALL_DIR) "$(DESTDIR)$(datadir)"
 	if [ -d share ]; then \
-		cd share; $(FIND) . -type f -exec sh -c \
+		cd ./share; $(FIND) . -type f -exec sh -c \
 			'$(INSTALL_DIR) "$(DESTDIR)$(datadir)/`dirname $$1`" && \
 			$(INSTALL_DATA) "$$1" "$(DESTDIR)$(datadir)/`dirname $$1`"' \
 			sh '{}' ';'; \
@@ -235,7 +235,7 @@ export SHELL
 install_wrappers: install_bin_libdir install_hsc2hs_wrapper
 	@echo "Installing wrapper scripts"
 	$(INSTALL_DIR) "$(DESTDIR)$(WrapperBinsDir)"
-	for p in `cd wrappers; $(FIND) . ! -type d`; do \
+	for p in `cd ./wrappers; $(FIND) . ! -type d`; do \
 	    mk/install_script.sh "$$p" "$(DESTDIR)/$(WrapperBinsDir)/$$p" "$(WrapperBinsDir)" "$(ActualBinsDir)" "$(ActualBinsDir)/$$p" "$(ActualLibsDir)" "$(docdir)" "$(includedir)"; \
 	done


--- a/hadrian/bootstrap/generate_bootstrap_plans
+++ b/hadrian/bootstrap/generate_bootstrap_plans
@@ -27,4 +27,7 @@ run "9_6_1"
 run "9_6_2"
 run "9_6_3"
 run "9_6_4"
+run "9_6_5"
 run "9_8_1"
+run "9_8_2"
+run "9_10_1"
--- a/hadrian/bootstrap/plan-9_10_1.json
+++ b/hadrian/bootstrap/plan-9_10_1.json
+{
+  "arch": "x86_64",
+  "cabal-lib-version": "3.10.2.1",
+  "cabal-version": "3.10.2.1",
+  "compiler-id": "ghc-9.10.1",
+  "install-plan": [
+    {
+      "component-name": "lib",
+      "depends": [
+        "Cabal-syntax-3.10.3.0-16fa731ae4aaca01d3debcdc890212d2fd816f1d22f19365d4163e9edafdcd63",
+        "array-0.5.7.0-20cf",
+        "base-4.20.0.0-7b2c",
+        "bytestring-0.12.1.0-3a9c",
+        "containers-0.7-ade3",
+        "deepseq-1.5.0.0-98b3",
+        "directory-1.3.8.3-0bdc",
+        "filepath-1.5.2.0-f8c0",
+        "mtl-2.3.1-2128",
+        "parsec-3.1.17.0-52f5",
+        "pretty-1.1.3.6-d2be",
+        "process-1.6.19.0-4783",
+        "text-2.1.1-ffc6",
+        "time-1.12.2-c1d3",
+        "transformers-0.6.1.1-f453",
+        "unix-2.8.5.1-c70e"
+      ],
+      "exe-depends": [],
+      "flags": {},
+      "id": "Cabal-3.10.3.0-962eeb4d69d7702e1d9e02bf4be95e3e3c9339cd44a6f0d30ff32c10033e324a",
+      "pkg-cabal-sha256": "4a36954a66769eef90353daa0dbb07d43e49c228281383c7e4134445d495f714",
+      "pkg-name": "Cabal",
+      "pkg-src": {
+        "repo": {
+          "type": "secure-repo",
+          "uri": "http://hackage.haskell.org/"
+        },
+        "type": "repo-tar"
+      },
+      "pkg-src-sha256": "cb7f7c66626d7555f799e786513ddd65a874fd23f1cf312990c7a48abfc0b2c6",
+      "pkg-version": "3.10.3.0",
+      "style": "global",
+      "type": "configured"
+    },
+    {
+      "component-name": "lib",
+      "depends": [
+        "array-0.5.7.0-20cf",
+        "base-4.20.0.0-7b2c",
+        "binary-0.8.9.2-1319",
+        "bytestring-0.12.1.0-3a9c",
+        "containers-0.7-ade3",
+        "deepseq-1.5.0.0-98b3",
+        "directory-1.3.8.3-0bdc",
+        "filepath-1.5.2.0-f8c0",
+        "mtl-2.3.1-2128",
+        "parsec-3.1.17.0-52f5",
+        "pretty-1.1.3.6-d2be",
+        "text-2.1.1-ffc6",
+        "time-1.12.2-c1d3",
+        "transformers-0.6.1.1-f453",
+        "unix-2.8.5.1-c70e"
+      ],
+      "exe-depends": [],
+      "flags": {},
+      "id": "Cabal-syntax-3.10.3.0-16fa731ae4aaca01d3debcdc890212d2fd816f1d22f19365d4163e9edafdcd63",
+      "pkg-cabal-sha256": "c2ca36499bf9365726968b1e11a757e6d846c47cdf0c2c26a003698fd3c300fe",
+      "pkg-name": "Cabal-syntax",
+      "pkg-src": {
+        "repo": {
+          "type": "secure-repo",
+          "uri": "http://hackage.haskell.org/"
+        },
+        "type": "repo-tar"
+      },
+      "pkg-src-sha256": "75d6a0aa9c00990a0d6e7720ac50c6954f6c942fa1be42c8add7f1c025f7e212",
+      "pkg-version": "3.10.3.0",
+      "style": "global",
+      "type": "configured"
+    },
+    {
+      "depends": [
+        "base-4.20.0.0-7b2c"
+      ],
+      "id": "array-0.5.7.0-20cf",
+      "pkg-name": "array",
+      "pkg-version": "0.5.7.0",
+      "type": "pre-existing"
+    },
+    {
+      "depends": [
+        "ghc-internal-9.1001.0-59a1",
+        "ghc-prim-0.11.0-e678"
+      ],
+      "id": "base-4.20.0.0-7b2c",
+      "pkg-name": "base",
+      "pkg-version": "4.20.0.0",
+      "type": "pre-existing"
+    },
+    {
+      "component-name": "lib",
+      "depends": [
+        "base-4.20.0.0-7b2c",
+        "bytestring-0.12.1.0-3a9c"
+      ],
+      "exe-depends": [],
+      "flags": {},
+      "id": "base16-bytestring-1.0.2.0-2ae56325f3ce7000c1709961853d7d4454526b4d8a0f1003a7387e3699e1966b",
+      "pkg-cabal-sha256": "a694e88f9ec9fc79f0b03f233d3fea592b68f70a34aac2ddb5bcaecb6562e2fd",
+      "pkg-name": "base16-bytestring",
+      "pkg-src": {
+        "repo": {
+          "type": "secure-repo",
+          "uri": "http://hackage.haskell.org/"
+        },
+        "type": "repo-tar"
+      },
+      "pkg-src-sha256": "1d5a91143ef0e22157536093ec8e59d226a68220ec89378d5dcaeea86472c784",
+      "pkg-version": "1.0.2.0",
+      "style": "global",
+      "type": "configured"
+    },
+    {
+      "depends": [
+        "array-0.5.7.0-20cf",
+        "base-4.20.0.0-7b2c",
+        "bytestring-0.12.1.0-3a9c",
+        "containers-0.7-ade3"
+      ],
+      "id": "binary-0.8.9.2-1319",
+      "pkg-name": "binary",
+      "pkg-version": "0.8.9.2",
+      "type": "pre-existing"
+    },
+    {
+      "depends": [
+        "base-4.20.0.0-7b2c",
+        "deepseq-1.5.0.0-98b3",
+        "ghc-prim-0.11.0-e678",
+        "template-haskell-2.22.0.0-5d7d"
+      ],
+      "id": "bytestring-0.12.1.0-3a9c",
+      "pkg-name": "bytestring",
+      "pkg-version": "0.12.1.0",
+      "type": "pre-existing"
+    },
+    {
+      "component-name": "lib",
+      "depends": [
+        "base-4.20.0.0-7b2c"
+      ],
+      "exe-depends": [],
+      "flags": {
+        "llvm": false
+      },
+      "id": "clock-0.8.4-96fb8d290b6df58d9bab9c85dd500002595f45ddac5315778ee650676abd4a61",
+      "pkg-cabal-sha256": "b938655b00cf204ce69abfff946021bed111d2609a9f7a9c22e28a1a202e9115",
+      "pkg-name": "clock",
+      "pkg-src": {
+        "repo": {
+          "type": "secure-repo",
+          "uri": "http://hackage.haskell.org/"
+        },
+        "type": "repo-tar"
+      },
+      "pkg-src-sha256": "6ae9898afe788a5e334cd5fad5d18a3c2e8e59fa09aaf7b957dbb38a4767df2e",
+      "pkg-version": "0.8.4",
+      "style": "global",
+      "type": "configured"
+    },
+    {
+      "depends": [
+        "array-0.5.7.0-20cf",
+        "base-4.20.0.0-7b2c",
+        "deepseq-1.5.0.0-98b3",
+        "template-haskell-2.22.0.0-5d7d"
+      ],
+      "id": "containers-0.7-ade3",
+      "pkg-name": "containers",
+      "pkg-version": "0.7",
+      "type": "pre-existing"
+    },
+    {
+      "component-name": "lib",
+      "depends": [
+        "base-4.20.0.0-7b2c",
+        "bytestring-0.12.1.0-3a9c"
+      ],
+      "exe-depends": [],
+      "flags": {
+        "exe": false,
+        "use-cbits": true
+      },
+      "id": "cryptohash-sha256-0.11.102.1-f44966e5c32a660a3bfabccbc437d02d2c7267c41d2c5524c3eb3d8c32395349",
+      "pkg-cabal-sha256": "200d756a7b3bab7ca2bac6eb50ed8252f26de77ac8def490a3ad743f2933acbd",
+      "pkg-name": "cryptohash-sha256",
+      "pkg-src": {
+        "repo": {
+          "type": "secure-repo",
+          "uri": "http://hackage.haskell.org/"
+        },
+        "type": "repo-tar"
+      },
+      "pkg-src-sha256": "73a7dc7163871a80837495039a099967b11f5c4fe70a118277842f7a713c6bf6",
+      "pkg-version": "0.11.102.1",
+      "style": "global",
+      "type": "configured"
+    },
+    {
+      "depends": [
+        "array-0.5.7.0-20cf",
+        "base-4.20.0.0-7b2c",
+        "ghc-prim-0.11.0-e678"
+      ],
+      "id": "deepseq-1.5.0.0-98b3",
+      "pkg-name": "deepseq",
+      "pkg-version": "1.5.0.0",
+      "type": "pre-existing"
+    },
+    {
+      "depends": [
+        "base-4.20.0.0-7b2c",
+        "filepath-1.5.2.0-f8c0",
+        "os-string-2.0.2-826a",
+        "time-1.12.2-c1d3",
+        "unix-2.8.5.1-c70e"
+      ],
+      "id": "directory-1.3.8.3-0bdc",
+      "pkg-name": "directory",
+      "pkg-version": "1.3.8.3",
+      "type": "pre-existing"
+    },
+    {
+      "depends": [
+        "base-4.20.0.0-7b2c",
+        "mtl-2.3.1-2128",
+        "stm-2.5.3.1-77c0",
+        "template-haskell-2.22.0.0-5d7d",
+        "transformers-0.6.1.1-f453"
+      ],
+      "id": "exceptions-0.10.7-a467",
+      "pkg-name": "exceptions",
+      "pkg-version": "0.10.7",
+      "type": "pre-existing"
+    },
+    {
+      "component-name": "lib",
+      "depends": [
+        "base-4.20.0.0-7b2c",
+        "clock-0.8.4-96fb8d290b6df58d9bab9c85dd500002595f45ddac5315778ee650676abd4a61",
+        "directory-1.3.8.3-0bdc",
+        "filepath-1.5.2.0-f8c0",
+        "process-1.6.19.0-4783",
+        "time-1.12.2-c1d3",
+        "unix-2.8.5.1-c70e"
+      ],
+      "exe-depends": [],
+      "flags": {},
+      "id": "extra-1.7.16-0f1ad807df16609742e167f4d9b76cb16c88f383817d1d229795907ce6cf95d4",
+      "pkg-cabal-sha256": "edd191f77adf31acb1b53960b4d1ca9fca925ac28345a396c614414cb7bfa7ec",
+      "pkg-name": "extra",
+      "pkg-src": {
+        "repo": {
+          "type": "secure-repo",
+          "uri": "http://hackage.haskell.org/"
+        },
+        "type": "repo-tar"
+      },
+      "pkg-src-sha256": "250c6d43c30b2c71f2cf498a10e69e43ac035974d3819529385d99e42ce77c70",
+      "pkg-version": "1.7.16",
+      "style": "global",
+      "type": "configured"
+    },
+    {
+      "depends": [
+        "base-4.20.0.0-7b2c",
+        "bytestring-0.12.1.0-3a9c",
+        "deepseq-1.5.0.0-98b3",
+        "exceptions-0.10.7-a467",
+        "os-string-2.0.2-826a",
+        "template-haskell-2.22.0.0-5d7d"
+      ],
+      "id": "filepath-1.5.2.0-f8c0",
+      "pkg-name": "filepath",
+      "pkg-version": "1.5.2.0",
+      "type": "pre-existing"
+    },
+    {
+      "component-name": "lib",
+      "depends": [
+        "base-4.20.0.0-7b2c",
+        "directory-1.3.8.3-0bdc",
+        "extra-1.7.16-0f1ad807df16609742e167f4d9b76cb16c88f383817d1d229795907ce6cf95d4",
+        "filepath-1.5.2.0-f8c0"
+      ],
+      "exe-depends": [],
+      "flags": {},
+      "id": "filepattern-0.1.3-829ecd49d01a52e6722b895978ed7e1541b789eabe6a1d606c927bcd2debd70d",
+      "pkg-cabal-sha256": "372c1733d83b90045eb29da9f010fed79bfef8771ce65eb126a1d83ecc54a9a2",
+      "pkg-name": "filepattern",
+      "pkg-src": {
+        "repo": {
+          "type": "secure-repo",
+          "uri": "http://hackage.haskell.org/"
+        },
+        "type": "repo-tar"
+      },
+      "pkg-src-sha256": "cc445d439ea2f65cac7604d3578aa2c3a62e5a91dc989f4ce5b3390db9e59636",
+      "pkg-version": "0.1.3",
+      "style": "global",
+      "type": "configured"
+    },
+    {
+      "depends": [
+        "ghc-prim-0.11.0-e678"
+      ],
+      "id": "ghc-bignum-1.3-8f32",
+      "pkg-name": "ghc-bignum",
+      "pkg-version": "1.3",
+      "type": "pre-existing"
+    },
+    {
+      "depends": [
+        "base-4.20.0.0-7b2c"
+      ],
+      "id": "ghc-boot-th-9.10.1-47ce",
+      "pkg-name": "ghc-boot-th",
+      "pkg-version": "9.10.1",
+      "type": "pre-existing"
+    },
+    {
+      "depends": [
+        "ghc-bignum-1.3-8f32",
+        "ghc-prim-0.11.0-e678",
+        "rts-1.0.2"
+      ],
+      "id": "ghc-internal-9.1001.0-59a1",
+      "pkg-name": "ghc-internal",
+      "pkg-version": "9.1001.0",
+      "type": "pre-existing"
+    },
+    {
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.10.1/ghc-platform-0.1.0.0/build-info.json",
+      "component-name": "lib",
+      "depends": [
+        "base-4.20.0.0-7b2c"
+      ],
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.10.1/ghc-platform-0.1.0.0",
+      "exe-depends": [],
+      "flags": {},
+      "id": "ghc-platform-0.1.0.0-inplace",
+      "pkg-name": "ghc-platform",
+      "pkg-src": {
+        "path": "/home/matt/ghc-llvm/hadrian/../libraries/ghc-platform",
+        "type": "local"
+      },
+      "pkg-version": "0.1.0.0",
+      "style": "local",
+      "type": "configured"
+    },
+    {
+      "depends": [
+        "rts-1.0.2"
+      ],
+      "id": "ghc-prim-0.11.0-e678",
+      "pkg-name": "ghc-prim",
+      "pkg-version": "0.11.0",
+      "type": "pre-existing"
+    },
+    {
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.10.1/ghc-toolchain-0.1.0.0/build-info.json",
+      "component-name": "lib",
+      "depends": [
+        "base-4.20.0.0-7b2c",
+        "directory-1.3.8.3-0bdc",
+        "filepath-1.5.2.0-f8c0",
+        "ghc-platform-0.1.0.0-inplace",
+        "process-1.6.19.0-4783",
+        "text-2.1.1-ffc6",
+        "transformers-0.6.1.1-f453"
+      ],
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.10.1/ghc-toolchain-0.1.0.0",
+      "exe-depends": [],
+      "flags": {},
+      "id": "ghc-toolchain-0.1.0.0-inplace",
+      "pkg-name": "ghc-toolchain",
+      "pkg-src": {
+        "path": "/home/matt/ghc-llvm/hadrian/../utils/ghc-toolchain",
+        "type": "local"
+      },
+      "pkg-version": "0.1.0.0",
+      "style": "local",
+      "type": "configured"
+    },
+    {
+      "bin-file": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.10.1/hadrian-0.1.0.0/x/hadrian/build/hadrian/hadrian",
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.10.1/hadrian-0.1.0.0/x/hadrian/build-info.json",
+      "component-name": "exe:hadrian",
+      "depends": [
+        "Cabal-3.10.3.0-962eeb4d69d7702e1d9e02bf4be95e3e3c9339cd44a6f0d30ff32c10033e324a",
+        "base-4.20.0.0-7b2c",
+        "base16-bytestring-1.0.2.0-2ae56325f3ce7000c1709961853d7d4454526b4d8a0f1003a7387e3699e1966b",
+        "bytestring-0.12.1.0-3a9c",
+        "containers-0.7-ade3",
+        "cryptohash-sha256-0.11.102.1-f44966e5c32a660a3bfabccbc437d02d2c7267c41d2c5524c3eb3d8c32395349",
+        "directory-1.3.8.3-0bdc",
+        "extra-1.7.16-0f1ad807df16609742e167f4d9b76cb16c88f383817d1d229795907ce6cf95d4",
+        "filepath-1.5.2.0-f8c0",
+        "ghc-platform-0.1.0.0-inplace",
+        "ghc-toolchain-0.1.0.0-inplace",
+        "mtl-2.3.1-2128",
+        "parsec-3.1.17.0-52f5",
+        "shake-0.19.8-0c1c0be618819bd11dd763a8e7a91729fcd8ff4c86408d0bea9294e74fcf3929",
+        "text-2.1.1-ffc6",
+        "time-1.12.2-c1d3",
+        "transformers-0.6.1.1-f453",
+        "unordered-containers-0.2.20-8830d699d9fce50100e11680eca9dbfef6e6ba09ea6f0ca8d8df9b7c74a6cc44"
+      ],
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.10.1/hadrian-0.1.0.0/x/hadrian",
+      "exe-depends": [],
+      "flags": {
+        "selftest": false,
+        "threaded": true
+      },
+      "id": "hadrian-0.1.0.0-inplace-hadrian",
+      "pkg-name": "hadrian",
+      "pkg-src": {
+        "path": "/home/matt/ghc-llvm/hadrian/.",
+        "type": "local"
+      },
+      "pkg-version": "0.1.0.0",
+      "style": "local",
+      "type": "configured"
+    },
+    {
+      "component-name": "lib",
+      "depends": [
+        "base-4.20.0.0-7b2c",
+        "bytestring-0.12.1.0-3a9c",
+        "containers-0.7-ade3",
+        "deepseq-1.5.0.0-98b3",
+        "filepath-1.5.2.0-f8c0",
+        "ghc-bignum-1.3-8f32",
+        "ghc-prim-0.11.0-e678",
+        "os-string-2.0.2-826a",
+        "text-2.1.1-ffc6"
+      ],
+      "exe-depends": [],
+      "flags": {
+        "integer-gmp": true,
+        "random-initial-seed": false
+      },
+      "id": "hashable-1.4.4.0-7aa2e801886dbeb5752e9b5c235c3577941711f2895c80018d973a80f85f658e",
+      "pkg-cabal-sha256": "ae22238274c572aa91e90c6c353e7206386708912ac5e6dc40ac61d1dcc553db",
+      "pkg-name": "hashable",
+      "pkg-src": {
+        "repo": {
+          "type": "secure-repo",
+          "uri": "http://hackage.haskell.org/"
+        },
+        "type": "repo-tar"
+      },
+      "pkg-src-sha256": "1fa3d64548440942b2b38b99c76d8dcaa94fa2ea3912cd7a6354ea4ec4af4758",
+      "pkg-version": "1.4.4.0",
+      "style": "global",
+      "type": "configured"
+    },
+    {
+      "component-name": "lib",
+      "depends": [
+        "base-4.20.0.0-7b2c"
+      ],
+      "exe-depends": [],
+      "flags": {},
+      "id": "heaps-0.4-44b46e42b529c2c9e40532637b1328bc2a8193bdd47a4affd37cb37e08a0e970",
+      "pkg-cabal-sha256": "66b19fcd813b0e4db3e0bac541bd46606c3b13d3d081d9f9666f4be0f5ff14b8",
+      "pkg-name": "heaps",
+      "pkg-src": {
+        "repo": {
+          "type": "secure-repo",
+          "uri": "http://hackage.haskell.org/"
+        },
+        "type": "repo-tar"
+      },
+      "pkg-src-sha256": "89329df8b95ae99ef272e41e7a2d0fe2f1bb7eacfcc34bc01664414b33067cfd",
+      "pkg-version": "0.4",
+      "style": "global",
+      "type": "configured"
+    },
+    {
+      "component-name": "lib",
+      "depends": [
+        "base-4.20.0.0-7b2c"
+      ],
+      "exe-depends": [],
+      "flags": {},
+      "id": "js-dgtable-0.5.2-b05600b19c786e69f4db5a25f3075a9969a104e273ef1f53ca19d48a9ad69f74",
+      "pkg-cabal-sha256": "f75cb4fa53c88c65794becdd48eb0d3b2b8abd89a3d5c19e87af91f5225c15e4",
+      "pkg-name": "js-dgtable",
+      "pkg-src": {
+        "repo": {
+          "type": "secure-repo",
+          "uri": "http://hackage.haskell.org/"
+        },
+        "type": "repo-tar"
+      },
+      "pkg-src-sha256": "e28dd65bee8083b17210134e22e01c6349dc33c3b7bd17705973cd014e9f20ac",
+      "pkg-version": "0.5.2",
+      "style": "global",
+      "type": "configured"
+    },
+    {
+      "component-name": "lib",
+      "depends": [
+        "base-4.20.0.0-7b2c"
+      ],
+      "exe-depends": [],
+      "flags": {},
+      "id": "js-flot-0.8.3-0be850d8383fc15f0fd902a07bb6dea30f493d9d7bf92720e33b17c42dfb2dd2",
+      "pkg-cabal-sha256": "4c1c447a9a2fba0adba6d30678302a30c32b9dfde9e7aa9e9156483e1545096d",
+      "pkg-name": "js-flot",
+      "pkg-src": {
+        "repo": {
+          "type": "secure-repo",
+          "uri": "http://hackage.haskell.org/"
+        },
+        "type": "repo-tar"
+      },
+      "pkg-src-sha256": "1ba2f2a6b8d85da76c41f526c98903cbb107f8642e506c072c1e7e3c20fe5e7a",
+      "pkg-version": "0.8.3",
+      "style": "global",
+      "type": "configured"
+    },
+    {
+      "component-name": "lib",
+      "depends": [
+        "base-4.20.0.0-7b2c"
+      ],
+      "exe-depends": [],
+      "flags": {},
+      "id": "js-jquery-3.3.1-2b4f2810c69abb367f6a7c62c2ba05f0fab6e92c13e6a04dd4ae47fdf2ff201e",
+      "pkg-cabal-sha256": "59ab6c79159549ef94b584abce8e6d3b336014c2cce1337b59a8f637e2856df5",
+      "pkg-name": "js-jquery",
+      "pkg-src": {
+        "repo": {
+          "type": "secure-repo",
+          "uri": "http://hackage.haskell.org/"
+        },
+        "type": "repo-tar"
+      },
+      "pkg-src-sha256": "e0e0681f0da1130ede4e03a051630ea439c458cb97216cdb01771ebdbe44069b",
+      "pkg-version": "3.3.1",
+      "style": "global",
+      "type": "configured"
+    },
+    {
+      "depends": [
+        "base-4.20.0.0-7b2c",
+        "transformers-0.6.1.1-f453"
+      ],
+      "id": "mtl-2.3.1-2128",
+      "pkg-name": "mtl",
+      "pkg-version": "2.3.1",
+      "type": "pre-existing"
+    },
+    {
+      "depends": [
+        "base-4.20.0.0-7b2c",
+        "bytestring-0.12.1.0-3a9c",
+        "deepseq-1.5.0.0-98b3",
+        "exceptions-0.10.7-a467",
+        "template-haskell-2.22.0.0-5d7d"
+      ],
+      "id": "os-string-2.0.2-826a",
+      "pkg-name": "os-string",
+      "pkg-version": "2.0.2",
+      "type": "pre-existing"
+    },
+    {
+      "depends": [
+        "base-4.20.0.0-7b2c",
+        "bytestring-0.12.1.0-3a9c",
+        "mtl-2.3.1-2128",
+        "text-2.1.1-ffc6"
+      ],
+      "id": "parsec-3.1.17.0-52f5",
+      "pkg-name": "parsec",
+      "pkg-version": "3.1.17.0",
+      "type": "pre-existing"
+    },
+    {
+      "depends": [
+        "base-4.20.0.0-7b2c",
+        "deepseq-1.5.0.0-98b3",
+        "ghc-prim-0.11.0-e678"
+      ],
+      "id": "pretty-1.1.3.6-d2be",
+      "pkg-name": "pretty",
+      "pkg-version": "1.1.3.6",
+      "type": "pre-existing"
+    },
+    {
+      "component-name": "lib",
+      "depends": [
+        "base-4.20.0.0-7b2c",
+        "deepseq-1.5.0.0-98b3",
+        "template-haskell-2.22.0.0-5d7d",
+        "transformers-0.6.1.1-f453"
+      ],
+      "exe-depends": [],
+      "flags": {},
+      "id": "primitive-0.9.0.0-019bcbf2dfe3b23818d6d4564c1d8f73d69950f5a3365e03a9c0b8d8ff5eb85c",
+      "pkg-cabal-sha256": "2e08c5409e3559c7f1669ef50e9a0d9a397e68ecf51110d5e2cedf05cdd7d93c",
+      "pkg-name": "primitive",
+      "pkg-src": {
+        "repo": {
+          "type": "secure-repo",
+          "uri": "http://hackage.haskell.org/"
+        },
+        "type": "repo-tar"
+      },
+      "pkg-src-sha256": "696d4bd291c94d736142d6182117dca4258d3ef28bfefdb649ac8b5ecd0999c7",
+      "pkg-version": "0.9.0.0",
+      "style": "global",
+      "type": "configured"
+    },
+    {
+      "depends": [
+        "base-4.20.0.0-7b2c",
+        "deepseq-1.5.0.0-98b3",
+        "directory-1.3.8.3-0bdc",
+        "filepath-1.5.2.0-f8c0",
+        "unix-2.8.5.1-c70e"
+      ],
+      "id": "process-1.6.19.0-4783",
+      "pkg-name": "process",
+      "pkg-version": "1.6.19.0",
+      "type": "pre-existing"
+    },
+    {
+      "component-name": "lib",
+      "depends": [
+        "base-4.20.0.0-7b2c",
+        "bytestring-0.12.1.0-3a9c",
+        "deepseq-1.5.0.0-98b3",
+        "mtl-2.3.1-2128",
+        "splitmix-0.1.0.5-6a790f8a80f85ccaf35c11ab332b28ba935a84f4fd1b2750bf27f0ec4af6c625"
+      ],
+      "exe-depends": [],
+      "flags": {},
+      "id": "random-1.2.1.2-9b4c617605e84898a221e4d889a9a469e8169fff7d46810e3b722b06db7efe08",
+      "pkg-cabal-sha256": "32397de181e20ccaacf806ec70de9308cf044f089a2be37c936f3f8967bde867",
+      "pkg-name": "random",
+      "pkg-src": {
+        "repo": {
+          "type": "secure-repo",
+          "uri": "http://hackage.haskell.org/"
+        },
+        "type": "repo-tar"
+      },
+      "pkg-src-sha256": "790f4dc2d2327c453ff6aac7bf15399fd123d55e927935f68f84b5df42d9a4b4",
+      "pkg-version": "1.2.1.2",
+      "style": "global",
+      "type": "configured"
+    },
+    {
+      "depends": [],
+      "id": "rts-1.0.2",
+      "pkg-name": "rts",
+      "pkg-version": "1.0.2",
+      "type": "pre-existing"
+    },
+    {
+      "component-name": "lib",
+      "depends": [
+        "base-4.20.0.0-7b2c",
+        "binary-0.8.9.2-1319",
+        "bytestring-0.12.1.0-3a9c",
+        "deepseq-1.5.0.0-98b3",
+        "directory-1.3.8.3-0bdc",
+        "extra-1.7.16-0f1ad807df16609742e167f4d9b76cb16c88f383817d1d229795907ce6cf95d4",
+        "filepath-1.5.2.0-f8c0",
+        "filepattern-0.1.3-829ecd49d01a52e6722b895978ed7e1541b789eabe6a1d606c927bcd2debd70d",
+        "hashable-1.4.4.0-7aa2e801886dbeb5752e9b5c235c3577941711f2895c80018d973a80f85f658e",
+        "heaps-0.4-44b46e42b529c2c9e40532637b1328bc2a8193bdd47a4affd37cb37e08a0e970",
+        "js-dgtable-0.5.2-b05600b19c786e69f4db5a25f3075a9969a104e273ef1f53ca19d48a9ad69f74",
+        "js-flot-0.8.3-0be850d8383fc15f0fd902a07bb6dea30f493d9d7bf92720e33b17c42dfb2dd2",
+        "js-jquery-3.3.1-2b4f2810c69abb367f6a7c62c2ba05f0fab6e92c13e6a04dd4ae47fdf2ff201e",
+        "primitive-0.9.0.0-019bcbf2dfe3b23818d6d4564c1d8f73d69950f5a3365e03a9c0b8d8ff5eb85c",
+        "process-1.6.19.0-4783",
+        "random-1.2.1.2-9b4c617605e84898a221e4d889a9a469e8169fff7d46810e3b722b06db7efe08",
+        "time-1.12.2-c1d3",
+        "transformers-0.6.1.1-f453",
+        "unix-2.8.5.1-c70e",
+        "unordered-containers-0.2.20-8830d699d9fce50100e11680eca9dbfef6e6ba09ea6f0ca8d8df9b7c74a6cc44",
+        "utf8-string-1.0.2-ebd04057b54ac3d644b8438003a75c8b5b5c3835d64170e5e1d39a74ed6bb9de"
+      ],
+      "exe-depends": [],
+      "flags": {
+        "cloud": false,
+        "embed-files": false,
+        "portable": false,
+        "threaded": true
+      },
+      "id": "shake-0.19.8-0c1c0be618819bd11dd763a8e7a91729fcd8ff4c86408d0bea9294e74fcf3929",
+      "pkg-cabal-sha256": "03c8f06de478e07ad6fde95984c9206920106d0d8432ecb7ab825ef108d45382",
+      "pkg-name": "shake",
+      "pkg-src": {
+        "repo": {
+          "type": "secure-repo",
+          "uri": "http://hackage.haskell.org/"
+        },
+        "type": "repo-tar"
+      },
+      "pkg-src-sha256": "6384e33a26a2590bf33719e88881076b899ac4b5340c1c9271e4caa37e9d6535",
+      "pkg-version": "0.19.8",
+      "style": "global",
+      "type": "configured"
+    },
+    {
+      "bin-file": "/home/matt/.cabal/store/ghc-9.10.1/shake-0.19.8-e-shake-0717de1d33982165c845d071b7aa8ae0ee6fde54dbf31f3358c84e18b1c9bfb4/bin/shake",
+      "component-name": "exe:shake",
+      "depends": [
+        "base-4.20.0.0-7b2c",
+        "binary-0.8.9.2-1319",
+        "bytestring-0.12.1.0-3a9c",
+        "deepseq-1.5.0.0-98b3",
+        "directory-1.3.8.3-0bdc",
+        "extra-1.7.16-0f1ad807df16609742e167f4d9b76cb16c88f383817d1d229795907ce6cf95d4",
+        "filepath-1.5.2.0-f8c0",
+        "filepattern-0.1.3-829ecd49d01a52e6722b895978ed7e1541b789eabe6a1d606c927bcd2debd70d",
+        "hashable-1.4.4.0-7aa2e801886dbeb5752e9b5c235c3577941711f2895c80018d973a80f85f658e",
+        "heaps-0.4-44b46e42b529c2c9e40532637b1328bc2a8193bdd47a4affd37cb37e08a0e970",
+        "js-dgtable-0.5.2-b05600b19c786e69f4db5a25f3075a9969a104e273ef1f53ca19d48a9ad69f74",
+        "js-flot-0.8.3-0be850d8383fc15f0fd902a07bb6dea30f493d9d7bf92720e33b17c42dfb2dd2",
+        "js-jquery-3.3.1-2b4f2810c69abb367f6a7c62c2ba05f0fab6e92c13e6a04dd4ae47fdf2ff201e",
+        "primitive-0.9.0.0-019bcbf2dfe3b23818d6d4564c1d8f73d69950f5a3365e03a9c0b8d8ff5eb85c",
+        "process-1.6.19.0-4783",
+        "random-1.2.1.2-9b4c617605e84898a221e4d889a9a469e8169fff7d46810e3b722b06db7efe08",
+        "time-1.12.2-c1d3",
+        "transformers-0.6.1.1-f453",
+        "unix-2.8.5.1-c70e",
+        "unordered-containers-0.2.20-8830d699d9fce50100e11680eca9dbfef6e6ba09ea6f0ca8d8df9b7c74a6cc44",
+        "utf8-string-1.0.2-ebd04057b54ac3d644b8438003a75c8b5b5c3835d64170e5e1d39a74ed6bb9de"
+      ],
+      "exe-depends": [],
+      "flags": {
+        "cloud": false,
+        "embed-files": false,
+        "portable": false,
+        "threaded": true
+      },
+      "id": "shake-0.19.8-e-shake-0717de1d33982165c845d071b7aa8ae0ee6fde54dbf31f3358c84e18b1c9bfb4",
+      "pkg-cabal-sha256": "03c8f06de478e07ad6fde95984c9206920106d0d8432ecb7ab825ef108d45382",
+      "pkg-name": "shake",
+      "pkg-src": {
+        "repo": {
+          "type": "secure-repo",
+          "uri": "http://hackage.haskell.org/"
+        },
+        "type": "repo-tar"
+      },
+      "pkg-src-sha256": "6384e33a26a2590bf33719e88881076b899ac4b5340c1c9271e4caa37e9d6535",
+      "pkg-version": "0.19.8",
+      "style": "global",
+      "type": "configured"
+    },
+    {
+      "component-name": "lib",
+      "depends": [
+        "base-4.20.0.0-7b2c",
+        "deepseq-1.5.0.0-98b3"
+      ],
+      "exe-depends": [],
+      "flags": {
+        "optimised-mixer": false
+      },
+      "id": "splitmix-0.1.0.5-6a790f8a80f85ccaf35c11ab332b28ba935a84f4fd1b2750bf27f0ec4af6c625",
+      "pkg-cabal-sha256": "caa9b4a92abf1496c7f6a3c0f4e357426a54880077cb9f04e260a8bfa034b77b",
+      "pkg-name": "splitmix",
+      "pkg-src": {
+        "repo": {
+          "type": "secure-repo",
+          "uri": "http://hackage.haskell.org/"
+        },
+        "type": "repo-tar"
+      },
+      "pkg-src-sha256": "9df07a9611ef45f1b1258a0b412f4d02c920248f69d2e2ce8ccda328f7e13002",
+      "pkg-version": "0.1.0.5",
+      "style": "global",
+      "type": "configured"
+    },
+    {
+      "depends": [
+        "array-0.5.7.0-20cf",
+        "base-4.20.0.0-7b2c"
+      ],
+      "id": "stm-2.5.3.1-77c0",
+      "pkg-name": "stm",
+      "pkg-version": "2.5.3.1",
+      "type": "pre-existing"
+    },
+    {
+      "depends": [
+        "base-4.20.0.0-7b2c",
+        "ghc-boot-th-9.10.1-47ce",
+        "ghc-prim-0.11.0-e678",
+        "pretty-1.1.3.6-d2be"
+      ],
+      "id": "template-haskell-2.22.0.0-5d7d",
+      "pkg-name": "template-haskell",
+      "pkg-version": "2.22.0.0",
+      "type": "pre-existing"
+    },
+    {
+      "depends": [
+        "array-0.5.7.0-20cf",
+        "base-4.20.0.0-7b2c",
+        "binary-0.8.9.2-1319",
+        "bytestring-0.12.1.0-3a9c",
+        "deepseq-1.5.0.0-98b3",
+        "ghc-prim-0.11.0-e678",
+        "template-haskell-2.22.0.0-5d7d"
+      ],
+      "id": "text-2.1.1-ffc6",
+      "pkg-name": "text",
+      "pkg-version": "2.1.1",
+      "type": "pre-existing"
+    },
+    {
+      "depends": [
+        "base-4.20.0.0-7b2c",
+        "deepseq-1.5.0.0-98b3"
+      ],
+      "id": "time-1.12.2-c1d3",
+      "pkg-name": "time",
+      "pkg-version": "1.12.2",
+      "type": "pre-existing"
+    },
+    {
+      "depends": [
+        "base-4.20.0.0-7b2c"
+      ],
+      "id": "transformers-0.6.1.1-f453",
+      "pkg-name": "transformers",
+      "pkg-version": "0.6.1.1",
+      "type": "pre-existing"
+    },
+    {
+      "depends": [
+        "base-4.20.0.0-7b2c",
+        "bytestring-0.12.1.0-3a9c",
+        "filepath-1.5.2.0-f8c0",
+        "os-string-2.0.2-826a",
+        "time-1.12.2-c1d3"
+      ],
+      "id": "unix-2.8.5.1-c70e",
+      "pkg-name": "unix",
+      "pkg-version": "2.8.5.1",
+      "type": "pre-existing"
+    },
+    {
+      "component-name": "lib",
+      "depends": [
+        "base-4.20.0.0-7b2c",
+        "deepseq-1.5.0.0-98b3",
+        "hashable-1.4.4.0-7aa2e801886dbeb5752e9b5c235c3577941711f2895c80018d973a80f85f658e",
+        "template-haskell-2.22.0.0-5d7d"
+      ],
+      "exe-depends": [],
+      "flags": {
+        "debug": false
+      },
+      "id": "unordered-containers-0.2.20-8830d699d9fce50100e11680eca9dbfef6e6ba09ea6f0ca8d8df9b7c74a6cc44",
+      "pkg-cabal-sha256": "746c32b23f93cb13e52309e54e82d69e4315105f9815b1fcac25a57071505cff",
+      "pkg-name": "unordered-containers",
+      "pkg-src": {
+        "repo": {
+          "type": "secure-repo",
+          "uri": "http://hackage.haskell.org/"
+        },
+        "type": "repo-tar"
+      },
+      "pkg-src-sha256": "d9cfb287cf00592d39dc9c3cac8b99627ea08f2c01798e70130fc39f7c90f11d",
+      "pkg-version": "0.2.20",
+      "style": "global",
+      "type": "configured"
+    },
+    {
+      "component-name": "lib",
+      "depends": [
+        "base-4.20.0.0-7b2c",
+        "bytestring-0.12.1.0-3a9c"
+      ],
+      "exe-depends": [],
+      "flags": {},
+      "id": "utf8-string-1.0.2-ebd04057b54ac3d644b8438003a75c8b5b5c3835d64170e5e1d39a74ed6bb9de",
+      "pkg-cabal-sha256": "79416292186feeaf1f60e49ac5a1ffae9bf1b120e040a74bf0e81ca7f1d31d3f",
+      "pkg-name": "utf8-string",
+      "pkg-src": {
+        "repo": {
+          "type": "secure-repo",
+          "uri": "http://hackage.haskell.org/"
+        },
+        "type": "repo-tar"
+      },
+      "pkg-src-sha256": "ee48deada7600370728c4156cb002441de770d0121ae33a68139a9ed9c19b09a",
+      "pkg-version": "1.0.2",
+      "style": "global",
+      "type": "configured"
+    }
+  ],
+  "os": "linux"
+}
--- a/hadrian/bootstrap/plan-9_4_1.json
+++ b/hadrian/bootstrap/plan-9_4_1.json
 {
  "arch": "x86_64",
-  "cabal-lib-version": "3.10.1.0",
-  "cabal-version": "3.10.1.0",
+  "cabal-lib-version": "3.10.2.1",
+  "cabal-version": "3.10.2.1",
  "compiler-id": "ghc-9.4.1",
  "install-plan": [
    {
      "component-name": "lib",
      "depends": [
-        "Cabal-syntax-3.10.1.0-a2f0d9673cc87b79d9cfb9f8719ba62ea6d1f8b95de9b923659200b9b074a4cb",
+        "Cabal-syntax-3.10.3.0-d4d8e68e02b2d44010e1d56c847e47885186798308e2c4a0578ff604f1b70167",
        "array-0.5.4.0",
        "base-4.17.0.0",
        "bytestring-0.11.3.1",
@@ -26,8 +26,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "Cabal-3.10.1.0-af85f8fc8f6c3fb5da88550fc643f5aead967ebfe8ce3e89474854be0a88a789",
-      "pkg-cabal-sha256": "6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94",
+      "id": "Cabal-3.10.3.0-0d4b7cfbd03253be498756896857878ae4373c468a07b4619fb99511aacc398c",
+      "pkg-cabal-sha256": "4a36954a66769eef90353daa0dbb07d43e49c228281383c7e4134445d495f714",
      "pkg-name": "Cabal",
      "pkg-src": {
        "repo": {
@@ -36,8 +36,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "0bdbab8e4c3178016fb0f070d8b62bc3067f93afabfbd3aa17c8065d0ecc98ee",
-      "pkg-version": "3.10.1.0",
+      "pkg-src-sha256": "cb7f7c66626d7555f799e786513ddd65a874fd23f1cf312990c7a48abfc0b2c6",
+      "pkg-version": "3.10.3.0",
      "style": "global",
      "type": "configured"
    },
@@ -62,8 +62,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "Cabal-syntax-3.10.1.0-a2f0d9673cc87b79d9cfb9f8719ba62ea6d1f8b95de9b923659200b9b074a4cb",
-      "pkg-cabal-sha256": "bb835ebab577fd0f9c11dab96210dbb8d68ffc62652576f4b092563c345930e7",
+      "id": "Cabal-syntax-3.10.3.0-d4d8e68e02b2d44010e1d56c847e47885186798308e2c4a0578ff604f1b70167",
+      "pkg-cabal-sha256": "c2ca36499bf9365726968b1e11a757e6d846c47cdf0c2c26a003698fd3c300fe",
      "pkg-name": "Cabal-syntax",
      "pkg-src": {
        "repo": {
@@ -72,8 +72,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "3b80092355327768a0de8298ac50ee906b7e82462e2ba14542730573b453f522",
-      "pkg-version": "3.10.1.0",
+      "pkg-src-sha256": "75d6a0aa9c00990a0d6e7720ac50c6954f6c942fa1be42c8add7f1c025f7e212",
+      "pkg-version": "3.10.3.0",
      "style": "global",
      "type": "configured"
    },
@@ -192,7 +192,7 @@
        "use-cbits": true
      },
      "id": "cryptohash-sha256-0.11.102.1-803ebe82e336a8fd4af224a090f5332c52868d6c62c4e5b0fb177db5fa3b6e39",
-      "pkg-cabal-sha256": "03db065161987f614a3a2bbcd16264f78e47efe231fb5bd161be2043eaf20488",
+      "pkg-cabal-sha256": "200d756a7b3bab7ca2bac6eb50ed8252f26de77ac8def490a3ad743f2933acbd",
      "pkg-name": "cryptohash-sha256",
      "pkg-src": {
        "repo": {
@@ -229,6 +229,19 @@
      "pkg-version": "1.3.7.1",
      "type": "pre-existing"
    },
+    {
+      "depends": [
+        "base-4.17.0.0",
+        "mtl-2.2.2",
+        "stm-2.5.1.0",
+        "template-haskell-2.19.0.0",
+        "transformers-0.5.6.2"
+      ],
+      "id": "exceptions-0.10.5",
+      "pkg-name": "exceptions",
+      "pkg-version": "0.10.5",
+      "type": "pre-existing"
+    },
    {
      "component-name": "lib",
      "depends": [
@@ -242,8 +255,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "extra-1.7.14-76901140533582520b2377513509b7d78d32fe936170645b21ef87a24e44133e",
-      "pkg-cabal-sha256": "e3d3ce1dc7746b1132930e48c59fb5e8c51a09e92e0c031316be031067a273fb",
+      "id": "extra-1.7.16-9f8be4a30902ee846f7f9dda19207943dd0e87a7ffa85e54de00e91eaf904240",
+      "pkg-cabal-sha256": "edd191f77adf31acb1b53960b4d1ca9fca925ac28345a396c614414cb7bfa7ec",
      "pkg-name": "extra",
      "pkg-src": {
        "repo": {
@@ -252,8 +265,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "b6a909f8f0e4b8076a1653b4d34815a782f0a8c1e83d5267f4d00496471ef567",
-      "pkg-version": "1.7.14",
+      "pkg-src-sha256": "250c6d43c30b2c71f2cf498a10e69e43ac035974d3819529385d99e42ce77c70",
+      "pkg-version": "1.7.16",
      "style": "global",
      "type": "configured"
    },
@@ -271,12 +284,12 @@
      "depends": [
        "base-4.17.0.0",
        "directory-1.3.7.1",
-        "extra-1.7.14-76901140533582520b2377513509b7d78d32fe936170645b21ef87a24e44133e",
+        "extra-1.7.16-9f8be4a30902ee846f7f9dda19207943dd0e87a7ffa85e54de00e91eaf904240",
        "filepath-1.4.2.2"
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "filepattern-0.1.3-2d0b8589081b9da35cad9994f5da832a29a356038ce4142f8a7f331e731604e4",
+      "id": "filepattern-0.1.3-c088695284bb356be66ad57e5c101ca58b15a2ffc094d9c9207406f0606d1fcc",
      "pkg-cabal-sha256": "372c1733d83b90045eb29da9f010fed79bfef8771ce65eb126a1d83ecc54a9a2",
      "pkg-name": "filepattern",
      "pkg-src": {
@@ -310,18 +323,18 @@
      "type": "pre-existing"
    },
    {
-      "build-info": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.1/ghc-platform-0.1.0.0/build-info.json",
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.1/ghc-platform-0.1.0.0/build-info.json",
      "component-name": "lib",
      "depends": [
        "base-4.17.0.0"
      ],
-      "dist-dir": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.1/ghc-platform-0.1.0.0",
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.1/ghc-platform-0.1.0.0",
      "exe-depends": [],
      "flags": {},
      "id": "ghc-platform-0.1.0.0-inplace",
      "pkg-name": "ghc-platform",
      "pkg-src": {
-        "path": "/home/matt/ghc-scratch/hadrian/../libraries/ghc-platform",
+        "path": "/home/matt/ghc-llvm/hadrian/../libraries/ghc-platform",
        "type": "local"
      },
      "pkg-version": "0.1.0.0",
@@ -338,7 +351,7 @@
      "type": "pre-existing"
    },
    {
-      "build-info": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.1/ghc-toolchain-0.1.0.0/build-info.json",
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.1/ghc-toolchain-0.1.0.0/build-info.json",
      "component-name": "lib",
      "depends": [
        "base-4.17.0.0",
@@ -349,13 +362,13 @@
        "text-2.0.1",
        "transformers-0.5.6.2"
      ],
-      "dist-dir": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.1/ghc-toolchain-0.1.0.0",
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.1/ghc-toolchain-0.1.0.0",
      "exe-depends": [],
      "flags": {},
      "id": "ghc-toolchain-0.1.0.0-inplace",
      "pkg-name": "ghc-toolchain",
      "pkg-src": {
-        "path": "/home/matt/ghc-scratch/hadrian/../utils/ghc-toolchain",
+        "path": "/home/matt/ghc-llvm/hadrian/../utils/ghc-toolchain",
        "type": "local"
      },
      "pkg-version": "0.1.0.0",
@@ -363,30 +376,30 @@
      "type": "configured"
    },
    {
-      "bin-file": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.1/hadrian-0.1.0.0/x/hadrian/build/hadrian/hadrian",
-      "build-info": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.1/hadrian-0.1.0.0/x/hadrian/build-info.json",
+      "bin-file": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.1/hadrian-0.1.0.0/x/hadrian/build/hadrian/hadrian",
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.1/hadrian-0.1.0.0/x/hadrian/build-info.json",
      "component-name": "exe:hadrian",
      "depends": [
-        "Cabal-3.10.1.0-af85f8fc8f6c3fb5da88550fc643f5aead967ebfe8ce3e89474854be0a88a789",
+        "Cabal-3.10.3.0-0d4b7cfbd03253be498756896857878ae4373c468a07b4619fb99511aacc398c",
        "base-4.17.0.0",
        "base16-bytestring-1.0.2.0-1f4d5cfa7c972d59268ad23a58928ca71cb3b0b4d99ecfb3365582489f8d5c7a",
        "bytestring-0.11.3.1",
        "containers-0.6.6",
        "cryptohash-sha256-0.11.102.1-803ebe82e336a8fd4af224a090f5332c52868d6c62c4e5b0fb177db5fa3b6e39",
        "directory-1.3.7.1",
-        "extra-1.7.14-76901140533582520b2377513509b7d78d32fe936170645b21ef87a24e44133e",
+        "extra-1.7.16-9f8be4a30902ee846f7f9dda19207943dd0e87a7ffa85e54de00e91eaf904240",
        "filepath-1.4.2.2",
        "ghc-platform-0.1.0.0-inplace",
        "ghc-toolchain-0.1.0.0-inplace",
        "mtl-2.2.2",
        "parsec-3.1.15.0",
-        "shake-0.19.7-3828862d6a9bbc9c4cd25a89488b7aa0178995fb0462d5f287f6795d10fba6c8",
+        "shake-0.19.8-0153d428dff4c030362f62e63353a84b18fcff065ddb63606a3a31f16bcae149",
        "text-2.0.1",
        "time-1.12.2",
        "transformers-0.5.6.2",
-        "unordered-containers-0.2.19.1-a731e1e8d98096abcf7d153cfda069a5a5e450953246e3493c262302c0ea7b43"
+        "unordered-containers-0.2.20-152bc2f9440c0090b1e25f0ba82d5569176a7bc9a52803c139cbb735ef5b99cf"
      ],
-      "dist-dir": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.1/hadrian-0.1.0.0/x/hadrian",
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.1/hadrian-0.1.0.0/x/hadrian",
      "exe-depends": [],
      "flags": {
        "selftest": false,
@@ -395,7 +408,7 @@
      "id": "hadrian-0.1.0.0-inplace-hadrian",
      "pkg-name": "hadrian",
      "pkg-src": {
-        "path": "/home/matt/ghc-scratch/hadrian/.",
+        "path": "/home/matt/ghc-llvm/hadrian/.",
        "type": "local"
      },
      "pkg-version": "0.1.0.0",
@@ -412,6 +425,7 @@
        "filepath-1.4.2.2",
        "ghc-bignum-1.3",
        "ghc-prim-0.9.0",
+        "os-string-2.0.2.2-8e826da08950b2df12c9b0104b20d66d7d46ce5a699a1eb129cb4535eb0444af",
        "text-2.0.1"
      ],
      "exe-depends": [],
@@ -419,8 +433,8 @@
        "integer-gmp": true,
        "random-initial-seed": false
      },
-      "id": "hashable-1.4.3.0-944bf071b864eb46b0dc5818116a1f1ebd12d09df2e94469f3d933f9110c6dad",
-      "pkg-cabal-sha256": "f3bf68acfa0df7a064a378ef2cdcfeb55e6fb96100675f4c593556dcbf3d7194",
+      "id": "hashable-1.4.4.0-acc7039b944573eb0f0abc941e0d8fd14d4c4eaa05451ba68986f3c6f88f78e1",
+      "pkg-cabal-sha256": "ae22238274c572aa91e90c6c353e7206386708912ac5e6dc40ac61d1dcc553db",
      "pkg-name": "hashable",
      "pkg-src": {
        "repo": {
@@ -429,8 +443,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "32efb16c2891786209b7cbe5c39df9b3a9ae51e836f1a54f646bc4602b7ab0f5",
-      "pkg-version": "1.4.3.0",
+      "pkg-src-sha256": "1fa3d64548440942b2b38b99c76d8dcaa94fa2ea3912cd7a6354ea4ec4af4758",
+      "pkg-version": "1.4.4.0",
      "style": "global",
      "type": "configured"
    },
@@ -532,6 +546,32 @@
      "pkg-version": "2.2.2",
      "type": "pre-existing"
    },
+    {
+      "component-name": "lib",
+      "depends": [
+        "base-4.17.0.0",
+        "bytestring-0.11.3.1",
+        "deepseq-1.4.8.0",
+        "exceptions-0.10.5",
+        "template-haskell-2.19.0.0"
+      ],
+      "exe-depends": [],
+      "flags": {},
+      "id": "os-string-2.0.2.2-8e826da08950b2df12c9b0104b20d66d7d46ce5a699a1eb129cb4535eb0444af",
+      "pkg-cabal-sha256": "704ea0b499f9d4e43c98fd11e2fcf6b8762a1daa91114aa195966ebcc76a8d51",
+      "pkg-name": "os-string",
+      "pkg-src": {
+        "repo": {
+          "type": "secure-repo",
+          "uri": "http://hackage.haskell.org/"
+        },
+        "type": "repo-tar"
+      },
+      "pkg-src-sha256": "3fcc0d7657207d5ee45ce8994a74c5baa2f1149bbd28b3b75e2f646ed4a7251c",
+      "pkg-version": "2.0.2.2",
+      "style": "global",
+      "type": "configured"
+    },
    {
      "depends": [
        "base-4.17.0.0",
@@ -565,8 +605,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "primitive-0.8.0.0-a07f2cbfdf3613880c3e9948bf6f846af5c8ceff5ece4c0866ecec26372c90ef",
-      "pkg-cabal-sha256": "d0ff45fa6e61f92af23611ceb8b9a6a04c236b50fb70c60e2ed3bfa532703670",
+      "id": "primitive-0.9.0.0-d389911163414aed363b9842844cb5a612e17e9e0df06517fdd974607a5cd577",
+      "pkg-cabal-sha256": "2e08c5409e3559c7f1669ef50e9a0d9a397e68ecf51110d5e2cedf05cdd7d93c",
      "pkg-name": "primitive",
      "pkg-src": {
        "repo": {
@@ -575,8 +615,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "5553c21b4a789f9b591eed69e598cc58484c274af29250e517b5a8bcc62b995f",
-      "pkg-version": "0.8.0.0",
+      "pkg-src-sha256": "696d4bd291c94d736142d6182117dca4258d3ef28bfefdb649ac8b5ecd0999c7",
+      "pkg-version": "0.9.0.0",
      "style": "global",
      "type": "configured"
    },
@@ -604,8 +644,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "random-1.2.1.1-da1e9fcc174cdde838ed06ee0c5f9adc4c468374e22f2ac9b090d83a36270976",
-      "pkg-cabal-sha256": "e7c1f881159d5cc788619c9ee8b8f340ba2ff0db571cdf3d1a1968ebc5108789",
+      "id": "random-1.2.1.2-a63df25df723b5c80b4cc9017b590255ad6c6a90e9dc888d507a9ce5b5697649",
+      "pkg-cabal-sha256": "32397de181e20ccaacf806ec70de9308cf044f089a2be37c936f3f8967bde867",
      "pkg-name": "random",
      "pkg-src": {
        "repo": {
@@ -614,8 +654,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "3e1272f7ed6a4d7bd1712b90143ec326fee9b225789222379fea20a9c90c9b76",
-      "pkg-version": "1.2.1.1",
+      "pkg-src-sha256": "790f4dc2d2327c453ff6aac7bf15399fd123d55e927935f68f84b5df42d9a4b4",
+      "pkg-version": "1.2.1.2",
      "style": "global",
      "type": "configured"
    },
@@ -634,31 +674,32 @@
        "bytestring-0.11.3.1",
        "deepseq-1.4.8.0",
        "directory-1.3.7.1",
-        "extra-1.7.14-76901140533582520b2377513509b7d78d32fe936170645b21ef87a24e44133e",
+        "extra-1.7.16-9f8be4a30902ee846f7f9dda19207943dd0e87a7ffa85e54de00e91eaf904240",
        "filepath-1.4.2.2",
-        "filepattern-0.1.3-2d0b8589081b9da35cad9994f5da832a29a356038ce4142f8a7f331e731604e4",
-        "hashable-1.4.3.0-944bf071b864eb46b0dc5818116a1f1ebd12d09df2e94469f3d933f9110c6dad",
+        "filepattern-0.1.3-c088695284bb356be66ad57e5c101ca58b15a2ffc094d9c9207406f0606d1fcc",
+        "hashable-1.4.4.0-acc7039b944573eb0f0abc941e0d8fd14d4c4eaa05451ba68986f3c6f88f78e1",
        "heaps-0.4-d1d68f7c84e754e5527bfaaf57fe936b7f3b2b13e01ac163bc9a145b2c17fb89",
        "js-dgtable-0.5.2-7f3616a8d595fe6976ea0cb3b170d51977ab2192394f2cced30c728a1d74f43f",
        "js-flot-0.8.3-de26baf8fa0904dfce2de4ccf078d2c29c945ae9f648843adff7b2ba89aaf21e",
        "js-jquery-3.3.1-8a9c7917a9dfc2db75c2a6e4ccbf90329439c9eafb99fef5ab5eaf3d84b7367a",
-        "primitive-0.8.0.0-a07f2cbfdf3613880c3e9948bf6f846af5c8ceff5ece4c0866ecec26372c90ef",
+        "primitive-0.9.0.0-d389911163414aed363b9842844cb5a612e17e9e0df06517fdd974607a5cd577",
        "process-1.6.15.0",
-        "random-1.2.1.1-da1e9fcc174cdde838ed06ee0c5f9adc4c468374e22f2ac9b090d83a36270976",
+        "random-1.2.1.2-a63df25df723b5c80b4cc9017b590255ad6c6a90e9dc888d507a9ce5b5697649",
        "time-1.12.2",
        "transformers-0.5.6.2",
        "unix-2.7.3",
-        "unordered-containers-0.2.19.1-a731e1e8d98096abcf7d153cfda069a5a5e450953246e3493c262302c0ea7b43",
+        "unordered-containers-0.2.20-152bc2f9440c0090b1e25f0ba82d5569176a7bc9a52803c139cbb735ef5b99cf",
        "utf8-string-1.0.2-8b361b9c94c1703201cb4bc630efe378dcce466e835f8da6034b19636a724526"
      ],
      "exe-depends": [],
      "flags": {
        "cloud": false,
        "embed-files": false,
-        "portable": false
+        "portable": false,
+        "threaded": true
      },
-      "id": "shake-0.19.7-3828862d6a9bbc9c4cd25a89488b7aa0178995fb0462d5f287f6795d10fba6c8",
-      "pkg-cabal-sha256": "3cb5814cce210b9756fa9246ff1b2a1e1b86be46fdc4c5e2baacdc5bf83ce5c3",
+      "id": "shake-0.19.8-0153d428dff4c030362f62e63353a84b18fcff065ddb63606a3a31f16bcae149",
+      "pkg-cabal-sha256": "03c8f06de478e07ad6fde95984c9206920106d0d8432ecb7ab825ef108d45382",
      "pkg-name": "shake",
      "pkg-src": {
        "repo": {
@@ -667,13 +708,13 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "352a56af12f70b50d564dcb61131555577281957ee196f1702a3723c0a3699d1",
-      "pkg-version": "0.19.7",
+      "pkg-src-sha256": "6384e33a26a2590bf33719e88881076b899ac4b5340c1c9271e4caa37e9d6535",
+      "pkg-version": "0.19.8",
      "style": "global",
      "type": "configured"
    },
    {
-      "bin-file": "/home/matt/.cabal/store/ghc-9.4.1/shake-0.19.7-e-shake-4e6e3f2d9887fa26808df38fbddbc9250a8c6b5819331616488afbae8492a6fb/bin/shake",
+      "bin-file": "/home/matt/.cabal/store/ghc-9.4.1/shake-0.19.8-e-shake-4e532c56722c23b9e8131fd2101abb4897d78ed096826da264c53bde429396fe/bin/shake",
      "component-name": "exe:shake",
      "depends": [
        "base-4.17.0.0",
@@ -681,31 +722,32 @@
        "bytestring-0.11.3.1",
        "deepseq-1.4.8.0",
        "directory-1.3.7.1",
-        "extra-1.7.14-76901140533582520b2377513509b7d78d32fe936170645b21ef87a24e44133e",
+        "extra-1.7.16-9f8be4a30902ee846f7f9dda19207943dd0e87a7ffa85e54de00e91eaf904240",
        "filepath-1.4.2.2",
-        "filepattern-0.1.3-2d0b8589081b9da35cad9994f5da832a29a356038ce4142f8a7f331e731604e4",
-        "hashable-1.4.3.0-944bf071b864eb46b0dc5818116a1f1ebd12d09df2e94469f3d933f9110c6dad",
+        "filepattern-0.1.3-c088695284bb356be66ad57e5c101ca58b15a2ffc094d9c9207406f0606d1fcc",
+        "hashable-1.4.4.0-acc7039b944573eb0f0abc941e0d8fd14d4c4eaa05451ba68986f3c6f88f78e1",
        "heaps-0.4-d1d68f7c84e754e5527bfaaf57fe936b7f3b2b13e01ac163bc9a145b2c17fb89",
        "js-dgtable-0.5.2-7f3616a8d595fe6976ea0cb3b170d51977ab2192394f2cced30c728a1d74f43f",
        "js-flot-0.8.3-de26baf8fa0904dfce2de4ccf078d2c29c945ae9f648843adff7b2ba89aaf21e",
        "js-jquery-3.3.1-8a9c7917a9dfc2db75c2a6e4ccbf90329439c9eafb99fef5ab5eaf3d84b7367a",
-        "primitive-0.8.0.0-a07f2cbfdf3613880c3e9948bf6f846af5c8ceff5ece4c0866ecec26372c90ef",
+        "primitive-0.9.0.0-d389911163414aed363b9842844cb5a612e17e9e0df06517fdd974607a5cd577",
        "process-1.6.15.0",
-        "random-1.2.1.1-da1e9fcc174cdde838ed06ee0c5f9adc4c468374e22f2ac9b090d83a36270976",
+        "random-1.2.1.2-a63df25df723b5c80b4cc9017b590255ad6c6a90e9dc888d507a9ce5b5697649",
        "time-1.12.2",
        "transformers-0.5.6.2",
        "unix-2.7.3",
-        "unordered-containers-0.2.19.1-a731e1e8d98096abcf7d153cfda069a5a5e450953246e3493c262302c0ea7b43",
+        "unordered-containers-0.2.20-152bc2f9440c0090b1e25f0ba82d5569176a7bc9a52803c139cbb735ef5b99cf",
        "utf8-string-1.0.2-8b361b9c94c1703201cb4bc630efe378dcce466e835f8da6034b19636a724526"
      ],
      "exe-depends": [],
      "flags": {
        "cloud": false,
        "embed-files": false,
-        "portable": false
+        "portable": false,
+        "threaded": true
      },
-      "id": "shake-0.19.7-e-shake-4e6e3f2d9887fa26808df38fbddbc9250a8c6b5819331616488afbae8492a6fb",
-      "pkg-cabal-sha256": "3cb5814cce210b9756fa9246ff1b2a1e1b86be46fdc4c5e2baacdc5bf83ce5c3",
+      "id": "shake-0.19.8-e-shake-4e532c56722c23b9e8131fd2101abb4897d78ed096826da264c53bde429396fe",
+      "pkg-cabal-sha256": "03c8f06de478e07ad6fde95984c9206920106d0d8432ecb7ab825ef108d45382",
      "pkg-name": "shake",
      "pkg-src": {
        "repo": {
@@ -714,8 +756,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "352a56af12f70b50d564dcb61131555577281957ee196f1702a3723c0a3699d1",
-      "pkg-version": "0.19.7",
+      "pkg-src-sha256": "6384e33a26a2590bf33719e88881076b899ac4b5340c1c9271e4caa37e9d6535",
+      "pkg-version": "0.19.8",
      "style": "global",
      "type": "configured"
    },
@@ -730,7 +772,7 @@
        "optimised-mixer": false
      },
      "id": "splitmix-0.1.0.5-0dbf3028080d345426a99a5d67d8937318cb88629e23530a4ec9962874d939bd",
-      "pkg-cabal-sha256": "bac0ae8d46a04e410666b0c8081cff63f060f29157983b569ca86ddb6e6e0dc6",
+      "pkg-cabal-sha256": "caa9b4a92abf1496c7f6a3c0f4e357426a54880077cb9f04e260a8bfa034b77b",
      "pkg-name": "splitmix",
      "pkg-src": {
        "repo": {
@@ -744,6 +786,16 @@
      "style": "global",
      "type": "configured"
    },
+    {
+      "depends": [
+        "array-0.5.4.0",
+        "base-4.17.0.0"
+      ],
+      "id": "stm-2.5.1.0",
+      "pkg-name": "stm",
+      "pkg-version": "2.5.1.0",
+      "type": "pre-existing"
+    },
    {
      "depends": [
        "base-4.17.0.0",
@@ -806,15 +858,15 @@
      "depends": [
        "base-4.17.0.0",
        "deepseq-1.4.8.0",
-        "hashable-1.4.3.0-944bf071b864eb46b0dc5818116a1f1ebd12d09df2e94469f3d933f9110c6dad",
+        "hashable-1.4.4.0-acc7039b944573eb0f0abc941e0d8fd14d4c4eaa05451ba68986f3c6f88f78e1",
        "template-haskell-2.19.0.0"
      ],
      "exe-depends": [],
      "flags": {
        "debug": false
      },
-      "id": "unordered-containers-0.2.19.1-a731e1e8d98096abcf7d153cfda069a5a5e450953246e3493c262302c0ea7b43",
-      "pkg-cabal-sha256": "9ad8972c2e913c37b1d4f0e1261517fd7a1b8c8a58077e057be69837e3dbaa00",
+      "id": "unordered-containers-0.2.20-152bc2f9440c0090b1e25f0ba82d5569176a7bc9a52803c139cbb735ef5b99cf",
+      "pkg-cabal-sha256": "746c32b23f93cb13e52309e54e82d69e4315105f9815b1fcac25a57071505cff",
      "pkg-name": "unordered-containers",
      "pkg-src": {
        "repo": {
@@ -823,8 +875,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "1b27bec5e0d522b27a6029ebf4c4a6d40acbc083c787008e32fb55c4b1d128d2",
-      "pkg-version": "0.2.19.1",
+      "pkg-src-sha256": "d9cfb287cf00592d39dc9c3cac8b99627ea08f2c01798e70130fc39f7c90f11d",
+      "pkg-version": "0.2.20",
      "style": "global",
      "type": "configured"
    },

--- a/hadrian/bootstrap/plan-9_4_2.json
+++ b/hadrian/bootstrap/plan-9_4_2.json
 {
  "arch": "x86_64",
-  "cabal-lib-version": "3.10.1.0",
-  "cabal-version": "3.10.1.0",
+  "cabal-lib-version": "3.10.2.1",
+  "cabal-version": "3.10.2.1",
  "compiler-id": "ghc-9.4.2",
  "install-plan": [
    {
      "component-name": "lib",
      "depends": [
-        "Cabal-syntax-3.10.1.0-7a624b5098593c9a4cdb6be42c4aa99270da31d60d41f45d98d9a41ac596de9c",
+        "Cabal-syntax-3.10.3.0-8f1027c1e5be36ae3f42c528fdd3788c20c204bad08cf29f38808a3cb3bb7cb8",
        "array-0.5.4.0",
        "base-4.17.0.0",
        "bytestring-0.11.3.1",
@@ -26,8 +26,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "Cabal-3.10.1.0-d7f4b447dfe982047cc5f52c4b95a0c4a42ce39c4f63fe58186f1d8da47e624b",
-      "pkg-cabal-sha256": "6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94",
+      "id": "Cabal-3.10.3.0-4913853cc079c2f259bb8b2af756c0d62830ea0614ae029147ac19bea5b0d898",
+      "pkg-cabal-sha256": "4a36954a66769eef90353daa0dbb07d43e49c228281383c7e4134445d495f714",
      "pkg-name": "Cabal",
      "pkg-src": {
        "repo": {
@@ -36,8 +36,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "0bdbab8e4c3178016fb0f070d8b62bc3067f93afabfbd3aa17c8065d0ecc98ee",
-      "pkg-version": "3.10.1.0",
+      "pkg-src-sha256": "cb7f7c66626d7555f799e786513ddd65a874fd23f1cf312990c7a48abfc0b2c6",
+      "pkg-version": "3.10.3.0",
      "style": "global",
      "type": "configured"
    },
@@ -62,8 +62,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "Cabal-syntax-3.10.1.0-7a624b5098593c9a4cdb6be42c4aa99270da31d60d41f45d98d9a41ac596de9c",
-      "pkg-cabal-sha256": "bb835ebab577fd0f9c11dab96210dbb8d68ffc62652576f4b092563c345930e7",
+      "id": "Cabal-syntax-3.10.3.0-8f1027c1e5be36ae3f42c528fdd3788c20c204bad08cf29f38808a3cb3bb7cb8",
+      "pkg-cabal-sha256": "c2ca36499bf9365726968b1e11a757e6d846c47cdf0c2c26a003698fd3c300fe",
      "pkg-name": "Cabal-syntax",
      "pkg-src": {
        "repo": {
@@ -72,8 +72,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "3b80092355327768a0de8298ac50ee906b7e82462e2ba14542730573b453f522",
-      "pkg-version": "3.10.1.0",
+      "pkg-src-sha256": "75d6a0aa9c00990a0d6e7720ac50c6954f6c942fa1be42c8add7f1c025f7e212",
+      "pkg-version": "3.10.3.0",
      "style": "global",
      "type": "configured"
    },
@@ -192,7 +192,7 @@
        "use-cbits": true
      },
      "id": "cryptohash-sha256-0.11.102.1-e0ecce2a2a105f81f515ad74e9fd132a406a856efa250f47178547d401b9ef87",
-      "pkg-cabal-sha256": "03db065161987f614a3a2bbcd16264f78e47efe231fb5bd161be2043eaf20488",
+      "pkg-cabal-sha256": "200d756a7b3bab7ca2bac6eb50ed8252f26de77ac8def490a3ad743f2933acbd",
      "pkg-name": "cryptohash-sha256",
      "pkg-src": {
        "repo": {
@@ -229,6 +229,19 @@
      "pkg-version": "1.3.7.1",
      "type": "pre-existing"
    },
+    {
+      "depends": [
+        "base-4.17.0.0",
+        "mtl-2.2.2",
+        "stm-2.5.1.0",
+        "template-haskell-2.19.0.0",
+        "transformers-0.5.6.2"
+      ],
+      "id": "exceptions-0.10.5",
+      "pkg-name": "exceptions",
+      "pkg-version": "0.10.5",
+      "type": "pre-existing"
+    },
    {
      "component-name": "lib",
      "depends": [
@@ -242,8 +255,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "extra-1.7.14-a97afbf47bcedc09cfe883cddb7791edf359849ff8672e2940dd809bd57e528d",
-      "pkg-cabal-sha256": "e3d3ce1dc7746b1132930e48c59fb5e8c51a09e92e0c031316be031067a273fb",
+      "id": "extra-1.7.16-d063cbfed5adf9061f1e247a9eb7664cbe40f11f03cf40702eb70ce48d2662ea",
+      "pkg-cabal-sha256": "edd191f77adf31acb1b53960b4d1ca9fca925ac28345a396c614414cb7bfa7ec",
      "pkg-name": "extra",
      "pkg-src": {
        "repo": {
@@ -252,8 +265,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "b6a909f8f0e4b8076a1653b4d34815a782f0a8c1e83d5267f4d00496471ef567",
-      "pkg-version": "1.7.14",
+      "pkg-src-sha256": "250c6d43c30b2c71f2cf498a10e69e43ac035974d3819529385d99e42ce77c70",
+      "pkg-version": "1.7.16",
      "style": "global",
      "type": "configured"
    },
@@ -271,12 +284,12 @@
      "depends": [
        "base-4.17.0.0",
        "directory-1.3.7.1",
-        "extra-1.7.14-a97afbf47bcedc09cfe883cddb7791edf359849ff8672e2940dd809bd57e528d",
+        "extra-1.7.16-d063cbfed5adf9061f1e247a9eb7664cbe40f11f03cf40702eb70ce48d2662ea",
        "filepath-1.4.2.2"
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "filepattern-0.1.3-f303652a8da5b24bb3de5bdba71f956b7cc18a559df508784671a4306cfb2a27",
+      "id": "filepattern-0.1.3-2893044b1658da283647f3b8e31d0eeb995ef35137e79e17aa6f7aeadf6c4a3f",
      "pkg-cabal-sha256": "372c1733d83b90045eb29da9f010fed79bfef8771ce65eb126a1d83ecc54a9a2",
      "pkg-name": "filepattern",
      "pkg-src": {
@@ -310,18 +323,18 @@
      "type": "pre-existing"
    },
    {
-      "build-info": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.2/ghc-platform-0.1.0.0/build-info.json",
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.2/ghc-platform-0.1.0.0/build-info.json",
      "component-name": "lib",
      "depends": [
        "base-4.17.0.0"
      ],
-      "dist-dir": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.2/ghc-platform-0.1.0.0",
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.2/ghc-platform-0.1.0.0",
      "exe-depends": [],
      "flags": {},
      "id": "ghc-platform-0.1.0.0-inplace",
      "pkg-name": "ghc-platform",
      "pkg-src": {
-        "path": "/home/matt/ghc-scratch/hadrian/../libraries/ghc-platform",
+        "path": "/home/matt/ghc-llvm/hadrian/../libraries/ghc-platform",
        "type": "local"
      },
      "pkg-version": "0.1.0.0",
@@ -338,7 +351,7 @@
      "type": "pre-existing"
    },
    {
-      "build-info": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.2/ghc-toolchain-0.1.0.0/build-info.json",
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.2/ghc-toolchain-0.1.0.0/build-info.json",
      "component-name": "lib",
      "depends": [
        "base-4.17.0.0",
@@ -349,13 +362,13 @@
        "text-2.0.1",
        "transformers-0.5.6.2"
      ],
-      "dist-dir": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.2/ghc-toolchain-0.1.0.0",
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.2/ghc-toolchain-0.1.0.0",
      "exe-depends": [],
      "flags": {},
      "id": "ghc-toolchain-0.1.0.0-inplace",
      "pkg-name": "ghc-toolchain",
      "pkg-src": {
-        "path": "/home/matt/ghc-scratch/hadrian/../utils/ghc-toolchain",
+        "path": "/home/matt/ghc-llvm/hadrian/../utils/ghc-toolchain",
        "type": "local"
      },
      "pkg-version": "0.1.0.0",
@@ -363,30 +376,30 @@
      "type": "configured"
    },
    {
-      "bin-file": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.2/hadrian-0.1.0.0/x/hadrian/build/hadrian/hadrian",
-      "build-info": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.2/hadrian-0.1.0.0/x/hadrian/build-info.json",
+      "bin-file": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.2/hadrian-0.1.0.0/x/hadrian/build/hadrian/hadrian",
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.2/hadrian-0.1.0.0/x/hadrian/build-info.json",
      "component-name": "exe:hadrian",
      "depends": [
-        "Cabal-3.10.1.0-d7f4b447dfe982047cc5f52c4b95a0c4a42ce39c4f63fe58186f1d8da47e624b",
+        "Cabal-3.10.3.0-4913853cc079c2f259bb8b2af756c0d62830ea0614ae029147ac19bea5b0d898",
        "base-4.17.0.0",
        "base16-bytestring-1.0.2.0-8845b9b845268782664a9731259247bb8eb1e18dc03a39dadfe77b42101a894d",
        "bytestring-0.11.3.1",
        "containers-0.6.6",
        "cryptohash-sha256-0.11.102.1-e0ecce2a2a105f81f515ad74e9fd132a406a856efa250f47178547d401b9ef87",
        "directory-1.3.7.1",
-        "extra-1.7.14-a97afbf47bcedc09cfe883cddb7791edf359849ff8672e2940dd809bd57e528d",
+        "extra-1.7.16-d063cbfed5adf9061f1e247a9eb7664cbe40f11f03cf40702eb70ce48d2662ea",
        "filepath-1.4.2.2",
        "ghc-platform-0.1.0.0-inplace",
        "ghc-toolchain-0.1.0.0-inplace",
        "mtl-2.2.2",
        "parsec-3.1.15.0",
-        "shake-0.19.7-e45d30b7d0b9b4c6ded0205f86e195328e745ccd3d15ba85ed84ab0992b7e841",
+        "shake-0.19.8-a4594a359c329e856f78f34f7c00eab65b0d01319a456809f78ea858049b9663",
        "text-2.0.1",
        "time-1.12.2",
        "transformers-0.5.6.2",
-        "unordered-containers-0.2.19.1-605cc4d0d7cc573beaaa8c26e0b0a759878f0f220758e031160ef7ae5208a68d"
+        "unordered-containers-0.2.20-5d3fcdb830ac91876d3f0bd9bac19d2d9a8b1bebbd028dd89b9cfbf6e03189ea"
      ],
-      "dist-dir": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.2/hadrian-0.1.0.0/x/hadrian",
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.2/hadrian-0.1.0.0/x/hadrian",
      "exe-depends": [],
      "flags": {
        "selftest": false,
@@ -395,7 +408,7 @@
      "id": "hadrian-0.1.0.0-inplace-hadrian",
      "pkg-name": "hadrian",
      "pkg-src": {
-        "path": "/home/matt/ghc-scratch/hadrian/.",
+        "path": "/home/matt/ghc-llvm/hadrian/.",
        "type": "local"
      },
      "pkg-version": "0.1.0.0",
@@ -412,6 +425,7 @@
        "filepath-1.4.2.2",
        "ghc-bignum-1.3",
        "ghc-prim-0.9.0",
+        "os-string-2.0.2.2-61b85b29438576a9647e9fbd5f5db9e2838bd8536a1fae03e25d2983ee29acf3",
        "text-2.0.1"
      ],
      "exe-depends": [],
@@ -419,8 +433,8 @@
        "integer-gmp": true,
        "random-initial-seed": false
      },
-      "id": "hashable-1.4.3.0-1a35fbaa3faabcc0c381f5aa7330fe436d8af61c2711fdd9764ee9aba0fcdcf1",
-      "pkg-cabal-sha256": "f3bf68acfa0df7a064a378ef2cdcfeb55e6fb96100675f4c593556dcbf3d7194",
+      "id": "hashable-1.4.4.0-39f8034b6553f47269dccbc5dd4b17d9392ef9094e57a8ebf406cd1b24dc286e",
+      "pkg-cabal-sha256": "ae22238274c572aa91e90c6c353e7206386708912ac5e6dc40ac61d1dcc553db",
      "pkg-name": "hashable",
      "pkg-src": {
        "repo": {
@@ -429,8 +443,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "32efb16c2891786209b7cbe5c39df9b3a9ae51e836f1a54f646bc4602b7ab0f5",
-      "pkg-version": "1.4.3.0",
+      "pkg-src-sha256": "1fa3d64548440942b2b38b99c76d8dcaa94fa2ea3912cd7a6354ea4ec4af4758",
+      "pkg-version": "1.4.4.0",
      "style": "global",
      "type": "configured"
    },
@@ -532,6 +546,32 @@
      "pkg-version": "2.2.2",
      "type": "pre-existing"
    },
+    {
+      "component-name": "lib",
+      "depends": [
+        "base-4.17.0.0",
+        "bytestring-0.11.3.1",
+        "deepseq-1.4.8.0",
+        "exceptions-0.10.5",
+        "template-haskell-2.19.0.0"
+      ],
+      "exe-depends": [],
+      "flags": {},
+      "id": "os-string-2.0.2.2-61b85b29438576a9647e9fbd5f5db9e2838bd8536a1fae03e25d2983ee29acf3",
+      "pkg-cabal-sha256": "704ea0b499f9d4e43c98fd11e2fcf6b8762a1daa91114aa195966ebcc76a8d51",
+      "pkg-name": "os-string",
+      "pkg-src": {
+        "repo": {
+          "type": "secure-repo",
+          "uri": "http://hackage.haskell.org/"
+        },
+        "type": "repo-tar"
+      },
+      "pkg-src-sha256": "3fcc0d7657207d5ee45ce8994a74c5baa2f1149bbd28b3b75e2f646ed4a7251c",
+      "pkg-version": "2.0.2.2",
+      "style": "global",
+      "type": "configured"
+    },
    {
      "depends": [
        "base-4.17.0.0",
@@ -565,8 +605,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "primitive-0.8.0.0-c149e96dd6c8e609c75b5c29aa28e8cd219c971a12e6e067d5b176788da134c7",
-      "pkg-cabal-sha256": "d0ff45fa6e61f92af23611ceb8b9a6a04c236b50fb70c60e2ed3bfa532703670",
+      "id": "primitive-0.9.0.0-07894fde1eacd247928006cbe2bc7977cd77b13df49f1211170bf702e0541be8",
+      "pkg-cabal-sha256": "2e08c5409e3559c7f1669ef50e9a0d9a397e68ecf51110d5e2cedf05cdd7d93c",
      "pkg-name": "primitive",
      "pkg-src": {
        "repo": {
@@ -575,8 +615,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "5553c21b4a789f9b591eed69e598cc58484c274af29250e517b5a8bcc62b995f",
-      "pkg-version": "0.8.0.0",
+      "pkg-src-sha256": "696d4bd291c94d736142d6182117dca4258d3ef28bfefdb649ac8b5ecd0999c7",
+      "pkg-version": "0.9.0.0",
      "style": "global",
      "type": "configured"
    },
@@ -604,8 +644,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "random-1.2.1.1-8a613adc0408b9188e9f5f6b9a9334cb9cb3bb022c712faee9552e6b7739f9c2",
-      "pkg-cabal-sha256": "e7c1f881159d5cc788619c9ee8b8f340ba2ff0db571cdf3d1a1968ebc5108789",
+      "id": "random-1.2.1.2-329f042d78244e630f8e77895bef07b54584e0caa2c4807e8f942fa8c6b8a28f",
+      "pkg-cabal-sha256": "32397de181e20ccaacf806ec70de9308cf044f089a2be37c936f3f8967bde867",
      "pkg-name": "random",
      "pkg-src": {
        "repo": {
@@ -614,8 +654,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "3e1272f7ed6a4d7bd1712b90143ec326fee9b225789222379fea20a9c90c9b76",
-      "pkg-version": "1.2.1.1",
+      "pkg-src-sha256": "790f4dc2d2327c453ff6aac7bf15399fd123d55e927935f68f84b5df42d9a4b4",
+      "pkg-version": "1.2.1.2",
      "style": "global",
      "type": "configured"
    },
@@ -627,39 +667,39 @@
      "type": "pre-existing"
    },
    {
-      "bin-file": "/home/matt/.cabal/store/ghc-9.4.2/shake-0.19.7-e-shake-fb4ada82cc527d6f4c8d2173d22d4774d09258ce73d49f7e4246b27acdb16027/bin/shake",
-      "component-name": "exe:shake",
+      "component-name": "lib",
      "depends": [
        "base-4.17.0.0",
        "binary-0.8.9.1",
        "bytestring-0.11.3.1",
        "deepseq-1.4.8.0",
        "directory-1.3.7.1",
-        "extra-1.7.14-a97afbf47bcedc09cfe883cddb7791edf359849ff8672e2940dd809bd57e528d",
+        "extra-1.7.16-d063cbfed5adf9061f1e247a9eb7664cbe40f11f03cf40702eb70ce48d2662ea",
        "filepath-1.4.2.2",
-        "filepattern-0.1.3-f303652a8da5b24bb3de5bdba71f956b7cc18a559df508784671a4306cfb2a27",
-        "hashable-1.4.3.0-1a35fbaa3faabcc0c381f5aa7330fe436d8af61c2711fdd9764ee9aba0fcdcf1",
+        "filepattern-0.1.3-2893044b1658da283647f3b8e31d0eeb995ef35137e79e17aa6f7aeadf6c4a3f",
+        "hashable-1.4.4.0-39f8034b6553f47269dccbc5dd4b17d9392ef9094e57a8ebf406cd1b24dc286e",
        "heaps-0.4-3f9ca831e2a710f80e5a253748a1aa605a7219f998fa88ce43b69c22d0075c73",
        "js-dgtable-0.5.2-f7a634b948774c98a2be281a9a2244964a18c3b15b559a34248b4d851e8efb1b",
        "js-flot-0.8.3-b34534f666396e8ad058c9e0cb79b8d2cfe4294fc870aa2daf758c66a4533545",
        "js-jquery-3.3.1-4a51d1b0e66cd03e445290dde0449cd0ba22dd046bccc10876992c1527bc8a6f",
-        "primitive-0.8.0.0-c149e96dd6c8e609c75b5c29aa28e8cd219c971a12e6e067d5b176788da134c7",
+        "primitive-0.9.0.0-07894fde1eacd247928006cbe2bc7977cd77b13df49f1211170bf702e0541be8",
        "process-1.6.15.0",
-        "random-1.2.1.1-8a613adc0408b9188e9f5f6b9a9334cb9cb3bb022c712faee9552e6b7739f9c2",
+        "random-1.2.1.2-329f042d78244e630f8e77895bef07b54584e0caa2c4807e8f942fa8c6b8a28f",
        "time-1.12.2",
        "transformers-0.5.6.2",
        "unix-2.7.3",
-        "unordered-containers-0.2.19.1-605cc4d0d7cc573beaaa8c26e0b0a759878f0f220758e031160ef7ae5208a68d",
+        "unordered-containers-0.2.20-5d3fcdb830ac91876d3f0bd9bac19d2d9a8b1bebbd028dd89b9cfbf6e03189ea",
        "utf8-string-1.0.2-74175dc1969f6d60b6b78e0f9ae512859446f68011f9742d4519de87229b0554"
      ],
      "exe-depends": [],
      "flags": {
        "cloud": false,
        "embed-files": false,
-        "portable": false
+        "portable": false,
+        "threaded": true
      },
-      "id": "shake-0.19.7-e-shake-fb4ada82cc527d6f4c8d2173d22d4774d09258ce73d49f7e4246b27acdb16027",
-      "pkg-cabal-sha256": "3cb5814cce210b9756fa9246ff1b2a1e1b86be46fdc4c5e2baacdc5bf83ce5c3",
+      "id": "shake-0.19.8-a4594a359c329e856f78f34f7c00eab65b0d01319a456809f78ea858049b9663",
+      "pkg-cabal-sha256": "03c8f06de478e07ad6fde95984c9206920106d0d8432ecb7ab825ef108d45382",
      "pkg-name": "shake",
      "pkg-src": {
        "repo": {
@@ -668,44 +708,46 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "352a56af12f70b50d564dcb61131555577281957ee196f1702a3723c0a3699d1",
-      "pkg-version": "0.19.7",
+      "pkg-src-sha256": "6384e33a26a2590bf33719e88881076b899ac4b5340c1c9271e4caa37e9d6535",
+      "pkg-version": "0.19.8",
      "style": "global",
      "type": "configured"
    },
    {
-      "component-name": "lib",
+      "bin-file": "/home/matt/.cabal/store/ghc-9.4.2/shake-0.19.8-e-shake-1f5bea5dbaac375049c4bf4aca9a98074f0d8bd41c416b1b8cabee319b4de303/bin/shake",
+      "component-name": "exe:shake",
      "depends": [
        "base-4.17.0.0",
        "binary-0.8.9.1",
        "bytestring-0.11.3.1",
        "deepseq-1.4.8.0",
        "directory-1.3.7.1",
-        "extra-1.7.14-a97afbf47bcedc09cfe883cddb7791edf359849ff8672e2940dd809bd57e528d",
+        "extra-1.7.16-d063cbfed5adf9061f1e247a9eb7664cbe40f11f03cf40702eb70ce48d2662ea",
        "filepath-1.4.2.2",
-        "filepattern-0.1.3-f303652a8da5b24bb3de5bdba71f956b7cc18a559df508784671a4306cfb2a27",
-        "hashable-1.4.3.0-1a35fbaa3faabcc0c381f5aa7330fe436d8af61c2711fdd9764ee9aba0fcdcf1",
+        "filepattern-0.1.3-2893044b1658da283647f3b8e31d0eeb995ef35137e79e17aa6f7aeadf6c4a3f",
+        "hashable-1.4.4.0-39f8034b6553f47269dccbc5dd4b17d9392ef9094e57a8ebf406cd1b24dc286e",
        "heaps-0.4-3f9ca831e2a710f80e5a253748a1aa605a7219f998fa88ce43b69c22d0075c73",
        "js-dgtable-0.5.2-f7a634b948774c98a2be281a9a2244964a18c3b15b559a34248b4d851e8efb1b",
        "js-flot-0.8.3-b34534f666396e8ad058c9e0cb79b8d2cfe4294fc870aa2daf758c66a4533545",
        "js-jquery-3.3.1-4a51d1b0e66cd03e445290dde0449cd0ba22dd046bccc10876992c1527bc8a6f",
-        "primitive-0.8.0.0-c149e96dd6c8e609c75b5c29aa28e8cd219c971a12e6e067d5b176788da134c7",
+        "primitive-0.9.0.0-07894fde1eacd247928006cbe2bc7977cd77b13df49f1211170bf702e0541be8",
        "process-1.6.15.0",
-        "random-1.2.1.1-8a613adc0408b9188e9f5f6b9a9334cb9cb3bb022c712faee9552e6b7739f9c2",
+        "random-1.2.1.2-329f042d78244e630f8e77895bef07b54584e0caa2c4807e8f942fa8c6b8a28f",
        "time-1.12.2",
        "transformers-0.5.6.2",
        "unix-2.7.3",
-        "unordered-containers-0.2.19.1-605cc4d0d7cc573beaaa8c26e0b0a759878f0f220758e031160ef7ae5208a68d",
+        "unordered-containers-0.2.20-5d3fcdb830ac91876d3f0bd9bac19d2d9a8b1bebbd028dd89b9cfbf6e03189ea",
        "utf8-string-1.0.2-74175dc1969f6d60b6b78e0f9ae512859446f68011f9742d4519de87229b0554"
      ],
      "exe-depends": [],
      "flags": {
        "cloud": false,
        "embed-files": false,
-        "portable": false
+        "portable": false,
+        "threaded": true
      },
-      "id": "shake-0.19.7-e45d30b7d0b9b4c6ded0205f86e195328e745ccd3d15ba85ed84ab0992b7e841",
-      "pkg-cabal-sha256": "3cb5814cce210b9756fa9246ff1b2a1e1b86be46fdc4c5e2baacdc5bf83ce5c3",
+      "id": "shake-0.19.8-e-shake-1f5bea5dbaac375049c4bf4aca9a98074f0d8bd41c416b1b8cabee319b4de303",
+      "pkg-cabal-sha256": "03c8f06de478e07ad6fde95984c9206920106d0d8432ecb7ab825ef108d45382",
      "pkg-name": "shake",
      "pkg-src": {
        "repo": {
@@ -714,8 +756,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "352a56af12f70b50d564dcb61131555577281957ee196f1702a3723c0a3699d1",
-      "pkg-version": "0.19.7",
+      "pkg-src-sha256": "6384e33a26a2590bf33719e88881076b899ac4b5340c1c9271e4caa37e9d6535",
+      "pkg-version": "0.19.8",
      "style": "global",
      "type": "configured"
    },
@@ -730,7 +772,7 @@
        "optimised-mixer": false
      },
      "id": "splitmix-0.1.0.5-8adf66a0e95691e8d1455f7a8487fb2464dc2da545a35bd88e75e071cac5816c",
-      "pkg-cabal-sha256": "bac0ae8d46a04e410666b0c8081cff63f060f29157983b569ca86ddb6e6e0dc6",
+      "pkg-cabal-sha256": "caa9b4a92abf1496c7f6a3c0f4e357426a54880077cb9f04e260a8bfa034b77b",
      "pkg-name": "splitmix",
      "pkg-src": {
        "repo": {
@@ -744,6 +786,16 @@
      "style": "global",
      "type": "configured"
    },
+    {
+      "depends": [
+        "array-0.5.4.0",
+        "base-4.17.0.0"
+      ],
+      "id": "stm-2.5.1.0",
+      "pkg-name": "stm",
+      "pkg-version": "2.5.1.0",
+      "type": "pre-existing"
+    },
    {
      "depends": [
        "base-4.17.0.0",
@@ -806,15 +858,15 @@
      "depends": [
        "base-4.17.0.0",
        "deepseq-1.4.8.0",
-        "hashable-1.4.3.0-1a35fbaa3faabcc0c381f5aa7330fe436d8af61c2711fdd9764ee9aba0fcdcf1",
+        "hashable-1.4.4.0-39f8034b6553f47269dccbc5dd4b17d9392ef9094e57a8ebf406cd1b24dc286e",
        "template-haskell-2.19.0.0"
      ],
      "exe-depends": [],
      "flags": {
        "debug": false
      },
-      "id": "unordered-containers-0.2.19.1-605cc4d0d7cc573beaaa8c26e0b0a759878f0f220758e031160ef7ae5208a68d",
-      "pkg-cabal-sha256": "9ad8972c2e913c37b1d4f0e1261517fd7a1b8c8a58077e057be69837e3dbaa00",
+      "id": "unordered-containers-0.2.20-5d3fcdb830ac91876d3f0bd9bac19d2d9a8b1bebbd028dd89b9cfbf6e03189ea",
+      "pkg-cabal-sha256": "746c32b23f93cb13e52309e54e82d69e4315105f9815b1fcac25a57071505cff",
      "pkg-name": "unordered-containers",
      "pkg-src": {
        "repo": {
@@ -823,8 +875,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "1b27bec5e0d522b27a6029ebf4c4a6d40acbc083c787008e32fb55c4b1d128d2",
-      "pkg-version": "0.2.19.1",
+      "pkg-src-sha256": "d9cfb287cf00592d39dc9c3cac8b99627ea08f2c01798e70130fc39f7c90f11d",
+      "pkg-version": "0.2.20",
      "style": "global",
      "type": "configured"
    },

--- a/hadrian/bootstrap/plan-9_4_3.json
+++ b/hadrian/bootstrap/plan-9_4_3.json
 {
  "arch": "x86_64",
-  "cabal-lib-version": "3.10.1.0",
-  "cabal-version": "3.10.1.0",
+  "cabal-lib-version": "3.10.2.1",
+  "cabal-version": "3.10.2.1",
  "compiler-id": "ghc-9.4.3",
  "install-plan": [
    {
      "component-name": "lib",
      "depends": [
-        "Cabal-syntax-3.10.1.0-6459239d0308ec697d1f60e14e099d6b19174ee1583325bce28bf2aa5ec43bef",
+        "Cabal-syntax-3.10.3.0-1db6a8bd2617280ef87532d281e1d60090b12554f0b529a5e31326f53c11ffbc",
        "array-0.5.4.0",
        "base-4.17.0.0",
        "bytestring-0.11.3.1",
@@ -26,8 +26,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "Cabal-3.10.1.0-2189d100c804419a3b5b56f30f1942bb77687b52e628e9037fcc6164c7253907",
-      "pkg-cabal-sha256": "6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94",
+      "id": "Cabal-3.10.3.0-a7455c956aa88a6f6601fd92439d6ebb72052d57afc5585f32745048d6075366",
+      "pkg-cabal-sha256": "4a36954a66769eef90353daa0dbb07d43e49c228281383c7e4134445d495f714",
      "pkg-name": "Cabal",
      "pkg-src": {
        "repo": {
@@ -36,8 +36,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "0bdbab8e4c3178016fb0f070d8b62bc3067f93afabfbd3aa17c8065d0ecc98ee",
-      "pkg-version": "3.10.1.0",
+      "pkg-src-sha256": "cb7f7c66626d7555f799e786513ddd65a874fd23f1cf312990c7a48abfc0b2c6",
+      "pkg-version": "3.10.3.0",
      "style": "global",
      "type": "configured"
    },
@@ -62,8 +62,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "Cabal-syntax-3.10.1.0-6459239d0308ec697d1f60e14e099d6b19174ee1583325bce28bf2aa5ec43bef",
-      "pkg-cabal-sha256": "bb835ebab577fd0f9c11dab96210dbb8d68ffc62652576f4b092563c345930e7",
+      "id": "Cabal-syntax-3.10.3.0-1db6a8bd2617280ef87532d281e1d60090b12554f0b529a5e31326f53c11ffbc",
+      "pkg-cabal-sha256": "c2ca36499bf9365726968b1e11a757e6d846c47cdf0c2c26a003698fd3c300fe",
      "pkg-name": "Cabal-syntax",
      "pkg-src": {
        "repo": {
@@ -72,8 +72,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "3b80092355327768a0de8298ac50ee906b7e82462e2ba14542730573b453f522",
-      "pkg-version": "3.10.1.0",
+      "pkg-src-sha256": "75d6a0aa9c00990a0d6e7720ac50c6954f6c942fa1be42c8add7f1c025f7e212",
+      "pkg-version": "3.10.3.0",
      "style": "global",
      "type": "configured"
    },
@@ -192,7 +192,7 @@
        "use-cbits": true
      },
      "id": "cryptohash-sha256-0.11.102.1-e68c05e71af300ee0140f7ecda5ed0439a27ba54936b05cd7b35b19a275e2b94",
-      "pkg-cabal-sha256": "03db065161987f614a3a2bbcd16264f78e47efe231fb5bd161be2043eaf20488",
+      "pkg-cabal-sha256": "200d756a7b3bab7ca2bac6eb50ed8252f26de77ac8def490a3ad743f2933acbd",
      "pkg-name": "cryptohash-sha256",
      "pkg-src": {
        "repo": {
@@ -229,6 +229,19 @@
      "pkg-version": "1.3.7.1",
      "type": "pre-existing"
    },
+    {
+      "depends": [
+        "base-4.17.0.0",
+        "mtl-2.2.2",
+        "stm-2.5.1.0",
+        "template-haskell-2.19.0.0",
+        "transformers-0.5.6.2"
+      ],
+      "id": "exceptions-0.10.5",
+      "pkg-name": "exceptions",
+      "pkg-version": "0.10.5",
+      "type": "pre-existing"
+    },
    {
      "component-name": "lib",
      "depends": [
@@ -242,8 +255,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "extra-1.7.14-244e22e0fa0caa7122fe0a9da39473db6acf685f18d2d5f76ec65b2fe8cf39b4",
-      "pkg-cabal-sha256": "e3d3ce1dc7746b1132930e48c59fb5e8c51a09e92e0c031316be031067a273fb",
+      "id": "extra-1.7.16-37f156788f14cbfa294b82e13c2e550403421628ffe8f3e9e30915371e6d1094",
+      "pkg-cabal-sha256": "edd191f77adf31acb1b53960b4d1ca9fca925ac28345a396c614414cb7bfa7ec",
      "pkg-name": "extra",
      "pkg-src": {
        "repo": {
@@ -252,8 +265,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "b6a909f8f0e4b8076a1653b4d34815a782f0a8c1e83d5267f4d00496471ef567",
-      "pkg-version": "1.7.14",
+      "pkg-src-sha256": "250c6d43c30b2c71f2cf498a10e69e43ac035974d3819529385d99e42ce77c70",
+      "pkg-version": "1.7.16",
      "style": "global",
      "type": "configured"
    },
@@ -271,12 +284,12 @@
      "depends": [
        "base-4.17.0.0",
        "directory-1.3.7.1",
-        "extra-1.7.14-244e22e0fa0caa7122fe0a9da39473db6acf685f18d2d5f76ec65b2fe8cf39b4",
+        "extra-1.7.16-37f156788f14cbfa294b82e13c2e550403421628ffe8f3e9e30915371e6d1094",
        "filepath-1.4.2.2"
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "filepattern-0.1.3-58cc3a8400cbb8744f17c76f2f008b3b0bcfeab10b70eac1016a6dac8d7c6e99",
+      "id": "filepattern-0.1.3-70528253d2ef22ea3827aa6ee8d0e27f2c3d2168098053c22c7230dd4534957f",
      "pkg-cabal-sha256": "372c1733d83b90045eb29da9f010fed79bfef8771ce65eb126a1d83ecc54a9a2",
      "pkg-name": "filepattern",
      "pkg-src": {
@@ -310,18 +323,18 @@
      "type": "pre-existing"
    },
    {
-      "build-info": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.3/ghc-platform-0.1.0.0/build-info.json",
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.3/ghc-platform-0.1.0.0/build-info.json",
      "component-name": "lib",
      "depends": [
        "base-4.17.0.0"
      ],
-      "dist-dir": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.3/ghc-platform-0.1.0.0",
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.3/ghc-platform-0.1.0.0",
      "exe-depends": [],
      "flags": {},
      "id": "ghc-platform-0.1.0.0-inplace",
      "pkg-name": "ghc-platform",
      "pkg-src": {
-        "path": "/home/matt/ghc-scratch/hadrian/../libraries/ghc-platform",
+        "path": "/home/matt/ghc-llvm/hadrian/../libraries/ghc-platform",
        "type": "local"
      },
      "pkg-version": "0.1.0.0",
@@ -338,7 +351,7 @@
      "type": "pre-existing"
    },
    {
-      "build-info": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.3/ghc-toolchain-0.1.0.0/build-info.json",
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.3/ghc-toolchain-0.1.0.0/build-info.json",
      "component-name": "lib",
      "depends": [
        "base-4.17.0.0",
@@ -349,13 +362,13 @@
        "text-2.0.1",
        "transformers-0.5.6.2"
      ],
-      "dist-dir": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.3/ghc-toolchain-0.1.0.0",
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.3/ghc-toolchain-0.1.0.0",
      "exe-depends": [],
      "flags": {},
      "id": "ghc-toolchain-0.1.0.0-inplace",
      "pkg-name": "ghc-toolchain",
      "pkg-src": {
-        "path": "/home/matt/ghc-scratch/hadrian/../utils/ghc-toolchain",
+        "path": "/home/matt/ghc-llvm/hadrian/../utils/ghc-toolchain",
        "type": "local"
      },
      "pkg-version": "0.1.0.0",
@@ -363,30 +376,30 @@
      "type": "configured"
    },
    {
-      "bin-file": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.3/hadrian-0.1.0.0/x/hadrian/build/hadrian/hadrian",
-      "build-info": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.3/hadrian-0.1.0.0/x/hadrian/build-info.json",
+      "bin-file": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.3/hadrian-0.1.0.0/x/hadrian/build/hadrian/hadrian",
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.3/hadrian-0.1.0.0/x/hadrian/build-info.json",
      "component-name": "exe:hadrian",
      "depends": [
-        "Cabal-3.10.1.0-2189d100c804419a3b5b56f30f1942bb77687b52e628e9037fcc6164c7253907",
+        "Cabal-3.10.3.0-a7455c956aa88a6f6601fd92439d6ebb72052d57afc5585f32745048d6075366",
        "base-4.17.0.0",
        "base16-bytestring-1.0.2.0-022be67a0e4d2e8bed3248f110a529e722a677692e78084e184611e934a069d4",
        "bytestring-0.11.3.1",
        "containers-0.6.6",
        "cryptohash-sha256-0.11.102.1-e68c05e71af300ee0140f7ecda5ed0439a27ba54936b05cd7b35b19a275e2b94",
        "directory-1.3.7.1",
-        "extra-1.7.14-244e22e0fa0caa7122fe0a9da39473db6acf685f18d2d5f76ec65b2fe8cf39b4",
+        "extra-1.7.16-37f156788f14cbfa294b82e13c2e550403421628ffe8f3e9e30915371e6d1094",
        "filepath-1.4.2.2",
        "ghc-platform-0.1.0.0-inplace",
        "ghc-toolchain-0.1.0.0-inplace",
        "mtl-2.2.2",
        "parsec-3.1.15.0",
-        "shake-0.19.7-858c4c12624ea5ad74e50756ac3148c5907db3f7bb149cb9faa047b109b64a30",
+        "shake-0.19.8-86e0d12f7e8d38c41530424ca330216a5968ce2ba4e74bc98891e875c946cb06",
        "text-2.0.1",
        "time-1.12.2",
        "transformers-0.5.6.2",
-        "unordered-containers-0.2.19.1-5f551314a01c5736adcef5fa205c568f58d2674318227f36fb35532e604d15f2"
+        "unordered-containers-0.2.20-5f8b95f5837dd8878cea74aa639853c8bd34b2815c0b96f11c13d32514565835"
      ],
-      "dist-dir": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.3/hadrian-0.1.0.0/x/hadrian",
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.3/hadrian-0.1.0.0/x/hadrian",
      "exe-depends": [],
      "flags": {
        "selftest": false,
@@ -395,7 +408,7 @@
      "id": "hadrian-0.1.0.0-inplace-hadrian",
      "pkg-name": "hadrian",
      "pkg-src": {
-        "path": "/home/matt/ghc-scratch/hadrian/.",
+        "path": "/home/matt/ghc-llvm/hadrian/.",
        "type": "local"
      },
      "pkg-version": "0.1.0.0",
@@ -412,6 +425,7 @@
        "filepath-1.4.2.2",
        "ghc-bignum-1.3",
        "ghc-prim-0.9.0",
+        "os-string-2.0.2.2-fbe02fbb1f7e80b15749e0d44558d5f4322fd6797f8f95d11785857f6c4bdc6f",
        "text-2.0.1"
      ],
      "exe-depends": [],
@@ -419,8 +433,8 @@
        "integer-gmp": true,
        "random-initial-seed": false
      },
-      "id": "hashable-1.4.3.0-7c439c9841bf1f1ee61b2b5be3725b5f2766dffc3aa23e22eae8d6e49336aac1",
-      "pkg-cabal-sha256": "f3bf68acfa0df7a064a378ef2cdcfeb55e6fb96100675f4c593556dcbf3d7194",
+      "id": "hashable-1.4.4.0-f5400e87f403ac1321737a013f195075c0e80e76e2c62c9cd1080555bf7a5dd3",
+      "pkg-cabal-sha256": "ae22238274c572aa91e90c6c353e7206386708912ac5e6dc40ac61d1dcc553db",
      "pkg-name": "hashable",
      "pkg-src": {
        "repo": {
@@ -429,8 +443,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "32efb16c2891786209b7cbe5c39df9b3a9ae51e836f1a54f646bc4602b7ab0f5",
-      "pkg-version": "1.4.3.0",
+      "pkg-src-sha256": "1fa3d64548440942b2b38b99c76d8dcaa94fa2ea3912cd7a6354ea4ec4af4758",
+      "pkg-version": "1.4.4.0",
      "style": "global",
      "type": "configured"
    },
@@ -532,6 +546,32 @@
      "pkg-version": "2.2.2",
      "type": "pre-existing"
    },
+    {
+      "component-name": "lib",
+      "depends": [
+        "base-4.17.0.0",
+        "bytestring-0.11.3.1",
+        "deepseq-1.4.8.0",
+        "exceptions-0.10.5",
+        "template-haskell-2.19.0.0"
+      ],
+      "exe-depends": [],
+      "flags": {},
+      "id": "os-string-2.0.2.2-fbe02fbb1f7e80b15749e0d44558d5f4322fd6797f8f95d11785857f6c4bdc6f",
+      "pkg-cabal-sha256": "704ea0b499f9d4e43c98fd11e2fcf6b8762a1daa91114aa195966ebcc76a8d51",
+      "pkg-name": "os-string",
+      "pkg-src": {
+        "repo": {
+          "type": "secure-repo",
+          "uri": "http://hackage.haskell.org/"
+        },
+        "type": "repo-tar"
+      },
+      "pkg-src-sha256": "3fcc0d7657207d5ee45ce8994a74c5baa2f1149bbd28b3b75e2f646ed4a7251c",
+      "pkg-version": "2.0.2.2",
+      "style": "global",
+      "type": "configured"
+    },
    {
      "depends": [
        "base-4.17.0.0",
@@ -565,8 +605,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "primitive-0.8.0.0-becede3b475b090bfee201276f175b6bdf41386aaea8c881d4d96b97d3787531",
-      "pkg-cabal-sha256": "d0ff45fa6e61f92af23611ceb8b9a6a04c236b50fb70c60e2ed3bfa532703670",
+      "id": "primitive-0.9.0.0-01d083e073a4d0029f557f1d7b51ab8073008b922cc109ed96df066a64407fc5",
+      "pkg-cabal-sha256": "2e08c5409e3559c7f1669ef50e9a0d9a397e68ecf51110d5e2cedf05cdd7d93c",
      "pkg-name": "primitive",
      "pkg-src": {
        "repo": {
@@ -575,8 +615,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "5553c21b4a789f9b591eed69e598cc58484c274af29250e517b5a8bcc62b995f",
-      "pkg-version": "0.8.0.0",
+      "pkg-src-sha256": "696d4bd291c94d736142d6182117dca4258d3ef28bfefdb649ac8b5ecd0999c7",
+      "pkg-version": "0.9.0.0",
      "style": "global",
      "type": "configured"
    },
@@ -604,8 +644,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "random-1.2.1.1-6a2504e17aaf58936ac6a1e2fce3f071bbc1af0c5a14daa7efc7fad63518a273",
-      "pkg-cabal-sha256": "e7c1f881159d5cc788619c9ee8b8f340ba2ff0db571cdf3d1a1968ebc5108789",
+      "id": "random-1.2.1.2-c61feccea364cd0f147229ede11c7a8213fa2803b25b1b51e5c7fad8ccb99d70",
+      "pkg-cabal-sha256": "32397de181e20ccaacf806ec70de9308cf044f089a2be37c936f3f8967bde867",
      "pkg-name": "random",
      "pkg-src": {
        "repo": {
@@ -614,8 +654,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "3e1272f7ed6a4d7bd1712b90143ec326fee9b225789222379fea20a9c90c9b76",
-      "pkg-version": "1.2.1.1",
+      "pkg-src-sha256": "790f4dc2d2327c453ff6aac7bf15399fd123d55e927935f68f84b5df42d9a4b4",
+      "pkg-version": "1.2.1.2",
      "style": "global",
      "type": "configured"
    },
@@ -634,31 +674,32 @@
        "bytestring-0.11.3.1",
        "deepseq-1.4.8.0",
        "directory-1.3.7.1",
-        "extra-1.7.14-244e22e0fa0caa7122fe0a9da39473db6acf685f18d2d5f76ec65b2fe8cf39b4",
+        "extra-1.7.16-37f156788f14cbfa294b82e13c2e550403421628ffe8f3e9e30915371e6d1094",
        "filepath-1.4.2.2",
-        "filepattern-0.1.3-58cc3a8400cbb8744f17c76f2f008b3b0bcfeab10b70eac1016a6dac8d7c6e99",
-        "hashable-1.4.3.0-7c439c9841bf1f1ee61b2b5be3725b5f2766dffc3aa23e22eae8d6e49336aac1",
+        "filepattern-0.1.3-70528253d2ef22ea3827aa6ee8d0e27f2c3d2168098053c22c7230dd4534957f",
+        "hashable-1.4.4.0-f5400e87f403ac1321737a013f195075c0e80e76e2c62c9cd1080555bf7a5dd3",
        "heaps-0.4-144db1859f80e348dd364b0344727f2186256658a0f2bd2a1aad9c4c1db630a6",
        "js-dgtable-0.5.2-ce51504654bf180c4ea9d29cda6d8256812da1ea6d2e631267db1cb30cae915d",
        "js-flot-0.8.3-006c070aea66f942992ff19703d82059efcfd6ae82854bcfeb4083431bc579aa",
        "js-jquery-3.3.1-257058014593a08cf3c7160e6a2fbf8b955f738e214c1dbc3ce0042b6a57ae6f",
-        "primitive-0.8.0.0-becede3b475b090bfee201276f175b6bdf41386aaea8c881d4d96b97d3787531",
+        "primitive-0.9.0.0-01d083e073a4d0029f557f1d7b51ab8073008b922cc109ed96df066a64407fc5",
        "process-1.6.16.0",
-        "random-1.2.1.1-6a2504e17aaf58936ac6a1e2fce3f071bbc1af0c5a14daa7efc7fad63518a273",
+        "random-1.2.1.2-c61feccea364cd0f147229ede11c7a8213fa2803b25b1b51e5c7fad8ccb99d70",
        "time-1.12.2",
        "transformers-0.5.6.2",
        "unix-2.7.3",
-        "unordered-containers-0.2.19.1-5f551314a01c5736adcef5fa205c568f58d2674318227f36fb35532e604d15f2",
+        "unordered-containers-0.2.20-5f8b95f5837dd8878cea74aa639853c8bd34b2815c0b96f11c13d32514565835",
        "utf8-string-1.0.2-b80856b75fa2fd6a3479749a275df202f796046854b0d6f9da80ab1b4390f939"
      ],
      "exe-depends": [],
      "flags": {
        "cloud": false,
        "embed-files": false,
-        "portable": false
+        "portable": false,
+        "threaded": true
      },
-      "id": "shake-0.19.7-858c4c12624ea5ad74e50756ac3148c5907db3f7bb149cb9faa047b109b64a30",
-      "pkg-cabal-sha256": "3cb5814cce210b9756fa9246ff1b2a1e1b86be46fdc4c5e2baacdc5bf83ce5c3",
+      "id": "shake-0.19.8-86e0d12f7e8d38c41530424ca330216a5968ce2ba4e74bc98891e875c946cb06",
+      "pkg-cabal-sha256": "03c8f06de478e07ad6fde95984c9206920106d0d8432ecb7ab825ef108d45382",
      "pkg-name": "shake",
      "pkg-src": {
        "repo": {
@@ -667,13 +708,13 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "352a56af12f70b50d564dcb61131555577281957ee196f1702a3723c0a3699d1",
-      "pkg-version": "0.19.7",
+      "pkg-src-sha256": "6384e33a26a2590bf33719e88881076b899ac4b5340c1c9271e4caa37e9d6535",
+      "pkg-version": "0.19.8",
      "style": "global",
      "type": "configured"
    },
    {
-      "bin-file": "/home/matt/.cabal/store/ghc-9.4.3/shake-0.19.7-e-shake-7ce254b09e77522709fddc506a870167a48080b34d01153dc3648b306569cb90/bin/shake",
+      "bin-file": "/home/matt/.cabal/store/ghc-9.4.3/shake-0.19.8-e-shake-385096db6fd02f3b4a5a31fca121b986b2bdf7d9f447395f048b5a856d31bcc4/bin/shake",
      "component-name": "exe:shake",
      "depends": [
        "base-4.17.0.0",
@@ -681,31 +722,32 @@
        "bytestring-0.11.3.1",
        "deepseq-1.4.8.0",
        "directory-1.3.7.1",
-        "extra-1.7.14-244e22e0fa0caa7122fe0a9da39473db6acf685f18d2d5f76ec65b2fe8cf39b4",
+        "extra-1.7.16-37f156788f14cbfa294b82e13c2e550403421628ffe8f3e9e30915371e6d1094",
        "filepath-1.4.2.2",
-        "filepattern-0.1.3-58cc3a8400cbb8744f17c76f2f008b3b0bcfeab10b70eac1016a6dac8d7c6e99",
-        "hashable-1.4.3.0-7c439c9841bf1f1ee61b2b5be3725b5f2766dffc3aa23e22eae8d6e49336aac1",
+        "filepattern-0.1.3-70528253d2ef22ea3827aa6ee8d0e27f2c3d2168098053c22c7230dd4534957f",
+        "hashable-1.4.4.0-f5400e87f403ac1321737a013f195075c0e80e76e2c62c9cd1080555bf7a5dd3",
        "heaps-0.4-144db1859f80e348dd364b0344727f2186256658a0f2bd2a1aad9c4c1db630a6",
        "js-dgtable-0.5.2-ce51504654bf180c4ea9d29cda6d8256812da1ea6d2e631267db1cb30cae915d",
        "js-flot-0.8.3-006c070aea66f942992ff19703d82059efcfd6ae82854bcfeb4083431bc579aa",
        "js-jquery-3.3.1-257058014593a08cf3c7160e6a2fbf8b955f738e214c1dbc3ce0042b6a57ae6f",
-        "primitive-0.8.0.0-becede3b475b090bfee201276f175b6bdf41386aaea8c881d4d96b97d3787531",
+        "primitive-0.9.0.0-01d083e073a4d0029f557f1d7b51ab8073008b922cc109ed96df066a64407fc5",
        "process-1.6.16.0",
-        "random-1.2.1.1-6a2504e17aaf58936ac6a1e2fce3f071bbc1af0c5a14daa7efc7fad63518a273",
+        "random-1.2.1.2-c61feccea364cd0f147229ede11c7a8213fa2803b25b1b51e5c7fad8ccb99d70",
        "time-1.12.2",
        "transformers-0.5.6.2",
        "unix-2.7.3",
-        "unordered-containers-0.2.19.1-5f551314a01c5736adcef5fa205c568f58d2674318227f36fb35532e604d15f2",
+        "unordered-containers-0.2.20-5f8b95f5837dd8878cea74aa639853c8bd34b2815c0b96f11c13d32514565835",
        "utf8-string-1.0.2-b80856b75fa2fd6a3479749a275df202f796046854b0d6f9da80ab1b4390f939"
      ],
      "exe-depends": [],
      "flags": {
        "cloud": false,
        "embed-files": false,
-        "portable": false
+        "portable": false,
+        "threaded": true
      },
-      "id": "shake-0.19.7-e-shake-7ce254b09e77522709fddc506a870167a48080b34d01153dc3648b306569cb90",
-      "pkg-cabal-sha256": "3cb5814cce210b9756fa9246ff1b2a1e1b86be46fdc4c5e2baacdc5bf83ce5c3",
+      "id": "shake-0.19.8-e-shake-385096db6fd02f3b4a5a31fca121b986b2bdf7d9f447395f048b5a856d31bcc4",
+      "pkg-cabal-sha256": "03c8f06de478e07ad6fde95984c9206920106d0d8432ecb7ab825ef108d45382",
      "pkg-name": "shake",
      "pkg-src": {
        "repo": {
@@ -714,8 +756,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "352a56af12f70b50d564dcb61131555577281957ee196f1702a3723c0a3699d1",
-      "pkg-version": "0.19.7",
+      "pkg-src-sha256": "6384e33a26a2590bf33719e88881076b899ac4b5340c1c9271e4caa37e9d6535",
+      "pkg-version": "0.19.8",
      "style": "global",
      "type": "configured"
    },
@@ -730,7 +772,7 @@
        "optimised-mixer": false
      },
      "id": "splitmix-0.1.0.5-09e5f19da796178d1e2414f75b54ad5a551c1ea93df669c559a03dd222d1626d",
-      "pkg-cabal-sha256": "bac0ae8d46a04e410666b0c8081cff63f060f29157983b569ca86ddb6e6e0dc6",
+      "pkg-cabal-sha256": "caa9b4a92abf1496c7f6a3c0f4e357426a54880077cb9f04e260a8bfa034b77b",
      "pkg-name": "splitmix",
      "pkg-src": {
        "repo": {
@@ -744,6 +786,16 @@
      "style": "global",
      "type": "configured"
    },
+    {
+      "depends": [
+        "array-0.5.4.0",
+        "base-4.17.0.0"
+      ],
+      "id": "stm-2.5.1.0",
+      "pkg-name": "stm",
+      "pkg-version": "2.5.1.0",
+      "type": "pre-existing"
+    },
    {
      "depends": [
        "base-4.17.0.0",
@@ -806,15 +858,15 @@
      "depends": [
        "base-4.17.0.0",
        "deepseq-1.4.8.0",
-        "hashable-1.4.3.0-7c439c9841bf1f1ee61b2b5be3725b5f2766dffc3aa23e22eae8d6e49336aac1",
+        "hashable-1.4.4.0-f5400e87f403ac1321737a013f195075c0e80e76e2c62c9cd1080555bf7a5dd3",
        "template-haskell-2.19.0.0"
      ],
      "exe-depends": [],
      "flags": {
        "debug": false
      },
-      "id": "unordered-containers-0.2.19.1-5f551314a01c5736adcef5fa205c568f58d2674318227f36fb35532e604d15f2",
-      "pkg-cabal-sha256": "9ad8972c2e913c37b1d4f0e1261517fd7a1b8c8a58077e057be69837e3dbaa00",
+      "id": "unordered-containers-0.2.20-5f8b95f5837dd8878cea74aa639853c8bd34b2815c0b96f11c13d32514565835",
+      "pkg-cabal-sha256": "746c32b23f93cb13e52309e54e82d69e4315105f9815b1fcac25a57071505cff",
      "pkg-name": "unordered-containers",
      "pkg-src": {
        "repo": {
@@ -823,8 +875,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "1b27bec5e0d522b27a6029ebf4c4a6d40acbc083c787008e32fb55c4b1d128d2",
-      "pkg-version": "0.2.19.1",
+      "pkg-src-sha256": "d9cfb287cf00592d39dc9c3cac8b99627ea08f2c01798e70130fc39f7c90f11d",
+      "pkg-version": "0.2.20",
      "style": "global",
      "type": "configured"
    },

--- a/hadrian/bootstrap/plan-9_4_4.json
+++ b/hadrian/bootstrap/plan-9_4_4.json
 {
  "arch": "x86_64",
-  "cabal-lib-version": "3.10.1.0",
-  "cabal-version": "3.10.1.0",
+  "cabal-lib-version": "3.10.2.1",
+  "cabal-version": "3.10.2.1",
  "compiler-id": "ghc-9.4.4",
  "install-plan": [
    {
      "component-name": "lib",
      "depends": [
-        "Cabal-syntax-3.10.1.0-db7a099b85e338a8179ab22c13a7c1fc979cd95a45387fb5642deb533e72a04b",
+        "Cabal-syntax-3.10.3.0-0a14ed5c2bd903370854d61c5870b6f452c7e92697dbacbf9ce50a2a4719626f",
        "array-0.5.4.0",
        "base-4.17.0.0",
        "bytestring-0.11.3.1",
@@ -26,8 +26,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "Cabal-3.10.1.0-15ac8790011a454931c287d53dd2e89c5355480482a11de48b7bc0cc626f9931",
-      "pkg-cabal-sha256": "6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94",
+      "id": "Cabal-3.10.3.0-67832cbb618385f94fc4a12fa2b6600a54260fcd47a70a84a4fd814eb789dc3b",
+      "pkg-cabal-sha256": "4a36954a66769eef90353daa0dbb07d43e49c228281383c7e4134445d495f714",
      "pkg-name": "Cabal",
      "pkg-src": {
        "repo": {
@@ -36,8 +36,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "0bdbab8e4c3178016fb0f070d8b62bc3067f93afabfbd3aa17c8065d0ecc98ee",
-      "pkg-version": "3.10.1.0",
+      "pkg-src-sha256": "cb7f7c66626d7555f799e786513ddd65a874fd23f1cf312990c7a48abfc0b2c6",
+      "pkg-version": "3.10.3.0",
      "style": "global",
      "type": "configured"
    },
@@ -62,8 +62,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "Cabal-syntax-3.10.1.0-db7a099b85e338a8179ab22c13a7c1fc979cd95a45387fb5642deb533e72a04b",
-      "pkg-cabal-sha256": "bb835ebab577fd0f9c11dab96210dbb8d68ffc62652576f4b092563c345930e7",
+      "id": "Cabal-syntax-3.10.3.0-0a14ed5c2bd903370854d61c5870b6f452c7e92697dbacbf9ce50a2a4719626f",
+      "pkg-cabal-sha256": "c2ca36499bf9365726968b1e11a757e6d846c47cdf0c2c26a003698fd3c300fe",
      "pkg-name": "Cabal-syntax",
      "pkg-src": {
        "repo": {
@@ -72,8 +72,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "3b80092355327768a0de8298ac50ee906b7e82462e2ba14542730573b453f522",
-      "pkg-version": "3.10.1.0",
+      "pkg-src-sha256": "75d6a0aa9c00990a0d6e7720ac50c6954f6c942fa1be42c8add7f1c025f7e212",
+      "pkg-version": "3.10.3.0",
      "style": "global",
      "type": "configured"
    },
@@ -192,7 +192,7 @@
        "use-cbits": true
      },
      "id": "cryptohash-sha256-0.11.102.1-ae70c6c39b427440638d8d0177551367c44baa0fcf044bb565f9e69c4daafe02",
-      "pkg-cabal-sha256": "03db065161987f614a3a2bbcd16264f78e47efe231fb5bd161be2043eaf20488",
+      "pkg-cabal-sha256": "200d756a7b3bab7ca2bac6eb50ed8252f26de77ac8def490a3ad743f2933acbd",
      "pkg-name": "cryptohash-sha256",
      "pkg-src": {
        "repo": {
@@ -229,6 +229,19 @@
      "pkg-version": "1.3.7.1",
      "type": "pre-existing"
    },
+    {
+      "depends": [
+        "base-4.17.0.0",
+        "mtl-2.2.2",
+        "stm-2.5.1.0",
+        "template-haskell-2.19.0.0",
+        "transformers-0.5.6.2"
+      ],
+      "id": "exceptions-0.10.5",
+      "pkg-name": "exceptions",
+      "pkg-version": "0.10.5",
+      "type": "pre-existing"
+    },
    {
      "component-name": "lib",
      "depends": [
@@ -242,8 +255,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "extra-1.7.14-d8a55662b80c14c6b673e340bda3ccc6e07d784451bfe7036ebff293f7661cd3",
-      "pkg-cabal-sha256": "e3d3ce1dc7746b1132930e48c59fb5e8c51a09e92e0c031316be031067a273fb",
+      "id": "extra-1.7.16-77e6ac8e9ee42bf76f5fc6bdda4d487a0ebee51f8499729d9cf8e09f23d1f292",
+      "pkg-cabal-sha256": "edd191f77adf31acb1b53960b4d1ca9fca925ac28345a396c614414cb7bfa7ec",
      "pkg-name": "extra",
      "pkg-src": {
        "repo": {
@@ -252,8 +265,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "b6a909f8f0e4b8076a1653b4d34815a782f0a8c1e83d5267f4d00496471ef567",
-      "pkg-version": "1.7.14",
+      "pkg-src-sha256": "250c6d43c30b2c71f2cf498a10e69e43ac035974d3819529385d99e42ce77c70",
+      "pkg-version": "1.7.16",
      "style": "global",
      "type": "configured"
    },
@@ -271,12 +284,12 @@
      "depends": [
        "base-4.17.0.0",
        "directory-1.3.7.1",
-        "extra-1.7.14-d8a55662b80c14c6b673e340bda3ccc6e07d784451bfe7036ebff293f7661cd3",
+        "extra-1.7.16-77e6ac8e9ee42bf76f5fc6bdda4d487a0ebee51f8499729d9cf8e09f23d1f292",
        "filepath-1.4.2.2"
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "filepattern-0.1.3-74ee38b73acc81523377582e7aff29fdb5230f1ec2b94321193c28b4d1cde0ae",
+      "id": "filepattern-0.1.3-f9b38f495daae11006d7ce6aa54bcc6423c83e1151cffbafce98299316c54d34",
      "pkg-cabal-sha256": "372c1733d83b90045eb29da9f010fed79bfef8771ce65eb126a1d83ecc54a9a2",
      "pkg-name": "filepattern",
      "pkg-src": {
@@ -310,18 +323,18 @@
      "type": "pre-existing"
    },
    {
-      "build-info": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.4/ghc-platform-0.1.0.0/build-info.json",
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.4/ghc-platform-0.1.0.0/build-info.json",
      "component-name": "lib",
      "depends": [
        "base-4.17.0.0"
      ],
-      "dist-dir": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.4/ghc-platform-0.1.0.0",
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.4/ghc-platform-0.1.0.0",
      "exe-depends": [],
      "flags": {},
      "id": "ghc-platform-0.1.0.0-inplace",
      "pkg-name": "ghc-platform",
      "pkg-src": {
-        "path": "/home/matt/ghc-scratch/hadrian/../libraries/ghc-platform",
+        "path": "/home/matt/ghc-llvm/hadrian/../libraries/ghc-platform",
        "type": "local"
      },
      "pkg-version": "0.1.0.0",
@@ -338,7 +351,7 @@
      "type": "pre-existing"
    },
    {
-      "build-info": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.4/ghc-toolchain-0.1.0.0/build-info.json",
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.4/ghc-toolchain-0.1.0.0/build-info.json",
      "component-name": "lib",
      "depends": [
        "base-4.17.0.0",
@@ -349,13 +362,13 @@
        "text-2.0.1",
        "transformers-0.5.6.2"
      ],
-      "dist-dir": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.4/ghc-toolchain-0.1.0.0",
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.4/ghc-toolchain-0.1.0.0",
      "exe-depends": [],
      "flags": {},
      "id": "ghc-toolchain-0.1.0.0-inplace",
      "pkg-name": "ghc-toolchain",
      "pkg-src": {
-        "path": "/home/matt/ghc-scratch/hadrian/../utils/ghc-toolchain",
+        "path": "/home/matt/ghc-llvm/hadrian/../utils/ghc-toolchain",
        "type": "local"
      },
      "pkg-version": "0.1.0.0",
@@ -363,30 +376,30 @@
      "type": "configured"
    },
    {
-      "bin-file": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.4/hadrian-0.1.0.0/x/hadrian/build/hadrian/hadrian",
-      "build-info": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.4/hadrian-0.1.0.0/x/hadrian/build-info.json",
+      "bin-file": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.4/hadrian-0.1.0.0/x/hadrian/build/hadrian/hadrian",
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.4/hadrian-0.1.0.0/x/hadrian/build-info.json",
      "component-name": "exe:hadrian",
      "depends": [
-        "Cabal-3.10.1.0-15ac8790011a454931c287d53dd2e89c5355480482a11de48b7bc0cc626f9931",
+        "Cabal-3.10.3.0-67832cbb618385f94fc4a12fa2b6600a54260fcd47a70a84a4fd814eb789dc3b",
        "base-4.17.0.0",
        "base16-bytestring-1.0.2.0-2c05b63cefa5d7007acd478c1dbfe18a190bfba61d8945d4d5b87798ed9ca8c2",
        "bytestring-0.11.3.1",
        "containers-0.6.6",
        "cryptohash-sha256-0.11.102.1-ae70c6c39b427440638d8d0177551367c44baa0fcf044bb565f9e69c4daafe02",
        "directory-1.3.7.1",
-        "extra-1.7.14-d8a55662b80c14c6b673e340bda3ccc6e07d784451bfe7036ebff293f7661cd3",
+        "extra-1.7.16-77e6ac8e9ee42bf76f5fc6bdda4d487a0ebee51f8499729d9cf8e09f23d1f292",
        "filepath-1.4.2.2",
        "ghc-platform-0.1.0.0-inplace",
        "ghc-toolchain-0.1.0.0-inplace",
        "mtl-2.2.2",
        "parsec-3.1.15.0",
-        "shake-0.19.7-01ae8df045f1d00fe6a9d5f0a806cea778659f5ea20c9f605e518c6fc5ade5bd",
+        "shake-0.19.8-996b3d120df8efe1b79c5456e3e4aa528fbcc88f69e3cf777238ee1f8563f490",
        "text-2.0.1",
        "time-1.12.2",
        "transformers-0.5.6.2",
-        "unordered-containers-0.2.19.1-ab57a178a01b8ab0739cbed15515e4996b459ce15e0cad56992f28819500dc71"
+        "unordered-containers-0.2.20-517b4c55f37454479682c9b3c46552e37010f9daffe5741f4ea856237a094535"
      ],
-      "dist-dir": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.4/hadrian-0.1.0.0/x/hadrian",
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.4/hadrian-0.1.0.0/x/hadrian",
      "exe-depends": [],
      "flags": {
        "selftest": false,
@@ -395,7 +408,7 @@
      "id": "hadrian-0.1.0.0-inplace-hadrian",
      "pkg-name": "hadrian",
      "pkg-src": {
-        "path": "/home/matt/ghc-scratch/hadrian/.",
+        "path": "/home/matt/ghc-llvm/hadrian/.",
        "type": "local"
      },
      "pkg-version": "0.1.0.0",
@@ -412,6 +425,7 @@
        "filepath-1.4.2.2",
        "ghc-bignum-1.3",
        "ghc-prim-0.9.0",
+        "os-string-2.0.2.2-b8ff14f9cecddc9c2e6cfdc1eafd142a99942769c0a19c4e34a91a508bac0137",
        "text-2.0.1"
      ],
      "exe-depends": [],
@@ -419,8 +433,8 @@
        "integer-gmp": true,
        "random-initial-seed": false
      },
-      "id": "hashable-1.4.3.0-8dd9ed5708916e7a509cb12c45b6b9add646c702813695fbb3aaee8ef94ae283",
-      "pkg-cabal-sha256": "f3bf68acfa0df7a064a378ef2cdcfeb55e6fb96100675f4c593556dcbf3d7194",
+      "id": "hashable-1.4.4.0-448ed5608cb16707dd8296c44c0e42e68081182637cbefec186980806026d388",
+      "pkg-cabal-sha256": "ae22238274c572aa91e90c6c353e7206386708912ac5e6dc40ac61d1dcc553db",
      "pkg-name": "hashable",
      "pkg-src": {
        "repo": {
@@ -429,8 +443,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "32efb16c2891786209b7cbe5c39df9b3a9ae51e836f1a54f646bc4602b7ab0f5",
-      "pkg-version": "1.4.3.0",
+      "pkg-src-sha256": "1fa3d64548440942b2b38b99c76d8dcaa94fa2ea3912cd7a6354ea4ec4af4758",
+      "pkg-version": "1.4.4.0",
      "style": "global",
      "type": "configured"
    },
@@ -532,6 +546,32 @@
      "pkg-version": "2.2.2",
      "type": "pre-existing"
    },
+    {
+      "component-name": "lib",
+      "depends": [
+        "base-4.17.0.0",
+        "bytestring-0.11.3.1",
+        "deepseq-1.4.8.0",
+        "exceptions-0.10.5",
+        "template-haskell-2.19.0.0"
+      ],
+      "exe-depends": [],
+      "flags": {},
+      "id": "os-string-2.0.2.2-b8ff14f9cecddc9c2e6cfdc1eafd142a99942769c0a19c4e34a91a508bac0137",
+      "pkg-cabal-sha256": "704ea0b499f9d4e43c98fd11e2fcf6b8762a1daa91114aa195966ebcc76a8d51",
+      "pkg-name": "os-string",
+      "pkg-src": {
+        "repo": {
+          "type": "secure-repo",
+          "uri": "http://hackage.haskell.org/"
+        },
+        "type": "repo-tar"
+      },
+      "pkg-src-sha256": "3fcc0d7657207d5ee45ce8994a74c5baa2f1149bbd28b3b75e2f646ed4a7251c",
+      "pkg-version": "2.0.2.2",
+      "style": "global",
+      "type": "configured"
+    },
    {
      "depends": [
        "base-4.17.0.0",
@@ -565,8 +605,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "primitive-0.8.0.0-621aca8de1dc201eec4f41917b8b5a6a9b9074831d6e26b48d3157f27593d2cb",
-      "pkg-cabal-sha256": "d0ff45fa6e61f92af23611ceb8b9a6a04c236b50fb70c60e2ed3bfa532703670",
+      "id": "primitive-0.9.0.0-3a822f1f359cca0cb3e34a5efc82e4648535e0d25f877fb33930beb4a49072ea",
+      "pkg-cabal-sha256": "2e08c5409e3559c7f1669ef50e9a0d9a397e68ecf51110d5e2cedf05cdd7d93c",
      "pkg-name": "primitive",
      "pkg-src": {
        "repo": {
@@ -575,8 +615,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "5553c21b4a789f9b591eed69e598cc58484c274af29250e517b5a8bcc62b995f",
-      "pkg-version": "0.8.0.0",
+      "pkg-src-sha256": "696d4bd291c94d736142d6182117dca4258d3ef28bfefdb649ac8b5ecd0999c7",
+      "pkg-version": "0.9.0.0",
      "style": "global",
      "type": "configured"
    },
@@ -604,8 +644,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "random-1.2.1.1-9b9ecafea0e3e6fae9adc67696340d18566616656d8ae62fad552c0ffdc06e82",
-      "pkg-cabal-sha256": "e7c1f881159d5cc788619c9ee8b8f340ba2ff0db571cdf3d1a1968ebc5108789",
+      "id": "random-1.2.1.2-69d96e05350d7f9e3b070ab8a01071f4ec2a80b762cc054bfd834c220ec4923e",
+      "pkg-cabal-sha256": "32397de181e20ccaacf806ec70de9308cf044f089a2be37c936f3f8967bde867",
      "pkg-name": "random",
      "pkg-src": {
        "repo": {
@@ -614,8 +654,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "3e1272f7ed6a4d7bd1712b90143ec326fee9b225789222379fea20a9c90c9b76",
-      "pkg-version": "1.2.1.1",
+      "pkg-src-sha256": "790f4dc2d2327c453ff6aac7bf15399fd123d55e927935f68f84b5df42d9a4b4",
+      "pkg-version": "1.2.1.2",
      "style": "global",
      "type": "configured"
    },
@@ -634,31 +674,32 @@
        "bytestring-0.11.3.1",
        "deepseq-1.4.8.0",
        "directory-1.3.7.1",
-        "extra-1.7.14-d8a55662b80c14c6b673e340bda3ccc6e07d784451bfe7036ebff293f7661cd3",
+        "extra-1.7.16-77e6ac8e9ee42bf76f5fc6bdda4d487a0ebee51f8499729d9cf8e09f23d1f292",
        "filepath-1.4.2.2",
-        "filepattern-0.1.3-74ee38b73acc81523377582e7aff29fdb5230f1ec2b94321193c28b4d1cde0ae",
-        "hashable-1.4.3.0-8dd9ed5708916e7a509cb12c45b6b9add646c702813695fbb3aaee8ef94ae283",
+        "filepattern-0.1.3-f9b38f495daae11006d7ce6aa54bcc6423c83e1151cffbafce98299316c54d34",
+        "hashable-1.4.4.0-448ed5608cb16707dd8296c44c0e42e68081182637cbefec186980806026d388",
        "heaps-0.4-7a6066160342ac2a9ea4aec008f23eb9d92ad7a8c8d2e78cbeed667d8096912c",
        "js-dgtable-0.5.2-b37805c8ad3dc85830c773ec5da0d4cdfd56a534a3f6acb334c4517b737e5cb1",
        "js-flot-0.8.3-65df5b8c3953095207aa8a04d9d37d07aed474c73133bf9239df4e5cdbe4a9bd",
        "js-jquery-3.3.1-8c84fdfa715ddd833b67b8a90ef47411829e61b194d5967e0699193776231e76",
-        "primitive-0.8.0.0-621aca8de1dc201eec4f41917b8b5a6a9b9074831d6e26b48d3157f27593d2cb",
+        "primitive-0.9.0.0-3a822f1f359cca0cb3e34a5efc82e4648535e0d25f877fb33930beb4a49072ea",
        "process-1.6.16.0",
-        "random-1.2.1.1-9b9ecafea0e3e6fae9adc67696340d18566616656d8ae62fad552c0ffdc06e82",
+        "random-1.2.1.2-69d96e05350d7f9e3b070ab8a01071f4ec2a80b762cc054bfd834c220ec4923e",
        "time-1.12.2",
        "transformers-0.5.6.2",
        "unix-2.7.3",
-        "unordered-containers-0.2.19.1-ab57a178a01b8ab0739cbed15515e4996b459ce15e0cad56992f28819500dc71",
+        "unordered-containers-0.2.20-517b4c55f37454479682c9b3c46552e37010f9daffe5741f4ea856237a094535",
        "utf8-string-1.0.2-ecbcc42d461fefe46d60189b7229cddccce61f9cc8c90c79b2546be729015263"
      ],
      "exe-depends": [],
      "flags": {
        "cloud": false,
        "embed-files": false,
-        "portable": false
+        "portable": false,
+        "threaded": true
      },
-      "id": "shake-0.19.7-01ae8df045f1d00fe6a9d5f0a806cea778659f5ea20c9f605e518c6fc5ade5bd",
-      "pkg-cabal-sha256": "3cb5814cce210b9756fa9246ff1b2a1e1b86be46fdc4c5e2baacdc5bf83ce5c3",
+      "id": "shake-0.19.8-996b3d120df8efe1b79c5456e3e4aa528fbcc88f69e3cf777238ee1f8563f490",
+      "pkg-cabal-sha256": "03c8f06de478e07ad6fde95984c9206920106d0d8432ecb7ab825ef108d45382",
      "pkg-name": "shake",
      "pkg-src": {
        "repo": {
@@ -667,13 +708,13 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "352a56af12f70b50d564dcb61131555577281957ee196f1702a3723c0a3699d1",
-      "pkg-version": "0.19.7",
+      "pkg-src-sha256": "6384e33a26a2590bf33719e88881076b899ac4b5340c1c9271e4caa37e9d6535",
+      "pkg-version": "0.19.8",
      "style": "global",
      "type": "configured"
    },
    {
-      "bin-file": "/home/matt/.cabal/store/ghc-9.4.4/shake-0.19.7-e-shake-01935206f23c8bb3a1edb9f8846355c6c2f7fd496739354c96a218bf7b40e24f/bin/shake",
+      "bin-file": "/home/matt/.cabal/store/ghc-9.4.4/shake-0.19.8-e-shake-0482dadb7feaaa8fb8880aeee055437f8ca48f6fdee756c0c6a8739dcd024a73/bin/shake",
      "component-name": "exe:shake",
      "depends": [
        "base-4.17.0.0",
@@ -681,31 +722,32 @@
        "bytestring-0.11.3.1",
        "deepseq-1.4.8.0",
        "directory-1.3.7.1",
-        "extra-1.7.14-d8a55662b80c14c6b673e340bda3ccc6e07d784451bfe7036ebff293f7661cd3",
+        "extra-1.7.16-77e6ac8e9ee42bf76f5fc6bdda4d487a0ebee51f8499729d9cf8e09f23d1f292",
        "filepath-1.4.2.2",
-        "filepattern-0.1.3-74ee38b73acc81523377582e7aff29fdb5230f1ec2b94321193c28b4d1cde0ae",
-        "hashable-1.4.3.0-8dd9ed5708916e7a509cb12c45b6b9add646c702813695fbb3aaee8ef94ae283",
+        "filepattern-0.1.3-f9b38f495daae11006d7ce6aa54bcc6423c83e1151cffbafce98299316c54d34",
+        "hashable-1.4.4.0-448ed5608cb16707dd8296c44c0e42e68081182637cbefec186980806026d388",
        "heaps-0.4-7a6066160342ac2a9ea4aec008f23eb9d92ad7a8c8d2e78cbeed667d8096912c",
        "js-dgtable-0.5.2-b37805c8ad3dc85830c773ec5da0d4cdfd56a534a3f6acb334c4517b737e5cb1",
        "js-flot-0.8.3-65df5b8c3953095207aa8a04d9d37d07aed474c73133bf9239df4e5cdbe4a9bd",
        "js-jquery-3.3.1-8c84fdfa715ddd833b67b8a90ef47411829e61b194d5967e0699193776231e76",
-        "primitive-0.8.0.0-621aca8de1dc201eec4f41917b8b5a6a9b9074831d6e26b48d3157f27593d2cb",
+        "primitive-0.9.0.0-3a822f1f359cca0cb3e34a5efc82e4648535e0d25f877fb33930beb4a49072ea",
        "process-1.6.16.0",
-        "random-1.2.1.1-9b9ecafea0e3e6fae9adc67696340d18566616656d8ae62fad552c0ffdc06e82",
+        "random-1.2.1.2-69d96e05350d7f9e3b070ab8a01071f4ec2a80b762cc054bfd834c220ec4923e",
        "time-1.12.2",
        "transformers-0.5.6.2",
        "unix-2.7.3",
-        "unordered-containers-0.2.19.1-ab57a178a01b8ab0739cbed15515e4996b459ce15e0cad56992f28819500dc71",
+        "unordered-containers-0.2.20-517b4c55f37454479682c9b3c46552e37010f9daffe5741f4ea856237a094535",
        "utf8-string-1.0.2-ecbcc42d461fefe46d60189b7229cddccce61f9cc8c90c79b2546be729015263"
      ],
      "exe-depends": [],
      "flags": {
        "cloud": false,
        "embed-files": false,
-        "portable": false
+        "portable": false,
+        "threaded": true
      },
-      "id": "shake-0.19.7-e-shake-01935206f23c8bb3a1edb9f8846355c6c2f7fd496739354c96a218bf7b40e24f",
-      "pkg-cabal-sha256": "3cb5814cce210b9756fa9246ff1b2a1e1b86be46fdc4c5e2baacdc5bf83ce5c3",
+      "id": "shake-0.19.8-e-shake-0482dadb7feaaa8fb8880aeee055437f8ca48f6fdee756c0c6a8739dcd024a73",
+      "pkg-cabal-sha256": "03c8f06de478e07ad6fde95984c9206920106d0d8432ecb7ab825ef108d45382",
      "pkg-name": "shake",
      "pkg-src": {
        "repo": {
@@ -714,8 +756,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "352a56af12f70b50d564dcb61131555577281957ee196f1702a3723c0a3699d1",
-      "pkg-version": "0.19.7",
+      "pkg-src-sha256": "6384e33a26a2590bf33719e88881076b899ac4b5340c1c9271e4caa37e9d6535",
+      "pkg-version": "0.19.8",
      "style": "global",
      "type": "configured"
    },
@@ -730,7 +772,7 @@
        "optimised-mixer": false
      },
      "id": "splitmix-0.1.0.5-ff4cae724db3783888a210a8a17d9574faec50c3a368683741003c689010c148",
-      "pkg-cabal-sha256": "bac0ae8d46a04e410666b0c8081cff63f060f29157983b569ca86ddb6e6e0dc6",
+      "pkg-cabal-sha256": "caa9b4a92abf1496c7f6a3c0f4e357426a54880077cb9f04e260a8bfa034b77b",
      "pkg-name": "splitmix",
      "pkg-src": {
        "repo": {
@@ -744,6 +786,16 @@
      "style": "global",
      "type": "configured"
    },
+    {
+      "depends": [
+        "array-0.5.4.0",
+        "base-4.17.0.0"
+      ],
+      "id": "stm-2.5.1.0",
+      "pkg-name": "stm",
+      "pkg-version": "2.5.1.0",
+      "type": "pre-existing"
+    },
    {
      "depends": [
        "base-4.17.0.0",
@@ -806,15 +858,15 @@
      "depends": [
        "base-4.17.0.0",
        "deepseq-1.4.8.0",
-        "hashable-1.4.3.0-8dd9ed5708916e7a509cb12c45b6b9add646c702813695fbb3aaee8ef94ae283",
+        "hashable-1.4.4.0-448ed5608cb16707dd8296c44c0e42e68081182637cbefec186980806026d388",
        "template-haskell-2.19.0.0"
      ],
      "exe-depends": [],
      "flags": {
        "debug": false
      },
-      "id": "unordered-containers-0.2.19.1-ab57a178a01b8ab0739cbed15515e4996b459ce15e0cad56992f28819500dc71",
-      "pkg-cabal-sha256": "9ad8972c2e913c37b1d4f0e1261517fd7a1b8c8a58077e057be69837e3dbaa00",
+      "id": "unordered-containers-0.2.20-517b4c55f37454479682c9b3c46552e37010f9daffe5741f4ea856237a094535",
+      "pkg-cabal-sha256": "746c32b23f93cb13e52309e54e82d69e4315105f9815b1fcac25a57071505cff",
      "pkg-name": "unordered-containers",
      "pkg-src": {
        "repo": {
@@ -823,8 +875,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "1b27bec5e0d522b27a6029ebf4c4a6d40acbc083c787008e32fb55c4b1d128d2",
-      "pkg-version": "0.2.19.1",
+      "pkg-src-sha256": "d9cfb287cf00592d39dc9c3cac8b99627ea08f2c01798e70130fc39f7c90f11d",
+      "pkg-version": "0.2.20",
      "style": "global",
      "type": "configured"
    },

--- a/hadrian/bootstrap/plan-9_4_5.json
+++ b/hadrian/bootstrap/plan-9_4_5.json
 {
  "arch": "x86_64",
-  "cabal-lib-version": "3.10.1.0",
-  "cabal-version": "3.10.1.0",
+  "cabal-lib-version": "3.10.2.1",
+  "cabal-version": "3.10.2.1",
  "compiler-id": "ghc-9.4.5",
  "install-plan": [
    {
      "component-name": "lib",
      "depends": [
-        "Cabal-syntax-3.10.1.0-a7e09e0ed12b8981fd4bb5283acfafac1e1e07aeb2b44507502ae461bb01f1b4",
+        "Cabal-syntax-3.10.3.0-bd240e76e30897fd497b90bd92647093c4606b1b4a2113b8d239c122938d75db",
        "array-0.5.4.0",
        "base-4.17.1.0",
        "bytestring-0.11.4.0",
@@ -26,8 +26,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "Cabal-3.10.1.0-08e8e38266cef863dfe810047ea2fb0574df80fd2bdeee7f2fbd09dadd0ddc38",
-      "pkg-cabal-sha256": "6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94",
+      "id": "Cabal-3.10.3.0-f96789bf6cec18621ae93e185a26c16406da65e4c31b78396db71cdd1bb80e74",
+      "pkg-cabal-sha256": "4a36954a66769eef90353daa0dbb07d43e49c228281383c7e4134445d495f714",
      "pkg-name": "Cabal",
      "pkg-src": {
        "repo": {
@@ -36,8 +36,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "0bdbab8e4c3178016fb0f070d8b62bc3067f93afabfbd3aa17c8065d0ecc98ee",
-      "pkg-version": "3.10.1.0",
+      "pkg-src-sha256": "cb7f7c66626d7555f799e786513ddd65a874fd23f1cf312990c7a48abfc0b2c6",
+      "pkg-version": "3.10.3.0",
      "style": "global",
      "type": "configured"
    },
@@ -62,8 +62,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "Cabal-syntax-3.10.1.0-a7e09e0ed12b8981fd4bb5283acfafac1e1e07aeb2b44507502ae461bb01f1b4",
-      "pkg-cabal-sha256": "bb835ebab577fd0f9c11dab96210dbb8d68ffc62652576f4b092563c345930e7",
+      "id": "Cabal-syntax-3.10.3.0-bd240e76e30897fd497b90bd92647093c4606b1b4a2113b8d239c122938d75db",
+      "pkg-cabal-sha256": "c2ca36499bf9365726968b1e11a757e6d846c47cdf0c2c26a003698fd3c300fe",
      "pkg-name": "Cabal-syntax",
      "pkg-src": {
        "repo": {
@@ -72,8 +72,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "3b80092355327768a0de8298ac50ee906b7e82462e2ba14542730573b453f522",
-      "pkg-version": "3.10.1.0",
+      "pkg-src-sha256": "75d6a0aa9c00990a0d6e7720ac50c6954f6c942fa1be42c8add7f1c025f7e212",
+      "pkg-version": "3.10.3.0",
      "style": "global",
      "type": "configured"
    },
@@ -192,7 +192,7 @@
        "use-cbits": true
      },
      "id": "cryptohash-sha256-0.11.102.1-acddc77e078ebf51b3458d0865f61f361140a39f18d05e6b723f84b0bf6e27e4",
-      "pkg-cabal-sha256": "03db065161987f614a3a2bbcd16264f78e47efe231fb5bd161be2043eaf20488",
+      "pkg-cabal-sha256": "200d756a7b3bab7ca2bac6eb50ed8252f26de77ac8def490a3ad743f2933acbd",
      "pkg-name": "cryptohash-sha256",
      "pkg-src": {
        "repo": {
@@ -229,6 +229,19 @@
      "pkg-version": "1.3.7.1",
      "type": "pre-existing"
    },
+    {
+      "depends": [
+        "base-4.17.1.0",
+        "mtl-2.2.2",
+        "stm-2.5.1.0",
+        "template-haskell-2.19.0.0",
+        "transformers-0.5.6.2"
+      ],
+      "id": "exceptions-0.10.5",
+      "pkg-name": "exceptions",
+      "pkg-version": "0.10.5",
+      "type": "pre-existing"
+    },
    {
      "component-name": "lib",
      "depends": [
@@ -242,8 +255,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "extra-1.7.14-3c135a33213d9e73fc061f2938e3aebc002f75a4e39573ac0b477569d286ffe9",
-      "pkg-cabal-sha256": "e3d3ce1dc7746b1132930e48c59fb5e8c51a09e92e0c031316be031067a273fb",
+      "id": "extra-1.7.16-0ce5b0b29e026c3aaa4eae504e8bb414818969a69e3538e1b457f9adc2c13e0f",
+      "pkg-cabal-sha256": "edd191f77adf31acb1b53960b4d1ca9fca925ac28345a396c614414cb7bfa7ec",
      "pkg-name": "extra",
      "pkg-src": {
        "repo": {
@@ -252,8 +265,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "b6a909f8f0e4b8076a1653b4d34815a782f0a8c1e83d5267f4d00496471ef567",
-      "pkg-version": "1.7.14",
+      "pkg-src-sha256": "250c6d43c30b2c71f2cf498a10e69e43ac035974d3819529385d99e42ce77c70",
+      "pkg-version": "1.7.16",
      "style": "global",
      "type": "configured"
    },
@@ -271,12 +284,12 @@
      "depends": [
        "base-4.17.1.0",
        "directory-1.3.7.1",
-        "extra-1.7.14-3c135a33213d9e73fc061f2938e3aebc002f75a4e39573ac0b477569d286ffe9",
+        "extra-1.7.16-0ce5b0b29e026c3aaa4eae504e8bb414818969a69e3538e1b457f9adc2c13e0f",
        "filepath-1.4.2.2"
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "filepattern-0.1.3-7bb9c8b3ca4504ebc74c905852a4f0a1de8584d479210f0716c887378b640223",
+      "id": "filepattern-0.1.3-79abbe71a6edda526caf741458a14552ad5e510683bfde076530c594903980c5",
      "pkg-cabal-sha256": "372c1733d83b90045eb29da9f010fed79bfef8771ce65eb126a1d83ecc54a9a2",
      "pkg-name": "filepattern",
      "pkg-src": {
@@ -310,18 +323,18 @@
      "type": "pre-existing"
    },
    {
-      "build-info": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/ghc-platform-0.1.0.0/build-info.json",
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/ghc-platform-0.1.0.0/build-info.json",
      "component-name": "lib",
      "depends": [
        "base-4.17.1.0"
      ],
-      "dist-dir": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/ghc-platform-0.1.0.0",
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/ghc-platform-0.1.0.0",
      "exe-depends": [],
      "flags": {},
      "id": "ghc-platform-0.1.0.0-inplace",
      "pkg-name": "ghc-platform",
      "pkg-src": {
-        "path": "/home/matt/ghc-scratch/hadrian/../libraries/ghc-platform",
+        "path": "/home/matt/ghc-llvm/hadrian/../libraries/ghc-platform",
        "type": "local"
      },
      "pkg-version": "0.1.0.0",
@@ -338,7 +351,7 @@
      "type": "pre-existing"
    },
    {
-      "build-info": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/ghc-toolchain-0.1.0.0/build-info.json",
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/ghc-toolchain-0.1.0.0/build-info.json",
      "component-name": "lib",
      "depends": [
        "base-4.17.1.0",
@@ -349,13 +362,13 @@
        "text-2.0.2",
        "transformers-0.5.6.2"
      ],
-      "dist-dir": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/ghc-toolchain-0.1.0.0",
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/ghc-toolchain-0.1.0.0",
      "exe-depends": [],
      "flags": {},
      "id": "ghc-toolchain-0.1.0.0-inplace",
      "pkg-name": "ghc-toolchain",
      "pkg-src": {
-        "path": "/home/matt/ghc-scratch/hadrian/../utils/ghc-toolchain",
+        "path": "/home/matt/ghc-llvm/hadrian/../utils/ghc-toolchain",
        "type": "local"
      },
      "pkg-version": "0.1.0.0",
@@ -363,30 +376,30 @@
      "type": "configured"
    },
    {
-      "bin-file": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/hadrian-0.1.0.0/x/hadrian/build/hadrian/hadrian",
-      "build-info": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/hadrian-0.1.0.0/x/hadrian/build-info.json",
+      "bin-file": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/hadrian-0.1.0.0/x/hadrian/build/hadrian/hadrian",
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/hadrian-0.1.0.0/x/hadrian/build-info.json",
      "component-name": "exe:hadrian",
      "depends": [
-        "Cabal-3.10.1.0-08e8e38266cef863dfe810047ea2fb0574df80fd2bdeee7f2fbd09dadd0ddc38",
+        "Cabal-3.10.3.0-f96789bf6cec18621ae93e185a26c16406da65e4c31b78396db71cdd1bb80e74",
        "base-4.17.1.0",
        "base16-bytestring-1.0.2.0-1562190683b25c2fe2deaf09b565f90fb7542655a2a02b012fe1b10df4b7e2f4",
        "bytestring-0.11.4.0",
        "containers-0.6.7",
        "cryptohash-sha256-0.11.102.1-acddc77e078ebf51b3458d0865f61f361140a39f18d05e6b723f84b0bf6e27e4",
        "directory-1.3.7.1",
-        "extra-1.7.14-3c135a33213d9e73fc061f2938e3aebc002f75a4e39573ac0b477569d286ffe9",
+        "extra-1.7.16-0ce5b0b29e026c3aaa4eae504e8bb414818969a69e3538e1b457f9adc2c13e0f",
        "filepath-1.4.2.2",
        "ghc-platform-0.1.0.0-inplace",
        "ghc-toolchain-0.1.0.0-inplace",
        "mtl-2.2.2",
        "parsec-3.1.16.1",
-        "shake-0.19.7-f71745b46f22f6234860e1e8c1485231913c01f35a23ce99895df3eb6d28380b",
+        "shake-0.19.8-1e0cfc3681b1e11c569d441a1322d2160deee8871759a1c3e15efcdcaff3697b",
        "text-2.0.2",
        "time-1.12.2",
        "transformers-0.5.6.2",
-        "unordered-containers-0.2.19.1-d24c37c689def916e86aa83074dbfab953e97becf1c2afe78f57aef91465933c"
+        "unordered-containers-0.2.20-746fbfef10981893da09397a0a9ff909dd1dddd3ed517bae6c589aae98c92211"
      ],
-      "dist-dir": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/hadrian-0.1.0.0/x/hadrian",
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/hadrian-0.1.0.0/x/hadrian",
      "exe-depends": [],
      "flags": {
        "selftest": false,
@@ -395,7 +408,7 @@
      "id": "hadrian-0.1.0.0-inplace-hadrian",
      "pkg-name": "hadrian",
      "pkg-src": {
-        "path": "/home/matt/ghc-scratch/hadrian/.",
+        "path": "/home/matt/ghc-llvm/hadrian/.",
        "type": "local"
      },
      "pkg-version": "0.1.0.0",
@@ -412,6 +425,7 @@
        "filepath-1.4.2.2",
        "ghc-bignum-1.3",
        "ghc-prim-0.9.0",
+        "os-string-2.0.2.2-f77808b867ea8e844f94fc1e2be535dff5cb09ccdb004be1840858e53d88fd30",
        "text-2.0.2"
      ],
      "exe-depends": [],
@@ -419,8 +433,8 @@
        "integer-gmp": true,
        "random-initial-seed": false
      },
-      "id": "hashable-1.4.3.0-37fea282e73b3a240cd260ae4ff2fe7516b32c564382d860d19fdf55e0d414c2",
-      "pkg-cabal-sha256": "f3bf68acfa0df7a064a378ef2cdcfeb55e6fb96100675f4c593556dcbf3d7194",
+      "id": "hashable-1.4.4.0-a034dbae5bc5d2c34cdbbf616169b59f536068b4868f2f3e20176d2c58dc13fa",
+      "pkg-cabal-sha256": "ae22238274c572aa91e90c6c353e7206386708912ac5e6dc40ac61d1dcc553db",
      "pkg-name": "hashable",
      "pkg-src": {
        "repo": {
@@ -429,8 +443,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "32efb16c2891786209b7cbe5c39df9b3a9ae51e836f1a54f646bc4602b7ab0f5",
-      "pkg-version": "1.4.3.0",
+      "pkg-src-sha256": "1fa3d64548440942b2b38b99c76d8dcaa94fa2ea3912cd7a6354ea4ec4af4758",
+      "pkg-version": "1.4.4.0",
      "style": "global",
      "type": "configured"
    },
@@ -532,6 +546,32 @@
      "pkg-version": "2.2.2",
      "type": "pre-existing"
    },
+    {
+      "component-name": "lib",
+      "depends": [
+        "base-4.17.1.0",
+        "bytestring-0.11.4.0",
+        "deepseq-1.4.8.0",
+        "exceptions-0.10.5",
+        "template-haskell-2.19.0.0"
+      ],
+      "exe-depends": [],
+      "flags": {},
+      "id": "os-string-2.0.2.2-f77808b867ea8e844f94fc1e2be535dff5cb09ccdb004be1840858e53d88fd30",
+      "pkg-cabal-sha256": "704ea0b499f9d4e43c98fd11e2fcf6b8762a1daa91114aa195966ebcc76a8d51",
+      "pkg-name": "os-string",
+      "pkg-src": {
+        "repo": {
+          "type": "secure-repo",
+          "uri": "http://hackage.haskell.org/"
+        },
+        "type": "repo-tar"
+      },
+      "pkg-src-sha256": "3fcc0d7657207d5ee45ce8994a74c5baa2f1149bbd28b3b75e2f646ed4a7251c",
+      "pkg-version": "2.0.2.2",
+      "style": "global",
+      "type": "configured"
+    },
    {
      "depends": [
        "base-4.17.1.0",
@@ -565,8 +605,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "primitive-0.8.0.0-211187599cff725317e299b747c780c346889529ec86d77458b3399dd533f17c",
-      "pkg-cabal-sha256": "d0ff45fa6e61f92af23611ceb8b9a6a04c236b50fb70c60e2ed3bfa532703670",
+      "id": "primitive-0.9.0.0-c01dcee42013cbf68a73281f972f4c9291ca4a884ff03b4791ed3f43dab7839d",
+      "pkg-cabal-sha256": "2e08c5409e3559c7f1669ef50e9a0d9a397e68ecf51110d5e2cedf05cdd7d93c",
      "pkg-name": "primitive",
      "pkg-src": {
        "repo": {
@@ -575,8 +615,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "5553c21b4a789f9b591eed69e598cc58484c274af29250e517b5a8bcc62b995f",
-      "pkg-version": "0.8.0.0",
+      "pkg-src-sha256": "696d4bd291c94d736142d6182117dca4258d3ef28bfefdb649ac8b5ecd0999c7",
+      "pkg-version": "0.9.0.0",
      "style": "global",
      "type": "configured"
    },
@@ -604,8 +644,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "random-1.2.1.1-1b0d5d2af6bfb7303fa92d29e6939b7778c32fabe0cbcc752fd74724644c4533",
-      "pkg-cabal-sha256": "e7c1f881159d5cc788619c9ee8b8f340ba2ff0db571cdf3d1a1968ebc5108789",
+      "id": "random-1.2.1.2-8fcc8e88fbd2a23c4071b76dd536364163fa921a5e3dc47925be42970dd081fc",
+      "pkg-cabal-sha256": "32397de181e20ccaacf806ec70de9308cf044f089a2be37c936f3f8967bde867",
      "pkg-name": "random",
      "pkg-src": {
        "repo": {
@@ -614,8 +654,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "3e1272f7ed6a4d7bd1712b90143ec326fee9b225789222379fea20a9c90c9b76",
-      "pkg-version": "1.2.1.1",
+      "pkg-src-sha256": "790f4dc2d2327c453ff6aac7bf15399fd123d55e927935f68f84b5df42d9a4b4",
+      "pkg-version": "1.2.1.2",
      "style": "global",
      "type": "configured"
    },
@@ -627,39 +667,39 @@
      "type": "pre-existing"
    },
    {
-      "bin-file": "/home/matt/.cabal/store/ghc-9.4.5/shake-0.19.7-e-shake-4c001db2ff5b0db584e791b45b0293054fafa7c86c69d7c6b31c4a9950f01570/bin/shake",
-      "component-name": "exe:shake",
+      "component-name": "lib",
      "depends": [
        "base-4.17.1.0",
        "binary-0.8.9.1",
        "bytestring-0.11.4.0",
        "deepseq-1.4.8.0",
        "directory-1.3.7.1",
-        "extra-1.7.14-3c135a33213d9e73fc061f2938e3aebc002f75a4e39573ac0b477569d286ffe9",
+        "extra-1.7.16-0ce5b0b29e026c3aaa4eae504e8bb414818969a69e3538e1b457f9adc2c13e0f",
        "filepath-1.4.2.2",
-        "filepattern-0.1.3-7bb9c8b3ca4504ebc74c905852a4f0a1de8584d479210f0716c887378b640223",
-        "hashable-1.4.3.0-37fea282e73b3a240cd260ae4ff2fe7516b32c564382d860d19fdf55e0d414c2",
+        "filepattern-0.1.3-79abbe71a6edda526caf741458a14552ad5e510683bfde076530c594903980c5",
+        "hashable-1.4.4.0-a034dbae5bc5d2c34cdbbf616169b59f536068b4868f2f3e20176d2c58dc13fa",
        "heaps-0.4-603c1c71e662ec29cc728283d7fe7527e0686dc213e55d125fe19cc10c6b733e",
        "js-dgtable-0.5.2-aab316f232ac5d36ab4423a466ef7107cb8d91d470e651610356727186379078",
        "js-flot-0.8.3-b9fdf04b71b9f190fffc13103b6cc234a1ef985ddd3fc04ab86a4c4e0a9e278f",
        "js-jquery-3.3.1-de927d6b63a2e7ecb7dee40e0f7d18df8f129e2307e25bc44adfcb35f185405d",
-        "primitive-0.8.0.0-211187599cff725317e299b747c780c346889529ec86d77458b3399dd533f17c",
+        "primitive-0.9.0.0-c01dcee42013cbf68a73281f972f4c9291ca4a884ff03b4791ed3f43dab7839d",
        "process-1.6.16.0",
-        "random-1.2.1.1-1b0d5d2af6bfb7303fa92d29e6939b7778c32fabe0cbcc752fd74724644c4533",
+        "random-1.2.1.2-8fcc8e88fbd2a23c4071b76dd536364163fa921a5e3dc47925be42970dd081fc",
        "time-1.12.2",
        "transformers-0.5.6.2",
        "unix-2.7.3",
-        "unordered-containers-0.2.19.1-d24c37c689def916e86aa83074dbfab953e97becf1c2afe78f57aef91465933c",
+        "unordered-containers-0.2.20-746fbfef10981893da09397a0a9ff909dd1dddd3ed517bae6c589aae98c92211",
        "utf8-string-1.0.2-76a082425a4861f05bd3f8a95b66da2c4f52a12eda35f67c591b4d8b48afcc5f"
      ],
      "exe-depends": [],
      "flags": {
        "cloud": false,
        "embed-files": false,
-        "portable": false
+        "portable": false,
+        "threaded": true
      },
-      "id": "shake-0.19.7-e-shake-4c001db2ff5b0db584e791b45b0293054fafa7c86c69d7c6b31c4a9950f01570",
-      "pkg-cabal-sha256": "3cb5814cce210b9756fa9246ff1b2a1e1b86be46fdc4c5e2baacdc5bf83ce5c3",
+      "id": "shake-0.19.8-1e0cfc3681b1e11c569d441a1322d2160deee8871759a1c3e15efcdcaff3697b",
+      "pkg-cabal-sha256": "03c8f06de478e07ad6fde95984c9206920106d0d8432ecb7ab825ef108d45382",
      "pkg-name": "shake",
      "pkg-src": {
        "repo": {
@@ -668,44 +708,46 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "352a56af12f70b50d564dcb61131555577281957ee196f1702a3723c0a3699d1",
-      "pkg-version": "0.19.7",
+      "pkg-src-sha256": "6384e33a26a2590bf33719e88881076b899ac4b5340c1c9271e4caa37e9d6535",
+      "pkg-version": "0.19.8",
      "style": "global",
      "type": "configured"
    },
    {
-      "component-name": "lib",
+      "bin-file": "/home/matt/.cabal/store/ghc-9.4.5/shake-0.19.8-e-shake-6c518705e1b9cc8c3fcb352c9a1e782328d258eb2fb8ecbf090ff26582497500/bin/shake",
+      "component-name": "exe:shake",
      "depends": [
        "base-4.17.1.0",
        "binary-0.8.9.1",
        "bytestring-0.11.4.0",
        "deepseq-1.4.8.0",
        "directory-1.3.7.1",
-        "extra-1.7.14-3c135a33213d9e73fc061f2938e3aebc002f75a4e39573ac0b477569d286ffe9",
+        "extra-1.7.16-0ce5b0b29e026c3aaa4eae504e8bb414818969a69e3538e1b457f9adc2c13e0f",
        "filepath-1.4.2.2",
-        "filepattern-0.1.3-7bb9c8b3ca4504ebc74c905852a4f0a1de8584d479210f0716c887378b640223",
-        "hashable-1.4.3.0-37fea282e73b3a240cd260ae4ff2fe7516b32c564382d860d19fdf55e0d414c2",
+        "filepattern-0.1.3-79abbe71a6edda526caf741458a14552ad5e510683bfde076530c594903980c5",
+        "hashable-1.4.4.0-a034dbae5bc5d2c34cdbbf616169b59f536068b4868f2f3e20176d2c58dc13fa",
        "heaps-0.4-603c1c71e662ec29cc728283d7fe7527e0686dc213e55d125fe19cc10c6b733e",
        "js-dgtable-0.5.2-aab316f232ac5d36ab4423a466ef7107cb8d91d470e651610356727186379078",
        "js-flot-0.8.3-b9fdf04b71b9f190fffc13103b6cc234a1ef985ddd3fc04ab86a4c4e0a9e278f",
        "js-jquery-3.3.1-de927d6b63a2e7ecb7dee40e0f7d18df8f129e2307e25bc44adfcb35f185405d",
-        "primitive-0.8.0.0-211187599cff725317e299b747c780c346889529ec86d77458b3399dd533f17c",
+        "primitive-0.9.0.0-c01dcee42013cbf68a73281f972f4c9291ca4a884ff03b4791ed3f43dab7839d",
        "process-1.6.16.0",
-        "random-1.2.1.1-1b0d5d2af6bfb7303fa92d29e6939b7778c32fabe0cbcc752fd74724644c4533",
+        "random-1.2.1.2-8fcc8e88fbd2a23c4071b76dd536364163fa921a5e3dc47925be42970dd081fc",
        "time-1.12.2",
        "transformers-0.5.6.2",
        "unix-2.7.3",
-        "unordered-containers-0.2.19.1-d24c37c689def916e86aa83074dbfab953e97becf1c2afe78f57aef91465933c",
+        "unordered-containers-0.2.20-746fbfef10981893da09397a0a9ff909dd1dddd3ed517bae6c589aae98c92211",
        "utf8-string-1.0.2-76a082425a4861f05bd3f8a95b66da2c4f52a12eda35f67c591b4d8b48afcc5f"
      ],
      "exe-depends": [],
      "flags": {
        "cloud": false,
        "embed-files": false,
-        "portable": false
+        "portable": false,
+        "threaded": true
      },
-      "id": "shake-0.19.7-f71745b46f22f6234860e1e8c1485231913c01f35a23ce99895df3eb6d28380b",
-      "pkg-cabal-sha256": "3cb5814cce210b9756fa9246ff1b2a1e1b86be46fdc4c5e2baacdc5bf83ce5c3",
+      "id": "shake-0.19.8-e-shake-6c518705e1b9cc8c3fcb352c9a1e782328d258eb2fb8ecbf090ff26582497500",
+      "pkg-cabal-sha256": "03c8f06de478e07ad6fde95984c9206920106d0d8432ecb7ab825ef108d45382",
      "pkg-name": "shake",
      "pkg-src": {
        "repo": {
@@ -714,8 +756,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "352a56af12f70b50d564dcb61131555577281957ee196f1702a3723c0a3699d1",
-      "pkg-version": "0.19.7",
+      "pkg-src-sha256": "6384e33a26a2590bf33719e88881076b899ac4b5340c1c9271e4caa37e9d6535",
+      "pkg-version": "0.19.8",
      "style": "global",
      "type": "configured"
    },
@@ -730,7 +772,7 @@
        "optimised-mixer": false
      },
      "id": "splitmix-0.1.0.5-a76fcff6778587ab189e44ca6bcc425171016975bf033f4ba08e29302b217412",
-      "pkg-cabal-sha256": "bac0ae8d46a04e410666b0c8081cff63f060f29157983b569ca86ddb6e6e0dc6",
+      "pkg-cabal-sha256": "caa9b4a92abf1496c7f6a3c0f4e357426a54880077cb9f04e260a8bfa034b77b",
      "pkg-name": "splitmix",
      "pkg-src": {
        "repo": {
@@ -744,6 +786,16 @@
      "style": "global",
      "type": "configured"
    },
+    {
+      "depends": [
+        "array-0.5.4.0",
+        "base-4.17.1.0"
+      ],
+      "id": "stm-2.5.1.0",
+      "pkg-name": "stm",
+      "pkg-version": "2.5.1.0",
+      "type": "pre-existing"
+    },
    {
      "depends": [
        "base-4.17.1.0",
@@ -806,15 +858,15 @@
      "depends": [
        "base-4.17.1.0",
        "deepseq-1.4.8.0",
-        "hashable-1.4.3.0-37fea282e73b3a240cd260ae4ff2fe7516b32c564382d860d19fdf55e0d414c2",
+        "hashable-1.4.4.0-a034dbae5bc5d2c34cdbbf616169b59f536068b4868f2f3e20176d2c58dc13fa",
        "template-haskell-2.19.0.0"
      ],
      "exe-depends": [],
      "flags": {
        "debug": false
      },
-      "id": "unordered-containers-0.2.19.1-d24c37c689def916e86aa83074dbfab953e97becf1c2afe78f57aef91465933c",
-      "pkg-cabal-sha256": "9ad8972c2e913c37b1d4f0e1261517fd7a1b8c8a58077e057be69837e3dbaa00",
+      "id": "unordered-containers-0.2.20-746fbfef10981893da09397a0a9ff909dd1dddd3ed517bae6c589aae98c92211",
+      "pkg-cabal-sha256": "746c32b23f93cb13e52309e54e82d69e4315105f9815b1fcac25a57071505cff",
      "pkg-name": "unordered-containers",
      "pkg-src": {
        "repo": {
@@ -823,8 +875,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "1b27bec5e0d522b27a6029ebf4c4a6d40acbc083c787008e32fb55c4b1d128d2",
-      "pkg-version": "0.2.19.1",
+      "pkg-src-sha256": "d9cfb287cf00592d39dc9c3cac8b99627ea08f2c01798e70130fc39f7c90f11d",
+      "pkg-version": "0.2.20",
      "style": "global",
      "type": "configured"
    },

--- a/hadrian/bootstrap/plan-9_4_6.json
+++ b/hadrian/bootstrap/plan-9_4_6.json
 {
  "arch": "x86_64",
-  "cabal-lib-version": "3.10.1.0",
-  "cabal-version": "3.10.1.0",
+  "cabal-lib-version": "3.10.2.1",
+  "cabal-version": "3.10.2.1",
  "compiler-id": "ghc-9.4.5",
  "install-plan": [
    {
      "component-name": "lib",
      "depends": [
-        "Cabal-syntax-3.10.1.0-a7e09e0ed12b8981fd4bb5283acfafac1e1e07aeb2b44507502ae461bb01f1b4",
+        "Cabal-syntax-3.10.3.0-bd240e76e30897fd497b90bd92647093c4606b1b4a2113b8d239c122938d75db",
        "array-0.5.4.0",
        "base-4.17.1.0",
        "bytestring-0.11.4.0",
@@ -26,8 +26,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "Cabal-3.10.1.0-08e8e38266cef863dfe810047ea2fb0574df80fd2bdeee7f2fbd09dadd0ddc38",
-      "pkg-cabal-sha256": "6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94",
+      "id": "Cabal-3.10.3.0-f96789bf6cec18621ae93e185a26c16406da65e4c31b78396db71cdd1bb80e74",
+      "pkg-cabal-sha256": "4a36954a66769eef90353daa0dbb07d43e49c228281383c7e4134445d495f714",
      "pkg-name": "Cabal",
      "pkg-src": {
        "repo": {
@@ -36,8 +36,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "0bdbab8e4c3178016fb0f070d8b62bc3067f93afabfbd3aa17c8065d0ecc98ee",
-      "pkg-version": "3.10.1.0",
+      "pkg-src-sha256": "cb7f7c66626d7555f799e786513ddd65a874fd23f1cf312990c7a48abfc0b2c6",
+      "pkg-version": "3.10.3.0",
      "style": "global",
      "type": "configured"
    },
@@ -62,8 +62,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "Cabal-syntax-3.10.1.0-a7e09e0ed12b8981fd4bb5283acfafac1e1e07aeb2b44507502ae461bb01f1b4",
-      "pkg-cabal-sha256": "bb835ebab577fd0f9c11dab96210dbb8d68ffc62652576f4b092563c345930e7",
+      "id": "Cabal-syntax-3.10.3.0-bd240e76e30897fd497b90bd92647093c4606b1b4a2113b8d239c122938d75db",
+      "pkg-cabal-sha256": "c2ca36499bf9365726968b1e11a757e6d846c47cdf0c2c26a003698fd3c300fe",
      "pkg-name": "Cabal-syntax",
      "pkg-src": {
        "repo": {
@@ -72,8 +72,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "3b80092355327768a0de8298ac50ee906b7e82462e2ba14542730573b453f522",
-      "pkg-version": "3.10.1.0",
+      "pkg-src-sha256": "75d6a0aa9c00990a0d6e7720ac50c6954f6c942fa1be42c8add7f1c025f7e212",
+      "pkg-version": "3.10.3.0",
      "style": "global",
      "type": "configured"
    },
@@ -192,7 +192,7 @@
        "use-cbits": true
      },
      "id": "cryptohash-sha256-0.11.102.1-acddc77e078ebf51b3458d0865f61f361140a39f18d05e6b723f84b0bf6e27e4",
-      "pkg-cabal-sha256": "03db065161987f614a3a2bbcd16264f78e47efe231fb5bd161be2043eaf20488",
+      "pkg-cabal-sha256": "200d756a7b3bab7ca2bac6eb50ed8252f26de77ac8def490a3ad743f2933acbd",
      "pkg-name": "cryptohash-sha256",
      "pkg-src": {
        "repo": {
@@ -229,6 +229,19 @@
      "pkg-version": "1.3.7.1",
      "type": "pre-existing"
    },
+    {
+      "depends": [
+        "base-4.17.1.0",
+        "mtl-2.2.2",
+        "stm-2.5.1.0",
+        "template-haskell-2.19.0.0",
+        "transformers-0.5.6.2"
+      ],
+      "id": "exceptions-0.10.5",
+      "pkg-name": "exceptions",
+      "pkg-version": "0.10.5",
+      "type": "pre-existing"
+    },
    {
      "component-name": "lib",
      "depends": [
@@ -242,8 +255,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "extra-1.7.14-3c135a33213d9e73fc061f2938e3aebc002f75a4e39573ac0b477569d286ffe9",
-      "pkg-cabal-sha256": "e3d3ce1dc7746b1132930e48c59fb5e8c51a09e92e0c031316be031067a273fb",
+      "id": "extra-1.7.16-0ce5b0b29e026c3aaa4eae504e8bb414818969a69e3538e1b457f9adc2c13e0f",
+      "pkg-cabal-sha256": "edd191f77adf31acb1b53960b4d1ca9fca925ac28345a396c614414cb7bfa7ec",
      "pkg-name": "extra",
      "pkg-src": {
        "repo": {
@@ -252,8 +265,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "b6a909f8f0e4b8076a1653b4d34815a782f0a8c1e83d5267f4d00496471ef567",
-      "pkg-version": "1.7.14",
+      "pkg-src-sha256": "250c6d43c30b2c71f2cf498a10e69e43ac035974d3819529385d99e42ce77c70",
+      "pkg-version": "1.7.16",
      "style": "global",
      "type": "configured"
    },
@@ -271,12 +284,12 @@
      "depends": [
        "base-4.17.1.0",
        "directory-1.3.7.1",
-        "extra-1.7.14-3c135a33213d9e73fc061f2938e3aebc002f75a4e39573ac0b477569d286ffe9",
+        "extra-1.7.16-0ce5b0b29e026c3aaa4eae504e8bb414818969a69e3538e1b457f9adc2c13e0f",
        "filepath-1.4.2.2"
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "filepattern-0.1.3-7bb9c8b3ca4504ebc74c905852a4f0a1de8584d479210f0716c887378b640223",
+      "id": "filepattern-0.1.3-79abbe71a6edda526caf741458a14552ad5e510683bfde076530c594903980c5",
      "pkg-cabal-sha256": "372c1733d83b90045eb29da9f010fed79bfef8771ce65eb126a1d83ecc54a9a2",
      "pkg-name": "filepattern",
      "pkg-src": {
@@ -310,18 +323,18 @@
      "type": "pre-existing"
    },
    {
-      "build-info": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/ghc-platform-0.1.0.0/build-info.json",
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/ghc-platform-0.1.0.0/build-info.json",
      "component-name": "lib",
      "depends": [
        "base-4.17.1.0"
      ],
-      "dist-dir": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/ghc-platform-0.1.0.0",
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/ghc-platform-0.1.0.0",
      "exe-depends": [],
      "flags": {},
      "id": "ghc-platform-0.1.0.0-inplace",
      "pkg-name": "ghc-platform",
      "pkg-src": {
-        "path": "/home/matt/ghc-scratch/hadrian/../libraries/ghc-platform",
+        "path": "/home/matt/ghc-llvm/hadrian/../libraries/ghc-platform",
        "type": "local"
      },
      "pkg-version": "0.1.0.0",
@@ -338,7 +351,7 @@
      "type": "pre-existing"
    },
    {
-      "build-info": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/ghc-toolchain-0.1.0.0/build-info.json",
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/ghc-toolchain-0.1.0.0/build-info.json",
      "component-name": "lib",
      "depends": [
        "base-4.17.1.0",
@@ -349,13 +362,13 @@
        "text-2.0.2",
        "transformers-0.5.6.2"
      ],
-      "dist-dir": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/ghc-toolchain-0.1.0.0",
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/ghc-toolchain-0.1.0.0",
      "exe-depends": [],
      "flags": {},
      "id": "ghc-toolchain-0.1.0.0-inplace",
      "pkg-name": "ghc-toolchain",
      "pkg-src": {
-        "path": "/home/matt/ghc-scratch/hadrian/../utils/ghc-toolchain",
+        "path": "/home/matt/ghc-llvm/hadrian/../utils/ghc-toolchain",
        "type": "local"
      },
      "pkg-version": "0.1.0.0",
@@ -363,30 +376,30 @@
      "type": "configured"
    },
    {
-      "bin-file": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/hadrian-0.1.0.0/x/hadrian/build/hadrian/hadrian",
-      "build-info": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/hadrian-0.1.0.0/x/hadrian/build-info.json",
+      "bin-file": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/hadrian-0.1.0.0/x/hadrian/build/hadrian/hadrian",
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/hadrian-0.1.0.0/x/hadrian/build-info.json",
      "component-name": "exe:hadrian",
      "depends": [
-        "Cabal-3.10.1.0-08e8e38266cef863dfe810047ea2fb0574df80fd2bdeee7f2fbd09dadd0ddc38",
+        "Cabal-3.10.3.0-f96789bf6cec18621ae93e185a26c16406da65e4c31b78396db71cdd1bb80e74",
        "base-4.17.1.0",
        "base16-bytestring-1.0.2.0-1562190683b25c2fe2deaf09b565f90fb7542655a2a02b012fe1b10df4b7e2f4",
        "bytestring-0.11.4.0",
        "containers-0.6.7",
        "cryptohash-sha256-0.11.102.1-acddc77e078ebf51b3458d0865f61f361140a39f18d05e6b723f84b0bf6e27e4",
        "directory-1.3.7.1",
-        "extra-1.7.14-3c135a33213d9e73fc061f2938e3aebc002f75a4e39573ac0b477569d286ffe9",
+        "extra-1.7.16-0ce5b0b29e026c3aaa4eae504e8bb414818969a69e3538e1b457f9adc2c13e0f",
        "filepath-1.4.2.2",
        "ghc-platform-0.1.0.0-inplace",
        "ghc-toolchain-0.1.0.0-inplace",
        "mtl-2.2.2",
        "parsec-3.1.16.1",
-        "shake-0.19.7-f71745b46f22f6234860e1e8c1485231913c01f35a23ce99895df3eb6d28380b",
+        "shake-0.19.8-1e0cfc3681b1e11c569d441a1322d2160deee8871759a1c3e15efcdcaff3697b",
        "text-2.0.2",
        "time-1.12.2",
        "transformers-0.5.6.2",
-        "unordered-containers-0.2.19.1-d24c37c689def916e86aa83074dbfab953e97becf1c2afe78f57aef91465933c"
+        "unordered-containers-0.2.20-746fbfef10981893da09397a0a9ff909dd1dddd3ed517bae6c589aae98c92211"
      ],
-      "dist-dir": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/hadrian-0.1.0.0/x/hadrian",
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/hadrian-0.1.0.0/x/hadrian",
      "exe-depends": [],
      "flags": {
        "selftest": false,
@@ -395,7 +408,7 @@
      "id": "hadrian-0.1.0.0-inplace-hadrian",
      "pkg-name": "hadrian",
      "pkg-src": {
-        "path": "/home/matt/ghc-scratch/hadrian/.",
+        "path": "/home/matt/ghc-llvm/hadrian/.",
        "type": "local"
      },
      "pkg-version": "0.1.0.0",
@@ -412,6 +425,7 @@
        "filepath-1.4.2.2",
        "ghc-bignum-1.3",
        "ghc-prim-0.9.0",
+        "os-string-2.0.2.2-f77808b867ea8e844f94fc1e2be535dff5cb09ccdb004be1840858e53d88fd30",
        "text-2.0.2"
      ],
      "exe-depends": [],
@@ -419,8 +433,8 @@
        "integer-gmp": true,
        "random-initial-seed": false
      },
-      "id": "hashable-1.4.3.0-37fea282e73b3a240cd260ae4ff2fe7516b32c564382d860d19fdf55e0d414c2",
-      "pkg-cabal-sha256": "f3bf68acfa0df7a064a378ef2cdcfeb55e6fb96100675f4c593556dcbf3d7194",
+      "id": "hashable-1.4.4.0-a034dbae5bc5d2c34cdbbf616169b59f536068b4868f2f3e20176d2c58dc13fa",
+      "pkg-cabal-sha256": "ae22238274c572aa91e90c6c353e7206386708912ac5e6dc40ac61d1dcc553db",
      "pkg-name": "hashable",
      "pkg-src": {
        "repo": {
@@ -429,8 +443,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "32efb16c2891786209b7cbe5c39df9b3a9ae51e836f1a54f646bc4602b7ab0f5",
-      "pkg-version": "1.4.3.0",
+      "pkg-src-sha256": "1fa3d64548440942b2b38b99c76d8dcaa94fa2ea3912cd7a6354ea4ec4af4758",
+      "pkg-version": "1.4.4.0",
      "style": "global",
      "type": "configured"
    },
@@ -532,6 +546,32 @@
      "pkg-version": "2.2.2",
      "type": "pre-existing"
    },
+    {
+      "component-name": "lib",
+      "depends": [
+        "base-4.17.1.0",
+        "bytestring-0.11.4.0",
+        "deepseq-1.4.8.0",
+        "exceptions-0.10.5",
+        "template-haskell-2.19.0.0"
+      ],
+      "exe-depends": [],
+      "flags": {},
+      "id": "os-string-2.0.2.2-f77808b867ea8e844f94fc1e2be535dff5cb09ccdb004be1840858e53d88fd30",
+      "pkg-cabal-sha256": "704ea0b499f9d4e43c98fd11e2fcf6b8762a1daa91114aa195966ebcc76a8d51",
+      "pkg-name": "os-string",
+      "pkg-src": {
+        "repo": {
+          "type": "secure-repo",
+          "uri": "http://hackage.haskell.org/"
+        },
+        "type": "repo-tar"
+      },
+      "pkg-src-sha256": "3fcc0d7657207d5ee45ce8994a74c5baa2f1149bbd28b3b75e2f646ed4a7251c",
+      "pkg-version": "2.0.2.2",
+      "style": "global",
+      "type": "configured"
+    },
    {
      "depends": [
        "base-4.17.1.0",
@@ -565,8 +605,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "primitive-0.8.0.0-211187599cff725317e299b747c780c346889529ec86d77458b3399dd533f17c",
-      "pkg-cabal-sha256": "d0ff45fa6e61f92af23611ceb8b9a6a04c236b50fb70c60e2ed3bfa532703670",
+      "id": "primitive-0.9.0.0-c01dcee42013cbf68a73281f972f4c9291ca4a884ff03b4791ed3f43dab7839d",
+      "pkg-cabal-sha256": "2e08c5409e3559c7f1669ef50e9a0d9a397e68ecf51110d5e2cedf05cdd7d93c",
      "pkg-name": "primitive",
      "pkg-src": {
        "repo": {
@@ -575,8 +615,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "5553c21b4a789f9b591eed69e598cc58484c274af29250e517b5a8bcc62b995f",
-      "pkg-version": "0.8.0.0",
+      "pkg-src-sha256": "696d4bd291c94d736142d6182117dca4258d3ef28bfefdb649ac8b5ecd0999c7",
+      "pkg-version": "0.9.0.0",
      "style": "global",
      "type": "configured"
    },
@@ -604,8 +644,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "random-1.2.1.1-1b0d5d2af6bfb7303fa92d29e6939b7778c32fabe0cbcc752fd74724644c4533",
-      "pkg-cabal-sha256": "e7c1f881159d5cc788619c9ee8b8f340ba2ff0db571cdf3d1a1968ebc5108789",
+      "id": "random-1.2.1.2-8fcc8e88fbd2a23c4071b76dd536364163fa921a5e3dc47925be42970dd081fc",
+      "pkg-cabal-sha256": "32397de181e20ccaacf806ec70de9308cf044f089a2be37c936f3f8967bde867",
      "pkg-name": "random",
      "pkg-src": {
        "repo": {
@@ -614,8 +654,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "3e1272f7ed6a4d7bd1712b90143ec326fee9b225789222379fea20a9c90c9b76",
-      "pkg-version": "1.2.1.1",
+      "pkg-src-sha256": "790f4dc2d2327c453ff6aac7bf15399fd123d55e927935f68f84b5df42d9a4b4",
+      "pkg-version": "1.2.1.2",
      "style": "global",
      "type": "configured"
    },
@@ -627,39 +667,39 @@
      "type": "pre-existing"
    },
    {
-      "bin-file": "/home/matt/.cabal/store/ghc-9.4.5/shake-0.19.7-e-shake-4c001db2ff5b0db584e791b45b0293054fafa7c86c69d7c6b31c4a9950f01570/bin/shake",
-      "component-name": "exe:shake",
+      "component-name": "lib",
      "depends": [
        "base-4.17.1.0",
        "binary-0.8.9.1",
        "bytestring-0.11.4.0",
        "deepseq-1.4.8.0",
        "directory-1.3.7.1",
-        "extra-1.7.14-3c135a33213d9e73fc061f2938e3aebc002f75a4e39573ac0b477569d286ffe9",
+        "extra-1.7.16-0ce5b0b29e026c3aaa4eae504e8bb414818969a69e3538e1b457f9adc2c13e0f",
        "filepath-1.4.2.2",
-        "filepattern-0.1.3-7bb9c8b3ca4504ebc74c905852a4f0a1de8584d479210f0716c887378b640223",
-        "hashable-1.4.3.0-37fea282e73b3a240cd260ae4ff2fe7516b32c564382d860d19fdf55e0d414c2",
+        "filepattern-0.1.3-79abbe71a6edda526caf741458a14552ad5e510683bfde076530c594903980c5",
+        "hashable-1.4.4.0-a034dbae5bc5d2c34cdbbf616169b59f536068b4868f2f3e20176d2c58dc13fa",
        "heaps-0.4-603c1c71e662ec29cc728283d7fe7527e0686dc213e55d125fe19cc10c6b733e",
        "js-dgtable-0.5.2-aab316f232ac5d36ab4423a466ef7107cb8d91d470e651610356727186379078",
        "js-flot-0.8.3-b9fdf04b71b9f190fffc13103b6cc234a1ef985ddd3fc04ab86a4c4e0a9e278f",
        "js-jquery-3.3.1-de927d6b63a2e7ecb7dee40e0f7d18df8f129e2307e25bc44adfcb35f185405d",
-        "primitive-0.8.0.0-211187599cff725317e299b747c780c346889529ec86d77458b3399dd533f17c",
+        "primitive-0.9.0.0-c01dcee42013cbf68a73281f972f4c9291ca4a884ff03b4791ed3f43dab7839d",
        "process-1.6.16.0",
-        "random-1.2.1.1-1b0d5d2af6bfb7303fa92d29e6939b7778c32fabe0cbcc752fd74724644c4533",
+        "random-1.2.1.2-8fcc8e88fbd2a23c4071b76dd536364163fa921a5e3dc47925be42970dd081fc",
        "time-1.12.2",
        "transformers-0.5.6.2",
        "unix-2.7.3",
-        "unordered-containers-0.2.19.1-d24c37c689def916e86aa83074dbfab953e97becf1c2afe78f57aef91465933c",
+        "unordered-containers-0.2.20-746fbfef10981893da09397a0a9ff909dd1dddd3ed517bae6c589aae98c92211",
        "utf8-string-1.0.2-76a082425a4861f05bd3f8a95b66da2c4f52a12eda35f67c591b4d8b48afcc5f"
      ],
      "exe-depends": [],
      "flags": {
        "cloud": false,
        "embed-files": false,
-        "portable": false
+        "portable": false,
+        "threaded": true
      },
-      "id": "shake-0.19.7-e-shake-4c001db2ff5b0db584e791b45b0293054fafa7c86c69d7c6b31c4a9950f01570",
-      "pkg-cabal-sha256": "3cb5814cce210b9756fa9246ff1b2a1e1b86be46fdc4c5e2baacdc5bf83ce5c3",
+      "id": "shake-0.19.8-1e0cfc3681b1e11c569d441a1322d2160deee8871759a1c3e15efcdcaff3697b",
+      "pkg-cabal-sha256": "03c8f06de478e07ad6fde95984c9206920106d0d8432ecb7ab825ef108d45382",
      "pkg-name": "shake",
      "pkg-src": {
        "repo": {
@@ -668,44 +708,46 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "352a56af12f70b50d564dcb61131555577281957ee196f1702a3723c0a3699d1",
-      "pkg-version": "0.19.7",
+      "pkg-src-sha256": "6384e33a26a2590bf33719e88881076b899ac4b5340c1c9271e4caa37e9d6535",
+      "pkg-version": "0.19.8",
      "style": "global",
      "type": "configured"
    },
    {
-      "component-name": "lib",
+      "bin-file": "/home/matt/.cabal/store/ghc-9.4.5/shake-0.19.8-e-shake-6c518705e1b9cc8c3fcb352c9a1e782328d258eb2fb8ecbf090ff26582497500/bin/shake",
+      "component-name": "exe:shake",
      "depends": [
        "base-4.17.1.0",
        "binary-0.8.9.1",
        "bytestring-0.11.4.0",
        "deepseq-1.4.8.0",
        "directory-1.3.7.1",
-        "extra-1.7.14-3c135a33213d9e73fc061f2938e3aebc002f75a4e39573ac0b477569d286ffe9",
+        "extra-1.7.16-0ce5b0b29e026c3aaa4eae504e8bb414818969a69e3538e1b457f9adc2c13e0f",
        "filepath-1.4.2.2",
-        "filepattern-0.1.3-7bb9c8b3ca4504ebc74c905852a4f0a1de8584d479210f0716c887378b640223",
-        "hashable-1.4.3.0-37fea282e73b3a240cd260ae4ff2fe7516b32c564382d860d19fdf55e0d414c2",
+        "filepattern-0.1.3-79abbe71a6edda526caf741458a14552ad5e510683bfde076530c594903980c5",
+        "hashable-1.4.4.0-a034dbae5bc5d2c34cdbbf616169b59f536068b4868f2f3e20176d2c58dc13fa",
        "heaps-0.4-603c1c71e662ec29cc728283d7fe7527e0686dc213e55d125fe19cc10c6b733e",
        "js-dgtable-0.5.2-aab316f232ac5d36ab4423a466ef7107cb8d91d470e651610356727186379078",
        "js-flot-0.8.3-b9fdf04b71b9f190fffc13103b6cc234a1ef985ddd3fc04ab86a4c4e0a9e278f",
        "js-jquery-3.3.1-de927d6b63a2e7ecb7dee40e0f7d18df8f129e2307e25bc44adfcb35f185405d",
-        "primitive-0.8.0.0-211187599cff725317e299b747c780c346889529ec86d77458b3399dd533f17c",
+        "primitive-0.9.0.0-c01dcee42013cbf68a73281f972f4c9291ca4a884ff03b4791ed3f43dab7839d",
        "process-1.6.16.0",
-        "random-1.2.1.1-1b0d5d2af6bfb7303fa92d29e6939b7778c32fabe0cbcc752fd74724644c4533",
+        "random-1.2.1.2-8fcc8e88fbd2a23c4071b76dd536364163fa921a5e3dc47925be42970dd081fc",
        "time-1.12.2",
        "transformers-0.5.6.2",
        "unix-2.7.3",
-        "unordered-containers-0.2.19.1-d24c37c689def916e86aa83074dbfab953e97becf1c2afe78f57aef91465933c",
+        "unordered-containers-0.2.20-746fbfef10981893da09397a0a9ff909dd1dddd3ed517bae6c589aae98c92211",
        "utf8-string-1.0.2-76a082425a4861f05bd3f8a95b66da2c4f52a12eda35f67c591b4d8b48afcc5f"
      ],
      "exe-depends": [],
      "flags": {
        "cloud": false,
        "embed-files": false,
-        "portable": false
+        "portable": false,
+        "threaded": true
      },
-      "id": "shake-0.19.7-f71745b46f22f6234860e1e8c1485231913c01f35a23ce99895df3eb6d28380b",
-      "pkg-cabal-sha256": "3cb5814cce210b9756fa9246ff1b2a1e1b86be46fdc4c5e2baacdc5bf83ce5c3",
+      "id": "shake-0.19.8-e-shake-6c518705e1b9cc8c3fcb352c9a1e782328d258eb2fb8ecbf090ff26582497500",
+      "pkg-cabal-sha256": "03c8f06de478e07ad6fde95984c9206920106d0d8432ecb7ab825ef108d45382",
      "pkg-name": "shake",
      "pkg-src": {
        "repo": {
@@ -714,8 +756,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "352a56af12f70b50d564dcb61131555577281957ee196f1702a3723c0a3699d1",
-      "pkg-version": "0.19.7",
+      "pkg-src-sha256": "6384e33a26a2590bf33719e88881076b899ac4b5340c1c9271e4caa37e9d6535",
+      "pkg-version": "0.19.8",
      "style": "global",
      "type": "configured"
    },
@@ -730,7 +772,7 @@
        "optimised-mixer": false
      },
      "id": "splitmix-0.1.0.5-a76fcff6778587ab189e44ca6bcc425171016975bf033f4ba08e29302b217412",
-      "pkg-cabal-sha256": "bac0ae8d46a04e410666b0c8081cff63f060f29157983b569ca86ddb6e6e0dc6",
+      "pkg-cabal-sha256": "caa9b4a92abf1496c7f6a3c0f4e357426a54880077cb9f04e260a8bfa034b77b",
      "pkg-name": "splitmix",
      "pkg-src": {
        "repo": {
@@ -744,6 +786,16 @@
      "style": "global",
      "type": "configured"
    },
+    {
+      "depends": [
+        "array-0.5.4.0",
+        "base-4.17.1.0"
+      ],
+      "id": "stm-2.5.1.0",
+      "pkg-name": "stm",
+      "pkg-version": "2.5.1.0",
+      "type": "pre-existing"
+    },
    {
      "depends": [
        "base-4.17.1.0",
@@ -806,15 +858,15 @@
      "depends": [
        "base-4.17.1.0",
        "deepseq-1.4.8.0",
-        "hashable-1.4.3.0-37fea282e73b3a240cd260ae4ff2fe7516b32c564382d860d19fdf55e0d414c2",
+        "hashable-1.4.4.0-a034dbae5bc5d2c34cdbbf616169b59f536068b4868f2f3e20176d2c58dc13fa",
        "template-haskell-2.19.0.0"
      ],
      "exe-depends": [],
      "flags": {
        "debug": false
      },
-      "id": "unordered-containers-0.2.19.1-d24c37c689def916e86aa83074dbfab953e97becf1c2afe78f57aef91465933c",
-      "pkg-cabal-sha256": "9ad8972c2e913c37b1d4f0e1261517fd7a1b8c8a58077e057be69837e3dbaa00",
+      "id": "unordered-containers-0.2.20-746fbfef10981893da09397a0a9ff909dd1dddd3ed517bae6c589aae98c92211",
+      "pkg-cabal-sha256": "746c32b23f93cb13e52309e54e82d69e4315105f9815b1fcac25a57071505cff",
      "pkg-name": "unordered-containers",
      "pkg-src": {
        "repo": {
@@ -823,8 +875,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "1b27bec5e0d522b27a6029ebf4c4a6d40acbc083c787008e32fb55c4b1d128d2",
-      "pkg-version": "0.2.19.1",
+      "pkg-src-sha256": "d9cfb287cf00592d39dc9c3cac8b99627ea08f2c01798e70130fc39f7c90f11d",
+      "pkg-version": "0.2.20",
      "style": "global",
      "type": "configured"
    },

--- a/hadrian/bootstrap/plan-9_4_7.json
+++ b/hadrian/bootstrap/plan-9_4_7.json
 {
  "arch": "x86_64",
-  "cabal-lib-version": "3.10.1.0",
-  "cabal-version": "3.10.1.0",
+  "cabal-lib-version": "3.10.2.1",
+  "cabal-version": "3.10.2.1",
  "compiler-id": "ghc-9.4.7",
  "install-plan": [
    {
      "component-name": "lib",
      "depends": [
-        "Cabal-syntax-3.10.1.0-8c55ad51c20e2b1a5b2d6f70579dc15ec88c78a7feb3ba120fc65275f16d092e",
+        "Cabal-syntax-3.10.3.0-46621b325801a51753fc6b14773dee4e8e5a2c01b845c2fff5f45ff180202ff2",
        "array-0.5.4.0",
        "base-4.17.2.0",
        "bytestring-0.11.5.2",
@@ -26,8 +26,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "Cabal-3.10.1.0-1b15bbadb88194c4fbf804f8dad22608af27a0d45235499584abbc59a564a73a",
-      "pkg-cabal-sha256": "6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94",
+      "id": "Cabal-3.10.3.0-a00b7c9c85db186d414c3056f88629203620302dbeeeb8bbab101d33f8b4333d",
+      "pkg-cabal-sha256": "4a36954a66769eef90353daa0dbb07d43e49c228281383c7e4134445d495f714",
      "pkg-name": "Cabal",
      "pkg-src": {
        "repo": {
@@ -36,8 +36,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "0bdbab8e4c3178016fb0f070d8b62bc3067f93afabfbd3aa17c8065d0ecc98ee",
-      "pkg-version": "3.10.1.0",
+      "pkg-src-sha256": "cb7f7c66626d7555f799e786513ddd65a874fd23f1cf312990c7a48abfc0b2c6",
+      "pkg-version": "3.10.3.0",
      "style": "global",
      "type": "configured"
    },
@@ -62,8 +62,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "Cabal-syntax-3.10.1.0-8c55ad51c20e2b1a5b2d6f70579dc15ec88c78a7feb3ba120fc65275f16d092e",
-      "pkg-cabal-sha256": "bb835ebab577fd0f9c11dab96210dbb8d68ffc62652576f4b092563c345930e7",
+      "id": "Cabal-syntax-3.10.3.0-46621b325801a51753fc6b14773dee4e8e5a2c01b845c2fff5f45ff180202ff2",
+      "pkg-cabal-sha256": "c2ca36499bf9365726968b1e11a757e6d846c47cdf0c2c26a003698fd3c300fe",
      "pkg-name": "Cabal-syntax",
      "pkg-src": {
        "repo": {
@@ -72,8 +72,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "3b80092355327768a0de8298ac50ee906b7e82462e2ba14542730573b453f522",
-      "pkg-version": "3.10.1.0",
+      "pkg-src-sha256": "75d6a0aa9c00990a0d6e7720ac50c6954f6c942fa1be42c8add7f1c025f7e212",
+      "pkg-version": "3.10.3.0",
      "style": "global",
      "type": "configured"
    },
@@ -192,7 +192,7 @@
        "use-cbits": true
      },
      "id": "cryptohash-sha256-0.11.102.1-f17bb43ae888dcfbe02b7208a6889945b6ea9ba42489549ffe76f3934bda202f",
-      "pkg-cabal-sha256": "03db065161987f614a3a2bbcd16264f78e47efe231fb5bd161be2043eaf20488",
+      "pkg-cabal-sha256": "200d756a7b3bab7ca2bac6eb50ed8252f26de77ac8def490a3ad743f2933acbd",
      "pkg-name": "cryptohash-sha256",
      "pkg-src": {
        "repo": {
@@ -229,6 +229,19 @@
      "pkg-version": "1.3.7.1",
      "type": "pre-existing"
    },
+    {
+      "depends": [
+        "base-4.17.2.0",
+        "mtl-2.2.2",
+        "stm-2.5.1.0",
+        "template-haskell-2.19.0.0",
+        "transformers-0.5.6.2"
+      ],
+      "id": "exceptions-0.10.5",
+      "pkg-name": "exceptions",
+      "pkg-version": "0.10.5",
+      "type": "pre-existing"
+    },
    {
      "component-name": "lib",
      "depends": [
@@ -242,8 +255,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "extra-1.7.14-59b3f2752295e793a44fa1fdbe69fca48d09bfa6752b6bfcbd4043c8148cc0df",
-      "pkg-cabal-sha256": "e3d3ce1dc7746b1132930e48c59fb5e8c51a09e92e0c031316be031067a273fb",
+      "id": "extra-1.7.16-22e6cc86ad3929d61077cc506e1b4b0f3a99fd5acdd36721944fff3e56a4e1a0",
+      "pkg-cabal-sha256": "edd191f77adf31acb1b53960b4d1ca9fca925ac28345a396c614414cb7bfa7ec",
      "pkg-name": "extra",
      "pkg-src": {
        "repo": {
@@ -252,8 +265,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "b6a909f8f0e4b8076a1653b4d34815a782f0a8c1e83d5267f4d00496471ef567",
-      "pkg-version": "1.7.14",
+      "pkg-src-sha256": "250c6d43c30b2c71f2cf498a10e69e43ac035974d3819529385d99e42ce77c70",
+      "pkg-version": "1.7.16",
      "style": "global",
      "type": "configured"
    },
@@ -271,12 +284,12 @@
      "depends": [
        "base-4.17.2.0",
        "directory-1.3.7.1",
-        "extra-1.7.14-59b3f2752295e793a44fa1fdbe69fca48d09bfa6752b6bfcbd4043c8148cc0df",
+        "extra-1.7.16-22e6cc86ad3929d61077cc506e1b4b0f3a99fd5acdd36721944fff3e56a4e1a0",
        "filepath-1.4.2.2"
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "filepattern-0.1.3-e0add0a51576a4d24b811936ed0c164dcb466e36caf717663c4028fb9ee120d3",
+      "id": "filepattern-0.1.3-8b08f7c3040a582e9a0a980df2161623fd09aa87bdb2199b59b8148cef62b14b",
      "pkg-cabal-sha256": "372c1733d83b90045eb29da9f010fed79bfef8771ce65eb126a1d83ecc54a9a2",
      "pkg-name": "filepattern",
      "pkg-src": {
@@ -310,18 +323,18 @@
      "type": "pre-existing"
    },
    {
-      "build-info": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.7/ghc-platform-0.1.0.0/build-info.json",
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.7/ghc-platform-0.1.0.0/build-info.json",
      "component-name": "lib",
      "depends": [
        "base-4.17.2.0"
      ],
-      "dist-dir": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.7/ghc-platform-0.1.0.0",
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.7/ghc-platform-0.1.0.0",
      "exe-depends": [],
      "flags": {},
      "id": "ghc-platform-0.1.0.0-inplace",
      "pkg-name": "ghc-platform",
      "pkg-src": {
-        "path": "/home/matt/ghc-scratch/hadrian/../libraries/ghc-platform",
+        "path": "/home/matt/ghc-llvm/hadrian/../libraries/ghc-platform",
        "type": "local"
      },
      "pkg-version": "0.1.0.0",
@@ -338,7 +351,7 @@
      "type": "pre-existing"
    },
    {
-      "build-info": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.7/ghc-toolchain-0.1.0.0/build-info.json",
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.7/ghc-toolchain-0.1.0.0/build-info.json",
      "component-name": "lib",
      "depends": [
        "base-4.17.2.0",
@@ -349,13 +362,13 @@
        "text-2.0.2",
        "transformers-0.5.6.2"
      ],
-      "dist-dir": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.7/ghc-toolchain-0.1.0.0",
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.7/ghc-toolchain-0.1.0.0",
      "exe-depends": [],
      "flags": {},
      "id": "ghc-toolchain-0.1.0.0-inplace",
      "pkg-name": "ghc-toolchain",
      "pkg-src": {
-        "path": "/home/matt/ghc-scratch/hadrian/../utils/ghc-toolchain",
+        "path": "/home/matt/ghc-llvm/hadrian/../utils/ghc-toolchain",
        "type": "local"
      },
      "pkg-version": "0.1.0.0",
@@ -363,30 +376,30 @@
      "type": "configured"
    },
    {
-      "bin-file": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.7/hadrian-0.1.0.0/x/hadrian/build/hadrian/hadrian",
-      "build-info": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.7/hadrian-0.1.0.0/x/hadrian/build-info.json",
+      "bin-file": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.7/hadrian-0.1.0.0/x/hadrian/build/hadrian/hadrian",
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.7/hadrian-0.1.0.0/x/hadrian/build-info.json",
      "component-name": "exe:hadrian",
      "depends": [
-        "Cabal-3.10.1.0-1b15bbadb88194c4fbf804f8dad22608af27a0d45235499584abbc59a564a73a",
+        "Cabal-3.10.3.0-a00b7c9c85db186d414c3056f88629203620302dbeeeb8bbab101d33f8b4333d",
        "base-4.17.2.0",
        "base16-bytestring-1.0.2.0-3ef9f2ebf2ae40c22dce06a228a491b86ef66901eecd676dfb05534a8b85e4a2",
        "bytestring-0.11.5.2",
        "containers-0.6.7",
        "cryptohash-sha256-0.11.102.1-f17bb43ae888dcfbe02b7208a6889945b6ea9ba42489549ffe76f3934bda202f",
        "directory-1.3.7.1",
-        "extra-1.7.14-59b3f2752295e793a44fa1fdbe69fca48d09bfa6752b6bfcbd4043c8148cc0df",
+        "extra-1.7.16-22e6cc86ad3929d61077cc506e1b4b0f3a99fd5acdd36721944fff3e56a4e1a0",
        "filepath-1.4.2.2",
        "ghc-platform-0.1.0.0-inplace",
        "ghc-toolchain-0.1.0.0-inplace",
        "mtl-2.2.2",
        "parsec-3.1.16.1",
-        "shake-0.19.7-938ea8cf1fb7589877af9e00a2bbcd11c75cd7fe9718d1751775500649b4b83a",
+        "shake-0.19.8-223ee72925ce7385eb8692d925d80da9172c95749add2ab0106f4a5b291112ac",
        "text-2.0.2",
        "time-1.12.2",
        "transformers-0.5.6.2",
-        "unordered-containers-0.2.19.1-c6665f9d916cddd05a2de2c8fe0dadad9fd40ede0c09b24ed840a3ee3ec5ede3"
+        "unordered-containers-0.2.20-286f5ea6893f782236091cbd1bd855143a11a659ccf6f627c7558aa27d1148ac"
      ],
-      "dist-dir": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.7/hadrian-0.1.0.0/x/hadrian",
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.7/hadrian-0.1.0.0/x/hadrian",
      "exe-depends": [],
      "flags": {
        "selftest": false,
@@ -395,7 +408,7 @@
      "id": "hadrian-0.1.0.0-inplace-hadrian",
      "pkg-name": "hadrian",
      "pkg-src": {
-        "path": "/home/matt/ghc-scratch/hadrian/.",
+        "path": "/home/matt/ghc-llvm/hadrian/.",
        "type": "local"
      },
      "pkg-version": "0.1.0.0",
@@ -412,6 +425,7 @@
        "filepath-1.4.2.2",
        "ghc-bignum-1.3",
        "ghc-prim-0.9.1",
+        "os-string-2.0.2.2-77fa266a6eb91afb49c1918b02998e40a548658004b9169e8139a56c0e6480c6",
        "text-2.0.2"
      ],
      "exe-depends": [],
@@ -419,8 +433,8 @@
        "integer-gmp": true,
        "random-initial-seed": false
      },
-      "id": "hashable-1.4.3.0-09db42c6b0189f566008419f8ab4ec6f02acb8e5443c9bc3c0160f1119d12a04",
-      "pkg-cabal-sha256": "f3bf68acfa0df7a064a378ef2cdcfeb55e6fb96100675f4c593556dcbf3d7194",
+      "id": "hashable-1.4.4.0-1792dfe802a31c23eb0fe9c50ba3f713348d3d06ba7c8d78aa72345f5f9464ba",
+      "pkg-cabal-sha256": "ae22238274c572aa91e90c6c353e7206386708912ac5e6dc40ac61d1dcc553db",
      "pkg-name": "hashable",
      "pkg-src": {
        "repo": {
@@ -429,8 +443,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "32efb16c2891786209b7cbe5c39df9b3a9ae51e836f1a54f646bc4602b7ab0f5",
-      "pkg-version": "1.4.3.0",
+      "pkg-src-sha256": "1fa3d64548440942b2b38b99c76d8dcaa94fa2ea3912cd7a6354ea4ec4af4758",
+      "pkg-version": "1.4.4.0",
      "style": "global",
      "type": "configured"
    },
@@ -532,6 +546,32 @@
      "pkg-version": "2.2.2",
      "type": "pre-existing"
    },
+    {
+      "component-name": "lib",
+      "depends": [
+        "base-4.17.2.0",
+        "bytestring-0.11.5.2",
+        "deepseq-1.4.8.0",
+        "exceptions-0.10.5",
+        "template-haskell-2.19.0.0"
+      ],
+      "exe-depends": [],
+      "flags": {},
+      "id": "os-string-2.0.2.2-77fa266a6eb91afb49c1918b02998e40a548658004b9169e8139a56c0e6480c6",
+      "pkg-cabal-sha256": "704ea0b499f9d4e43c98fd11e2fcf6b8762a1daa91114aa195966ebcc76a8d51",
+      "pkg-name": "os-string",
+      "pkg-src": {
+        "repo": {
+          "type": "secure-repo",
+          "uri": "http://hackage.haskell.org/"
+        },
+        "type": "repo-tar"
+      },
+      "pkg-src-sha256": "3fcc0d7657207d5ee45ce8994a74c5baa2f1149bbd28b3b75e2f646ed4a7251c",
+      "pkg-version": "2.0.2.2",
+      "style": "global",
+      "type": "configured"
+    },
    {
      "depends": [
        "base-4.17.2.0",
@@ -565,8 +605,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "primitive-0.8.0.0-f79704e7716577e1d850dc83b85c45fffaf9b8d97e33765a9b48422ef722b59c",
-      "pkg-cabal-sha256": "d0ff45fa6e61f92af23611ceb8b9a6a04c236b50fb70c60e2ed3bfa532703670",
+      "id": "primitive-0.9.0.0-955baeb9ba6b1726431ce5abcb7776fe5bea7c360bc4a3dfa451cc53794b341d",
+      "pkg-cabal-sha256": "2e08c5409e3559c7f1669ef50e9a0d9a397e68ecf51110d5e2cedf05cdd7d93c",
      "pkg-name": "primitive",
      "pkg-src": {
        "repo": {
@@ -575,8 +615,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "5553c21b4a789f9b591eed69e598cc58484c274af29250e517b5a8bcc62b995f",
-      "pkg-version": "0.8.0.0",
+      "pkg-src-sha256": "696d4bd291c94d736142d6182117dca4258d3ef28bfefdb649ac8b5ecd0999c7",
+      "pkg-version": "0.9.0.0",
      "style": "global",
      "type": "configured"
    },
@@ -604,8 +644,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "random-1.2.1.1-c5b3207fbe695f5806048cee1ee6d4a48d33056bf1f3cfbd9ee1e189e1f5d1cd",
-      "pkg-cabal-sha256": "e7c1f881159d5cc788619c9ee8b8f340ba2ff0db571cdf3d1a1968ebc5108789",
+      "id": "random-1.2.1.2-cae8192abe0eb7724ebd1cbf9b7ddcdfb823ea9a67fd8ae67b533f90c20fe357",
+      "pkg-cabal-sha256": "32397de181e20ccaacf806ec70de9308cf044f089a2be37c936f3f8967bde867",
      "pkg-name": "random",
      "pkg-src": {
        "repo": {
@@ -614,8 +654,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "3e1272f7ed6a4d7bd1712b90143ec326fee9b225789222379fea20a9c90c9b76",
-      "pkg-version": "1.2.1.1",
+      "pkg-src-sha256": "790f4dc2d2327c453ff6aac7bf15399fd123d55e927935f68f84b5df42d9a4b4",
+      "pkg-version": "1.2.1.2",
      "style": "global",
      "type": "configured"
    },
@@ -634,31 +674,32 @@
        "bytestring-0.11.5.2",
        "deepseq-1.4.8.0",
        "directory-1.3.7.1",
-        "extra-1.7.14-59b3f2752295e793a44fa1fdbe69fca48d09bfa6752b6bfcbd4043c8148cc0df",
+        "extra-1.7.16-22e6cc86ad3929d61077cc506e1b4b0f3a99fd5acdd36721944fff3e56a4e1a0",
        "filepath-1.4.2.2",
-        "filepattern-0.1.3-e0add0a51576a4d24b811936ed0c164dcb466e36caf717663c4028fb9ee120d3",
-        "hashable-1.4.3.0-09db42c6b0189f566008419f8ab4ec6f02acb8e5443c9bc3c0160f1119d12a04",
+        "filepattern-0.1.3-8b08f7c3040a582e9a0a980df2161623fd09aa87bdb2199b59b8148cef62b14b",
+        "hashable-1.4.4.0-1792dfe802a31c23eb0fe9c50ba3f713348d3d06ba7c8d78aa72345f5f9464ba",
        "heaps-0.4-9a77df4e3db3d50a3637137af4f3f2c10095c04ac23988b3e9c72116053f5c6b",
        "js-dgtable-0.5.2-094ee8872eb10913dc0a4350523def131afcebe1cf1a50cc5c29f687abc622c9",
        "js-flot-0.8.3-fbfb60e628ed902edbd1d03606b546b320963590fbaf653dbe7b3df0086c4c2c",
        "js-jquery-3.3.1-0dd26cbd63adfa57d02a6ab830dac2a6776b4c32af37950f31f0810ef850e5ab",
-        "primitive-0.8.0.0-f79704e7716577e1d850dc83b85c45fffaf9b8d97e33765a9b48422ef722b59c",
+        "primitive-0.9.0.0-955baeb9ba6b1726431ce5abcb7776fe5bea7c360bc4a3dfa451cc53794b341d",
        "process-1.6.17.0",
-        "random-1.2.1.1-c5b3207fbe695f5806048cee1ee6d4a48d33056bf1f3cfbd9ee1e189e1f5d1cd",
+        "random-1.2.1.2-cae8192abe0eb7724ebd1cbf9b7ddcdfb823ea9a67fd8ae67b533f90c20fe357",
        "time-1.12.2",
        "transformers-0.5.6.2",
        "unix-2.7.3",
-        "unordered-containers-0.2.19.1-c6665f9d916cddd05a2de2c8fe0dadad9fd40ede0c09b24ed840a3ee3ec5ede3",
+        "unordered-containers-0.2.20-286f5ea6893f782236091cbd1bd855143a11a659ccf6f627c7558aa27d1148ac",
        "utf8-string-1.0.2-345983e5c7a6c6cf03fc29fd6e582ef4fae34f87a1835d6facaefcb954a9cb22"
      ],
      "exe-depends": [],
      "flags": {
        "cloud": false,
        "embed-files": false,
-        "portable": false
+        "portable": false,
+        "threaded": true
      },
-      "id": "shake-0.19.7-938ea8cf1fb7589877af9e00a2bbcd11c75cd7fe9718d1751775500649b4b83a",
-      "pkg-cabal-sha256": "3cb5814cce210b9756fa9246ff1b2a1e1b86be46fdc4c5e2baacdc5bf83ce5c3",
+      "id": "shake-0.19.8-223ee72925ce7385eb8692d925d80da9172c95749add2ab0106f4a5b291112ac",
+      "pkg-cabal-sha256": "03c8f06de478e07ad6fde95984c9206920106d0d8432ecb7ab825ef108d45382",
      "pkg-name": "shake",
      "pkg-src": {
        "repo": {
@@ -667,13 +708,13 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "352a56af12f70b50d564dcb61131555577281957ee196f1702a3723c0a3699d1",
-      "pkg-version": "0.19.7",
+      "pkg-src-sha256": "6384e33a26a2590bf33719e88881076b899ac4b5340c1c9271e4caa37e9d6535",
+      "pkg-version": "0.19.8",
      "style": "global",
      "type": "configured"
    },
    {
-      "bin-file": "/home/matt/.cabal/store/ghc-9.4.7/shake-0.19.7-e-shake-088ed1b3b86ca946c69aaf81786f0ef4b9e993f89ddbb5acb5db5adf2b149d74/bin/shake",
+      "bin-file": "/home/matt/.cabal/store/ghc-9.4.7/shake-0.19.8-e-shake-a81f809177ed3e987f37e2f3451c999ba4e661555a5f8da4ee8a428546cf70a9/bin/shake",
      "component-name": "exe:shake",
      "depends": [
        "base-4.17.2.0",
@@ -681,31 +722,32 @@
        "bytestring-0.11.5.2",
        "deepseq-1.4.8.0",
        "directory-1.3.7.1",
-        "extra-1.7.14-59b3f2752295e793a44fa1fdbe69fca48d09bfa6752b6bfcbd4043c8148cc0df",
+        "extra-1.7.16-22e6cc86ad3929d61077cc506e1b4b0f3a99fd5acdd36721944fff3e56a4e1a0",
        "filepath-1.4.2.2",
-        "filepattern-0.1.3-e0add0a51576a4d24b811936ed0c164dcb466e36caf717663c4028fb9ee120d3",
-        "hashable-1.4.3.0-09db42c6b0189f566008419f8ab4ec6f02acb8e5443c9bc3c0160f1119d12a04",
+        "filepattern-0.1.3-8b08f7c3040a582e9a0a980df2161623fd09aa87bdb2199b59b8148cef62b14b",
+        "hashable-1.4.4.0-1792dfe802a31c23eb0fe9c50ba3f713348d3d06ba7c8d78aa72345f5f9464ba",
        "heaps-0.4-9a77df4e3db3d50a3637137af4f3f2c10095c04ac23988b3e9c72116053f5c6b",
        "js-dgtable-0.5.2-094ee8872eb10913dc0a4350523def131afcebe1cf1a50cc5c29f687abc622c9",
        "js-flot-0.8.3-fbfb60e628ed902edbd1d03606b546b320963590fbaf653dbe7b3df0086c4c2c",
        "js-jquery-3.3.1-0dd26cbd63adfa57d02a6ab830dac2a6776b4c32af37950f31f0810ef850e5ab",
-        "primitive-0.8.0.0-f79704e7716577e1d850dc83b85c45fffaf9b8d97e33765a9b48422ef722b59c",
+        "primitive-0.9.0.0-955baeb9ba6b1726431ce5abcb7776fe5bea7c360bc4a3dfa451cc53794b341d",
        "process-1.6.17.0",
-        "random-1.2.1.1-c5b3207fbe695f5806048cee1ee6d4a48d33056bf1f3cfbd9ee1e189e1f5d1cd",
+        "random-1.2.1.2-cae8192abe0eb7724ebd1cbf9b7ddcdfb823ea9a67fd8ae67b533f90c20fe357",
        "time-1.12.2",
        "transformers-0.5.6.2",
        "unix-2.7.3",
-        "unordered-containers-0.2.19.1-c6665f9d916cddd05a2de2c8fe0dadad9fd40ede0c09b24ed840a3ee3ec5ede3",
+        "unordered-containers-0.2.20-286f5ea6893f782236091cbd1bd855143a11a659ccf6f627c7558aa27d1148ac",
        "utf8-string-1.0.2-345983e5c7a6c6cf03fc29fd6e582ef4fae34f87a1835d6facaefcb954a9cb22"
      ],
      "exe-depends": [],
      "flags": {
        "cloud": false,
        "embed-files": false,
-        "portable": false
+        "portable": false,
+        "threaded": true
      },
-      "id": "shake-0.19.7-e-shake-088ed1b3b86ca946c69aaf81786f0ef4b9e993f89ddbb5acb5db5adf2b149d74",
-      "pkg-cabal-sha256": "3cb5814cce210b9756fa9246ff1b2a1e1b86be46fdc4c5e2baacdc5bf83ce5c3",
+      "id": "shake-0.19.8-e-shake-a81f809177ed3e987f37e2f3451c999ba4e661555a5f8da4ee8a428546cf70a9",
+      "pkg-cabal-sha256": "03c8f06de478e07ad6fde95984c9206920106d0d8432ecb7ab825ef108d45382",
      "pkg-name": "shake",
      "pkg-src": {
        "repo": {
@@ -714,8 +756,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "352a56af12f70b50d564dcb61131555577281957ee196f1702a3723c0a3699d1",
-      "pkg-version": "0.19.7",
+      "pkg-src-sha256": "6384e33a26a2590bf33719e88881076b899ac4b5340c1c9271e4caa37e9d6535",
+      "pkg-version": "0.19.8",
      "style": "global",
      "type": "configured"
    },
@@ -730,7 +772,7 @@
        "optimised-mixer": false
      },
      "id": "splitmix-0.1.0.5-3cd93c70424e356aa6efba51d5e2e77a195c7d16ddb59768fbd0ccfda8fe1cb3",
-      "pkg-cabal-sha256": "bac0ae8d46a04e410666b0c8081cff63f060f29157983b569ca86ddb6e6e0dc6",
+      "pkg-cabal-sha256": "caa9b4a92abf1496c7f6a3c0f4e357426a54880077cb9f04e260a8bfa034b77b",
      "pkg-name": "splitmix",
      "pkg-src": {
        "repo": {
@@ -744,6 +786,16 @@
      "style": "global",
      "type": "configured"
    },
+    {
+      "depends": [
+        "array-0.5.4.0",
+        "base-4.17.2.0"
+      ],
+      "id": "stm-2.5.1.0",
+      "pkg-name": "stm",
+      "pkg-version": "2.5.1.0",
+      "type": "pre-existing"
+    },
    {
      "depends": [
        "base-4.17.2.0",
@@ -806,15 +858,15 @@
      "depends": [
        "base-4.17.2.0",
        "deepseq-1.4.8.0",
-        "hashable-1.4.3.0-09db42c6b0189f566008419f8ab4ec6f02acb8e5443c9bc3c0160f1119d12a04",
+        "hashable-1.4.4.0-1792dfe802a31c23eb0fe9c50ba3f713348d3d06ba7c8d78aa72345f5f9464ba",
        "template-haskell-2.19.0.0"
      ],
      "exe-depends": [],
      "flags": {
        "debug": false
      },
-      "id": "unordered-containers-0.2.19.1-c6665f9d916cddd05a2de2c8fe0dadad9fd40ede0c09b24ed840a3ee3ec5ede3",
-      "pkg-cabal-sha256": "9ad8972c2e913c37b1d4f0e1261517fd7a1b8c8a58077e057be69837e3dbaa00",
+      "id": "unordered-containers-0.2.20-286f5ea6893f782236091cbd1bd855143a11a659ccf6f627c7558aa27d1148ac",
+      "pkg-cabal-sha256": "746c32b23f93cb13e52309e54e82d69e4315105f9815b1fcac25a57071505cff",
      "pkg-name": "unordered-containers",
      "pkg-src": {
        "repo": {
@@ -823,8 +875,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "1b27bec5e0d522b27a6029ebf4c4a6d40acbc083c787008e32fb55c4b1d128d2",
-      "pkg-version": "0.2.19.1",
+      "pkg-src-sha256": "d9cfb287cf00592d39dc9c3cac8b99627ea08f2c01798e70130fc39f7c90f11d",
+      "pkg-version": "0.2.20",
      "style": "global",
      "type": "configured"
    },

--- a/hadrian/bootstrap/plan-9_4_8.json
+++ b/hadrian/bootstrap/plan-9_4_8.json
 {
  "arch": "x86_64",
-  "cabal-lib-version": "3.10.1.0",
-  "cabal-version": "3.10.1.0",
+  "cabal-lib-version": "3.10.2.1",
+  "cabal-version": "3.10.2.1",
  "compiler-id": "ghc-9.4.8",
  "install-plan": [
    {
      "component-name": "lib",
      "depends": [
-        "Cabal-syntax-3.10.1.0-81b1b0e8f7b55799610ecc7867a546badf40659af5ec0aacceb78c5a3594673e",
+        "Cabal-syntax-3.10.3.0-30d88750a44398dd7897739f69303c61694d1bfd1e2fad25bb33080c3c2dd7a9",
        "array-0.5.4.0",
        "base-4.17.2.1",
        "bytestring-0.11.5.3",
@@ -26,8 +26,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "Cabal-3.10.1.0-d383425a07169f419ec10bb55dd0d2b519a23497b00385e0be6c08fdaf284156",
-      "pkg-cabal-sha256": "6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94",
+      "id": "Cabal-3.10.3.0-e8afc9b49f1f1feba6da989728784bc2dcbe7fcb4824e7fc0d69ee31e454a3b1",
+      "pkg-cabal-sha256": "4a36954a66769eef90353daa0dbb07d43e49c228281383c7e4134445d495f714",
      "pkg-name": "Cabal",
      "pkg-src": {
        "repo": {
@@ -36,8 +36,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "0bdbab8e4c3178016fb0f070d8b62bc3067f93afabfbd3aa17c8065d0ecc98ee",
-      "pkg-version": "3.10.1.0",
+      "pkg-src-sha256": "cb7f7c66626d7555f799e786513ddd65a874fd23f1cf312990c7a48abfc0b2c6",
+      "pkg-version": "3.10.3.0",
      "style": "global",
      "type": "configured"
    },
@@ -62,8 +62,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "Cabal-syntax-3.10.1.0-81b1b0e8f7b55799610ecc7867a546badf40659af5ec0aacceb78c5a3594673e",
-      "pkg-cabal-sha256": "bb835ebab577fd0f9c11dab96210dbb8d68ffc62652576f4b092563c345930e7",
+      "id": "Cabal-syntax-3.10.3.0-30d88750a44398dd7897739f69303c61694d1bfd1e2fad25bb33080c3c2dd7a9",
+      "pkg-cabal-sha256": "c2ca36499bf9365726968b1e11a757e6d846c47cdf0c2c26a003698fd3c300fe",
      "pkg-name": "Cabal-syntax",
      "pkg-src": {
        "repo": {
@@ -72,8 +72,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "3b80092355327768a0de8298ac50ee906b7e82462e2ba14542730573b453f522",
-      "pkg-version": "3.10.1.0",
+      "pkg-src-sha256": "75d6a0aa9c00990a0d6e7720ac50c6954f6c942fa1be42c8add7f1c025f7e212",
+      "pkg-version": "3.10.3.0",
      "style": "global",
      "type": "configured"
    },
@@ -192,7 +192,7 @@
        "use-cbits": true
      },
      "id": "cryptohash-sha256-0.11.102.1-60c69aa09dc71567a4b7e55b00108314613d5a12677eed7d6a1204e911db0bf2",
-      "pkg-cabal-sha256": "03db065161987f614a3a2bbcd16264f78e47efe231fb5bd161be2043eaf20488",
+      "pkg-cabal-sha256": "200d756a7b3bab7ca2bac6eb50ed8252f26de77ac8def490a3ad743f2933acbd",
      "pkg-name": "cryptohash-sha256",
      "pkg-src": {
        "repo": {
@@ -229,6 +229,19 @@
      "pkg-version": "1.3.7.1",
      "type": "pre-existing"
    },
+    {
+      "depends": [
+        "base-4.17.2.1",
+        "mtl-2.2.2",
+        "stm-2.5.1.0",
+        "template-haskell-2.19.0.0",
+        "transformers-0.5.6.2"
+      ],
+      "id": "exceptions-0.10.5",
+      "pkg-name": "exceptions",
+      "pkg-version": "0.10.5",
+      "type": "pre-existing"
+    },
    {
      "component-name": "lib",
      "depends": [
@@ -242,8 +255,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "extra-1.7.14-277ea629764fe5b61f35385e3c7dd656b2d0b0c846b2f8fd83eb9e1e7ea98212",
-      "pkg-cabal-sha256": "e3d3ce1dc7746b1132930e48c59fb5e8c51a09e92e0c031316be031067a273fb",
+      "id": "extra-1.7.16-a7de3c8424ee4b599df7a290c09d4287999a151c797ed991a2c8ce9d1a35e63e",
+      "pkg-cabal-sha256": "edd191f77adf31acb1b53960b4d1ca9fca925ac28345a396c614414cb7bfa7ec",
      "pkg-name": "extra",
      "pkg-src": {
        "repo": {
@@ -252,8 +265,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "b6a909f8f0e4b8076a1653b4d34815a782f0a8c1e83d5267f4d00496471ef567",
-      "pkg-version": "1.7.14",
+      "pkg-src-sha256": "250c6d43c30b2c71f2cf498a10e69e43ac035974d3819529385d99e42ce77c70",
+      "pkg-version": "1.7.16",
      "style": "global",
      "type": "configured"
    },
@@ -271,12 +284,12 @@
      "depends": [
        "base-4.17.2.1",
        "directory-1.3.7.1",
-        "extra-1.7.14-277ea629764fe5b61f35385e3c7dd656b2d0b0c846b2f8fd83eb9e1e7ea98212",
+        "extra-1.7.16-a7de3c8424ee4b599df7a290c09d4287999a151c797ed991a2c8ce9d1a35e63e",
        "filepath-1.4.2.2"
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "filepattern-0.1.3-5bb20b6a832166542fe4dae5acdb8554853d0fd4f9e07df61fe58ef9e9b5e940",
+      "id": "filepattern-0.1.3-11fb5032522670b002a127cd7b8a32635c8dd0671d39505c0a17197b26d969ea",
      "pkg-cabal-sha256": "372c1733d83b90045eb29da9f010fed79bfef8771ce65eb126a1d83ecc54a9a2",
      "pkg-name": "filepattern",
      "pkg-src": {
@@ -310,18 +323,18 @@
      "type": "pre-existing"
    },
    {
-      "build-info": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.8/ghc-platform-0.1.0.0/build-info.json",
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.8/ghc-platform-0.1.0.0/build-info.json",
      "component-name": "lib",
      "depends": [
        "base-4.17.2.1"
      ],
-      "dist-dir": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.8/ghc-platform-0.1.0.0",
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.8/ghc-platform-0.1.0.0",
      "exe-depends": [],
      "flags": {},
      "id": "ghc-platform-0.1.0.0-inplace",
      "pkg-name": "ghc-platform",
      "pkg-src": {
-        "path": "/home/matt/ghc-scratch/hadrian/../libraries/ghc-platform",
+        "path": "/home/matt/ghc-llvm/hadrian/../libraries/ghc-platform",
        "type": "local"
      },
      "pkg-version": "0.1.0.0",
@@ -338,7 +351,7 @@
      "type": "pre-existing"
    },
    {
-      "build-info": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.8/ghc-toolchain-0.1.0.0/build-info.json",
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.8/ghc-toolchain-0.1.0.0/build-info.json",
      "component-name": "lib",
      "depends": [
        "base-4.17.2.1",
@@ -349,13 +362,13 @@
        "text-2.0.2",
        "transformers-0.5.6.2"
      ],
-      "dist-dir": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.8/ghc-toolchain-0.1.0.0",
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.8/ghc-toolchain-0.1.0.0",
      "exe-depends": [],
      "flags": {},
      "id": "ghc-toolchain-0.1.0.0-inplace",
      "pkg-name": "ghc-toolchain",
      "pkg-src": {
-        "path": "/home/matt/ghc-scratch/hadrian/../utils/ghc-toolchain",
+        "path": "/home/matt/ghc-llvm/hadrian/../utils/ghc-toolchain",
        "type": "local"
      },
      "pkg-version": "0.1.0.0",
@@ -363,30 +376,30 @@
      "type": "configured"
    },
    {
-      "bin-file": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.8/hadrian-0.1.0.0/x/hadrian/build/hadrian/hadrian",
-      "build-info": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.8/hadrian-0.1.0.0/x/hadrian/build-info.json",
+      "bin-file": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.8/hadrian-0.1.0.0/x/hadrian/build/hadrian/hadrian",
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.8/hadrian-0.1.0.0/x/hadrian/build-info.json",
      "component-name": "exe:hadrian",
      "depends": [
-        "Cabal-3.10.1.0-d383425a07169f419ec10bb55dd0d2b519a23497b00385e0be6c08fdaf284156",
+        "Cabal-3.10.3.0-e8afc9b49f1f1feba6da989728784bc2dcbe7fcb4824e7fc0d69ee31e454a3b1",
        "base-4.17.2.1",
        "base16-bytestring-1.0.2.0-019adb035342f14dd95001668a17141dbdeec27e6b3beccd7dbd15d5ece28f6d",
        "bytestring-0.11.5.3",
        "containers-0.6.7",
        "cryptohash-sha256-0.11.102.1-60c69aa09dc71567a4b7e55b00108314613d5a12677eed7d6a1204e911db0bf2",
        "directory-1.3.7.1",
-        "extra-1.7.14-277ea629764fe5b61f35385e3c7dd656b2d0b0c846b2f8fd83eb9e1e7ea98212",
+        "extra-1.7.16-a7de3c8424ee4b599df7a290c09d4287999a151c797ed991a2c8ce9d1a35e63e",
        "filepath-1.4.2.2",
        "ghc-platform-0.1.0.0-inplace",
        "ghc-toolchain-0.1.0.0-inplace",
        "mtl-2.2.2",
        "parsec-3.1.16.1",
-        "shake-0.19.7-c7914205288dd543350597e121b861263cd9f63f4a8d69128fe4f482c907dc13",
+        "shake-0.19.8-347e1d8af888151df63fdf8c99e8a0198f66315535d79c50c502eee5072c8f6b",
        "text-2.0.2",
        "time-1.12.2",
        "transformers-0.5.6.2",
-        "unordered-containers-0.2.19.1-977d03ad1b454d1be6af4ce24ac0549a08671eb37552f5a66d4e6ff95cbbb946"
+        "unordered-containers-0.2.20-72e032adf8678b1696c604df1b0cbabe8b8fbf073ab4b899b18e1cbaa65d93b4"
      ],
-      "dist-dir": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.8/hadrian-0.1.0.0/x/hadrian",
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.8/hadrian-0.1.0.0/x/hadrian",
      "exe-depends": [],
      "flags": {
        "selftest": false,
@@ -395,7 +408,7 @@
      "id": "hadrian-0.1.0.0-inplace-hadrian",
      "pkg-name": "hadrian",
      "pkg-src": {
-        "path": "/home/matt/ghc-scratch/hadrian/.",
+        "path": "/home/matt/ghc-llvm/hadrian/.",
        "type": "local"
      },
      "pkg-version": "0.1.0.0",
@@ -412,6 +425,7 @@
        "filepath-1.4.2.2",
        "ghc-bignum-1.3",
        "ghc-prim-0.9.1",
+        "os-string-2.0.2.2-7b085e3fae707ddd7dfcd15f5f25d5197429ca1e1b0d4e82ca97d6c49df32300",
        "text-2.0.2"
      ],
      "exe-depends": [],
@@ -419,8 +433,8 @@
        "integer-gmp": true,
        "random-initial-seed": false
      },
-      "id": "hashable-1.4.3.0-17e444c563ff4b70db126c748feb1434f2ffcb4a5a75972bb3989d5d1127a2eb",
-      "pkg-cabal-sha256": "f3bf68acfa0df7a064a378ef2cdcfeb55e6fb96100675f4c593556dcbf3d7194",
+      "id": "hashable-1.4.4.0-5e291620fcb7c423d82932a9438c4ca1ff2fdd907cd24dfd3fbfa551f03c2b7d",
+      "pkg-cabal-sha256": "ae22238274c572aa91e90c6c353e7206386708912ac5e6dc40ac61d1dcc553db",
      "pkg-name": "hashable",
      "pkg-src": {
        "repo": {
@@ -429,8 +443,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "32efb16c2891786209b7cbe5c39df9b3a9ae51e836f1a54f646bc4602b7ab0f5",
-      "pkg-version": "1.4.3.0",
+      "pkg-src-sha256": "1fa3d64548440942b2b38b99c76d8dcaa94fa2ea3912cd7a6354ea4ec4af4758",
+      "pkg-version": "1.4.4.0",
      "style": "global",
      "type": "configured"
    },
@@ -532,6 +546,32 @@
      "pkg-version": "2.2.2",
      "type": "pre-existing"
    },
+    {
+      "component-name": "lib",
+      "depends": [
+        "base-4.17.2.1",
+        "bytestring-0.11.5.3",
+        "deepseq-1.4.8.0",
+        "exceptions-0.10.5",
+        "template-haskell-2.19.0.0"
+      ],
+      "exe-depends": [],
+      "flags": {},
+      "id": "os-string-2.0.2.2-7b085e3fae707ddd7dfcd15f5f25d5197429ca1e1b0d4e82ca97d6c49df32300",
+      "pkg-cabal-sha256": "704ea0b499f9d4e43c98fd11e2fcf6b8762a1daa91114aa195966ebcc76a8d51",
+      "pkg-name": "os-string",
+      "pkg-src": {
+        "repo": {
+          "type": "secure-repo",
+          "uri": "http://hackage.haskell.org/"
+        },
+        "type": "repo-tar"
+      },
+      "pkg-src-sha256": "3fcc0d7657207d5ee45ce8994a74c5baa2f1149bbd28b3b75e2f646ed4a7251c",
+      "pkg-version": "2.0.2.2",
+      "style": "global",
+      "type": "configured"
+    },
    {
      "depends": [
        "base-4.17.2.1",
@@ -565,8 +605,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "primitive-0.8.0.0-c3a3185e94788958cb8c60f93dde7f829722178c540726717d07ac133663778b",
-      "pkg-cabal-sha256": "d0ff45fa6e61f92af23611ceb8b9a6a04c236b50fb70c60e2ed3bfa532703670",
+      "id": "primitive-0.9.0.0-3e57c2c93f70357b89abd279bf9c6450eaff9186af8f8764d85558b00b77fd29",
+      "pkg-cabal-sha256": "2e08c5409e3559c7f1669ef50e9a0d9a397e68ecf51110d5e2cedf05cdd7d93c",
      "pkg-name": "primitive",
      "pkg-src": {
        "repo": {
@@ -575,8 +615,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "5553c21b4a789f9b591eed69e598cc58484c274af29250e517b5a8bcc62b995f",
-      "pkg-version": "0.8.0.0",
+      "pkg-src-sha256": "696d4bd291c94d736142d6182117dca4258d3ef28bfefdb649ac8b5ecd0999c7",
+      "pkg-version": "0.9.0.0",
      "style": "global",
      "type": "configured"
    },
@@ -604,8 +644,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "random-1.2.1.1-00adfa432487dba4e3516164571efc915a8885a84ac308c859246271afac2a7e",
-      "pkg-cabal-sha256": "e7c1f881159d5cc788619c9ee8b8f340ba2ff0db571cdf3d1a1968ebc5108789",
+      "id": "random-1.2.1.2-b400976fe9b5de2c0b9ce1b58ddbb6eac6e4c3a7fa681744d604cb032214e84c",
+      "pkg-cabal-sha256": "32397de181e20ccaacf806ec70de9308cf044f089a2be37c936f3f8967bde867",
      "pkg-name": "random",
      "pkg-src": {
        "repo": {
@@ -614,8 +654,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "3e1272f7ed6a4d7bd1712b90143ec326fee9b225789222379fea20a9c90c9b76",
-      "pkg-version": "1.2.1.1",
+      "pkg-src-sha256": "790f4dc2d2327c453ff6aac7bf15399fd123d55e927935f68f84b5df42d9a4b4",
+      "pkg-version": "1.2.1.2",
      "style": "global",
      "type": "configured"
    },
@@ -634,31 +674,32 @@
        "bytestring-0.11.5.3",
        "deepseq-1.4.8.0",
        "directory-1.3.7.1",
-        "extra-1.7.14-277ea629764fe5b61f35385e3c7dd656b2d0b0c846b2f8fd83eb9e1e7ea98212",
+        "extra-1.7.16-a7de3c8424ee4b599df7a290c09d4287999a151c797ed991a2c8ce9d1a35e63e",
        "filepath-1.4.2.2",
-        "filepattern-0.1.3-5bb20b6a832166542fe4dae5acdb8554853d0fd4f9e07df61fe58ef9e9b5e940",
-        "hashable-1.4.3.0-17e444c563ff4b70db126c748feb1434f2ffcb4a5a75972bb3989d5d1127a2eb",
+        "filepattern-0.1.3-11fb5032522670b002a127cd7b8a32635c8dd0671d39505c0a17197b26d969ea",
+        "hashable-1.4.4.0-5e291620fcb7c423d82932a9438c4ca1ff2fdd907cd24dfd3fbfa551f03c2b7d",
        "heaps-0.4-89b4eb9c8e9a823e8d31997ee5a27e4d5008cd10f0002ea97431730441e3caa3",
        "js-dgtable-0.5.2-625a3f0542ba7f6616fd8d19a3e78b88e547e12fcf87d923d01613098cc46a93",
        "js-flot-0.8.3-b24a1ee350d617048e5766723f13a1e768f084e7a2148ea1f3e874fe8f662543",
        "js-jquery-3.3.1-cfdf98fdfcd25e4c3124cacb3e0c449741427ed1fcd0e0abaf38ea6de8e0b8f2",
-        "primitive-0.8.0.0-c3a3185e94788958cb8c60f93dde7f829722178c540726717d07ac133663778b",
+        "primitive-0.9.0.0-3e57c2c93f70357b89abd279bf9c6450eaff9186af8f8764d85558b00b77fd29",
        "process-1.6.18.0",
-        "random-1.2.1.1-00adfa432487dba4e3516164571efc915a8885a84ac308c859246271afac2a7e",
+        "random-1.2.1.2-b400976fe9b5de2c0b9ce1b58ddbb6eac6e4c3a7fa681744d604cb032214e84c",
        "time-1.12.2",
        "transformers-0.5.6.2",
        "unix-2.7.3",
-        "unordered-containers-0.2.19.1-977d03ad1b454d1be6af4ce24ac0549a08671eb37552f5a66d4e6ff95cbbb946",
+        "unordered-containers-0.2.20-72e032adf8678b1696c604df1b0cbabe8b8fbf073ab4b899b18e1cbaa65d93b4",
        "utf8-string-1.0.2-8bab835257b271ee29ae248b2151e3cd3b4c78d619915e33e5618c645ed84fa1"
      ],
      "exe-depends": [],
      "flags": {
        "cloud": false,
        "embed-files": false,
-        "portable": false
+        "portable": false,
+        "threaded": true
      },
-      "id": "shake-0.19.7-c7914205288dd543350597e121b861263cd9f63f4a8d69128fe4f482c907dc13",
-      "pkg-cabal-sha256": "3cb5814cce210b9756fa9246ff1b2a1e1b86be46fdc4c5e2baacdc5bf83ce5c3",
+      "id": "shake-0.19.8-347e1d8af888151df63fdf8c99e8a0198f66315535d79c50c502eee5072c8f6b",
+      "pkg-cabal-sha256": "03c8f06de478e07ad6fde95984c9206920106d0d8432ecb7ab825ef108d45382",
      "pkg-name": "shake",
      "pkg-src": {
        "repo": {
@@ -667,13 +708,13 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "352a56af12f70b50d564dcb61131555577281957ee196f1702a3723c0a3699d1",
-      "pkg-version": "0.19.7",
+      "pkg-src-sha256": "6384e33a26a2590bf33719e88881076b899ac4b5340c1c9271e4caa37e9d6535",
+      "pkg-version": "0.19.8",
      "style": "global",
      "type": "configured"
    },
    {
-      "bin-file": "/home/matt/.cabal/store/ghc-9.4.8/shake-0.19.7-e-shake-1cafafc024ca2744776abe9813086d21edd44ca21f47c1f1dc4352a783208de9/bin/shake",
+      "bin-file": "/home/matt/.cabal/store/ghc-9.4.8/shake-0.19.8-e-shake-9ef41f05ed495bfcc7aed102e683223c4ebefe159760d6e7943ed2d23b8b9765/bin/shake",
      "component-name": "exe:shake",
      "depends": [
        "base-4.17.2.1",
@@ -681,31 +722,32 @@
        "bytestring-0.11.5.3",
        "deepseq-1.4.8.0",
        "directory-1.3.7.1",
-        "extra-1.7.14-277ea629764fe5b61f35385e3c7dd656b2d0b0c846b2f8fd83eb9e1e7ea98212",
+        "extra-1.7.16-a7de3c8424ee4b599df7a290c09d4287999a151c797ed991a2c8ce9d1a35e63e",
        "filepath-1.4.2.2",
-        "filepattern-0.1.3-5bb20b6a832166542fe4dae5acdb8554853d0fd4f9e07df61fe58ef9e9b5e940",
-        "hashable-1.4.3.0-17e444c563ff4b70db126c748feb1434f2ffcb4a5a75972bb3989d5d1127a2eb",
+        "filepattern-0.1.3-11fb5032522670b002a127cd7b8a32635c8dd0671d39505c0a17197b26d969ea",
+        "hashable-1.4.4.0-5e291620fcb7c423d82932a9438c4ca1ff2fdd907cd24dfd3fbfa551f03c2b7d",
        "heaps-0.4-89b4eb9c8e9a823e8d31997ee5a27e4d5008cd10f0002ea97431730441e3caa3",
        "js-dgtable-0.5.2-625a3f0542ba7f6616fd8d19a3e78b88e547e12fcf87d923d01613098cc46a93",
        "js-flot-0.8.3-b24a1ee350d617048e5766723f13a1e768f084e7a2148ea1f3e874fe8f662543",
        "js-jquery-3.3.1-cfdf98fdfcd25e4c3124cacb3e0c449741427ed1fcd0e0abaf38ea6de8e0b8f2",
-        "primitive-0.8.0.0-c3a3185e94788958cb8c60f93dde7f829722178c540726717d07ac133663778b",
+        "primitive-0.9.0.0-3e57c2c93f70357b89abd279bf9c6450eaff9186af8f8764d85558b00b77fd29",
        "process-1.6.18.0",
-        "random-1.2.1.1-00adfa432487dba4e3516164571efc915a8885a84ac308c859246271afac2a7e",
+        "random-1.2.1.2-b400976fe9b5de2c0b9ce1b58ddbb6eac6e4c3a7fa681744d604cb032214e84c",
        "time-1.12.2",
        "transformers-0.5.6.2",
        "unix-2.7.3",
-        "unordered-containers-0.2.19.1-977d03ad1b454d1be6af4ce24ac0549a08671eb37552f5a66d4e6ff95cbbb946",
+        "unordered-containers-0.2.20-72e032adf8678b1696c604df1b0cbabe8b8fbf073ab4b899b18e1cbaa65d93b4",
        "utf8-string-1.0.2-8bab835257b271ee29ae248b2151e3cd3b4c78d619915e33e5618c645ed84fa1"
      ],
      "exe-depends": [],
      "flags": {
        "cloud": false,
        "embed-files": false,
-        "portable": false
+        "portable": false,
+        "threaded": true
      },
-      "id": "shake-0.19.7-e-shake-1cafafc024ca2744776abe9813086d21edd44ca21f47c1f1dc4352a783208de9",
-      "pkg-cabal-sha256": "3cb5814cce210b9756fa9246ff1b2a1e1b86be46fdc4c5e2baacdc5bf83ce5c3",
+      "id": "shake-0.19.8-e-shake-9ef41f05ed495bfcc7aed102e683223c4ebefe159760d6e7943ed2d23b8b9765",
+      "pkg-cabal-sha256": "03c8f06de478e07ad6fde95984c9206920106d0d8432ecb7ab825ef108d45382",
      "pkg-name": "shake",
      "pkg-src": {
        "repo": {
@@ -714,8 +756,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "352a56af12f70b50d564dcb61131555577281957ee196f1702a3723c0a3699d1",
-      "pkg-version": "0.19.7",
+      "pkg-src-sha256": "6384e33a26a2590bf33719e88881076b899ac4b5340c1c9271e4caa37e9d6535",
+      "pkg-version": "0.19.8",
      "style": "global",
      "type": "configured"
    },
@@ -730,7 +772,7 @@
        "optimised-mixer": false
      },
      "id": "splitmix-0.1.0.5-f775e7f34c90b18b36f27036f02a3db4cf34dc406e70d053789cafaad91ec3d3",
-      "pkg-cabal-sha256": "bac0ae8d46a04e410666b0c8081cff63f060f29157983b569ca86ddb6e6e0dc6",
+      "pkg-cabal-sha256": "caa9b4a92abf1496c7f6a3c0f4e357426a54880077cb9f04e260a8bfa034b77b",
      "pkg-name": "splitmix",
      "pkg-src": {
        "repo": {
@@ -744,6 +786,16 @@
      "style": "global",
      "type": "configured"
    },
+    {
+      "depends": [
+        "array-0.5.4.0",
+        "base-4.17.2.1"
+      ],
+      "id": "stm-2.5.1.0",
+      "pkg-name": "stm",
+      "pkg-version": "2.5.1.0",
+      "type": "pre-existing"
+    },
    {
      "depends": [
        "base-4.17.2.1",
@@ -806,15 +858,15 @@
      "depends": [
        "base-4.17.2.1",
        "deepseq-1.4.8.0",
-        "hashable-1.4.3.0-17e444c563ff4b70db126c748feb1434f2ffcb4a5a75972bb3989d5d1127a2eb",
+        "hashable-1.4.4.0-5e291620fcb7c423d82932a9438c4ca1ff2fdd907cd24dfd3fbfa551f03c2b7d",
        "template-haskell-2.19.0.0"
      ],
      "exe-depends": [],
      "flags": {
        "debug": false
      },
-      "id": "unordered-containers-0.2.19.1-977d03ad1b454d1be6af4ce24ac0549a08671eb37552f5a66d4e6ff95cbbb946",
-      "pkg-cabal-sha256": "9ad8972c2e913c37b1d4f0e1261517fd7a1b8c8a58077e057be69837e3dbaa00",
+      "id": "unordered-containers-0.2.20-72e032adf8678b1696c604df1b0cbabe8b8fbf073ab4b899b18e1cbaa65d93b4",
+      "pkg-cabal-sha256": "746c32b23f93cb13e52309e54e82d69e4315105f9815b1fcac25a57071505cff",
      "pkg-name": "unordered-containers",
      "pkg-src": {
        "repo": {
@@ -823,8 +875,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "1b27bec5e0d522b27a6029ebf4c4a6d40acbc083c787008e32fb55c4b1d128d2",
-      "pkg-version": "0.2.19.1",
+      "pkg-src-sha256": "d9cfb287cf00592d39dc9c3cac8b99627ea08f2c01798e70130fc39f7c90f11d",
+      "pkg-version": "0.2.20",
      "style": "global",
      "type": "configured"
    },

--- a/hadrian/bootstrap/plan-9_6_1.json
+++ b/hadrian/bootstrap/plan-9_6_1.json
 {
  "arch": "x86_64",
-  "cabal-lib-version": "3.10.1.0",
-  "cabal-version": "3.10.1.0",
+  "cabal-lib-version": "3.10.2.1",
+  "cabal-version": "3.10.2.1",
  "compiler-id": "ghc-9.6.1",
  "install-plan": [
    {
@@ -166,7 +166,7 @@
        "use-cbits": true
      },
      "id": "cryptohash-sha256-0.11.102.1-9d310921383dbec51b2f6fa686c9d99cfd3bb977a8eff016b53bb33c86c941e0",
-      "pkg-cabal-sha256": "03db065161987f614a3a2bbcd16264f78e47efe231fb5bd161be2043eaf20488",
+      "pkg-cabal-sha256": "200d756a7b3bab7ca2bac6eb50ed8252f26de77ac8def490a3ad743f2933acbd",
      "pkg-name": "cryptohash-sha256",
      "pkg-src": {
        "repo": {
@@ -229,8 +229,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "extra-1.7.14-1e4d753e3e2a6a6678a92d2f5e20632ba08c7fce2a76b57b3cdf948436f94baf",
-      "pkg-cabal-sha256": "e3d3ce1dc7746b1132930e48c59fb5e8c51a09e92e0c031316be031067a273fb",
+      "id": "extra-1.7.16-8af818d7b1052dbc43075b68911ac7c5c8e16ff5b40a0e284199219e3b576998",
+      "pkg-cabal-sha256": "edd191f77adf31acb1b53960b4d1ca9fca925ac28345a396c614414cb7bfa7ec",
      "pkg-name": "extra",
      "pkg-src": {
        "repo": {
@@ -239,8 +239,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "b6a909f8f0e4b8076a1653b4d34815a782f0a8c1e83d5267f4d00496471ef567",
-      "pkg-version": "1.7.14",
+      "pkg-src-sha256": "250c6d43c30b2c71f2cf498a10e69e43ac035974d3819529385d99e42ce77c70",
+      "pkg-version": "1.7.16",
      "style": "global",
      "type": "configured"
    },
@@ -262,12 +262,12 @@
      "depends": [
        "base-4.18.0.0",
        "directory-1.3.8.1",
-        "extra-1.7.14-1e4d753e3e2a6a6678a92d2f5e20632ba08c7fce2a76b57b3cdf948436f94baf",
+        "extra-1.7.16-8af818d7b1052dbc43075b68911ac7c5c8e16ff5b40a0e284199219e3b576998",
        "filepath-1.4.100.1"
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "filepattern-0.1.3-98137a12500a6ef2d4f8abc95ceae109795bd04281a1a080d2dc16589fe7ce12",
+      "id": "filepattern-0.1.3-c1a76347461ac708d05eb5e96075b9fe06240b794bc747f7992c6ebdd7146256",
      "pkg-cabal-sha256": "372c1733d83b90045eb29da9f010fed79bfef8771ce65eb126a1d83ecc54a9a2",
      "pkg-name": "filepattern",
      "pkg-src": {
@@ -301,18 +301,18 @@
      "type": "pre-existing"
    },
    {
-      "build-info": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.6.1/ghc-platform-0.1.0.0/build-info.json",
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.6.1/ghc-platform-0.1.0.0/build-info.json",
      "component-name": "lib",
      "depends": [
        "base-4.18.0.0"
      ],
-      "dist-dir": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.6.1/ghc-platform-0.1.0.0",
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.6.1/ghc-platform-0.1.0.0",
      "exe-depends": [],
      "flags": {},
      "id": "ghc-platform-0.1.0.0-inplace",
      "pkg-name": "ghc-platform",
      "pkg-src": {
-        "path": "/home/matt/ghc-scratch/hadrian/../libraries/ghc-platform",
+        "path": "/home/matt/ghc-llvm/hadrian/../libraries/ghc-platform",
        "type": "local"
      },
      "pkg-version": "0.1.0.0",
@@ -329,7 +329,7 @@
      "type": "pre-existing"
    },
    {
-      "build-info": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.6.1/ghc-toolchain-0.1.0.0/build-info.json",
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.6.1/ghc-toolchain-0.1.0.0/build-info.json",
      "component-name": "lib",
      "depends": [
        "base-4.18.0.0",
@@ -340,13 +340,13 @@
        "text-2.0.2",
        "transformers-0.6.1.0"
      ],
-      "dist-dir": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.6.1/ghc-toolchain-0.1.0.0",
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.6.1/ghc-toolchain-0.1.0.0",
      "exe-depends": [],
      "flags": {},
      "id": "ghc-toolchain-0.1.0.0-inplace",
      "pkg-name": "ghc-toolchain",
      "pkg-src": {
-        "path": "/home/matt/ghc-scratch/hadrian/../utils/ghc-toolchain",
+        "path": "/home/matt/ghc-llvm/hadrian/../utils/ghc-toolchain",
        "type": "local"
      },
      "pkg-version": "0.1.0.0",
@@ -354,8 +354,8 @@
      "type": "configured"
    },
    {
-      "bin-file": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.6.1/hadrian-0.1.0.0/x/hadrian/build/hadrian/hadrian",
-      "build-info": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.6.1/hadrian-0.1.0.0/x/hadrian/build-info.json",
+      "bin-file": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.6.1/hadrian-0.1.0.0/x/hadrian/build/hadrian/hadrian",
+      "build-info": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.6.1/hadrian-0.1.0.0/x/hadrian/build-info.json",
      "component-name": "exe:hadrian",
      "depends": [
        "Cabal-3.10.1.0",
@@ -365,19 +365,19 @@
        "containers-0.6.7",
        "cryptohash-sha256-0.11.102.1-9d310921383dbec51b2f6fa686c9d99cfd3bb977a8eff016b53bb33c86c941e0",
        "directory-1.3.8.1",
-        "extra-1.7.14-1e4d753e3e2a6a6678a92d2f5e20632ba08c7fce2a76b57b3cdf948436f94baf",
+        "extra-1.7.16-8af818d7b1052dbc43075b68911ac7c5c8e16ff5b40a0e284199219e3b576998",
        "filepath-1.4.100.1",
        "ghc-platform-0.1.0.0-inplace",
        "ghc-toolchain-0.1.0.0-inplace",
        "mtl-2.3.1",
        "parsec-3.1.16.1",
-        "shake-0.19.7-f622ff9a218d4e335264ef86e06a3002b88f0c61e8a964b3c1cba2569bf91ab9",
+        "shake-0.19.8-787778b4650ae6e487d7a35bca769dc0c49bd4db08e434162bd17cdfd1cefa7c",
        "text-2.0.2",
        "time-1.12.2",
        "transformers-0.6.1.0",
-        "unordered-containers-0.2.19.1-c2eca776baf4fc617346651ed0756aa01198f94ae1b6c3ec26d525fc4e2d0d0b"
+        "unordered-containers-0.2.20-077eefc60f1775d521b43e090236ccbdfd063e00ad29d5fda49ab1fb3abf1404"
      ],
-      "dist-dir": "/home/matt/ghc-scratch/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.6.1/hadrian-0.1.0.0/x/hadrian",
+      "dist-dir": "/home/matt/ghc-llvm/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.6.1/hadrian-0.1.0.0/x/hadrian",
      "exe-depends": [],
      "flags": {
        "selftest": false,
@@ -386,7 +386,7 @@
      "id": "hadrian-0.1.0.0-inplace-hadrian",
      "pkg-name": "hadrian",
      "pkg-src": {
-        "path": "/home/matt/ghc-scratch/hadrian/.",
+        "path": "/home/matt/ghc-llvm/hadrian/.",
        "type": "local"
      },
      "pkg-version": "0.1.0.0",
@@ -403,6 +403,7 @@
        "filepath-1.4.100.1",
        "ghc-bignum-1.3",
        "ghc-prim-0.10.0",
+        "os-string-2.0.2.2-43cc51146abd95ef66b49ad80000db666690bf9c40fa3f65719027c636758afa",
        "text-2.0.2"
      ],
      "exe-depends": [],
@@ -410,8 +411,8 @@
        "integer-gmp": true,
        "random-initial-seed": false
      },
-      "id": "hashable-1.4.3.0-fa09dc739bc3ac124d6fb0122e78a2d32fbce2118312a0ea3fbf79ec62fb1803",
-      "pkg-cabal-sha256": "f3bf68acfa0df7a064a378ef2cdcfeb55e6fb96100675f4c593556dcbf3d7194",
+      "id": "hashable-1.4.4.0-b4be4ab269e648fe6d65797701702780ae7b692e2ec9405cea0523ea7ab63dec",
+      "pkg-cabal-sha256": "ae22238274c572aa91e90c6c353e7206386708912ac5e6dc40ac61d1dcc553db",
      "pkg-name": "hashable",
      "pkg-src": {
        "repo": {
@@ -420,8 +421,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "32efb16c2891786209b7cbe5c39df9b3a9ae51e836f1a54f646bc4602b7ab0f5",
-      "pkg-version": "1.4.3.0",
+      "pkg-src-sha256": "1fa3d64548440942b2b38b99c76d8dcaa94fa2ea3912cd7a6354ea4ec4af4758",
+      "pkg-version": "1.4.4.0",
      "style": "global",
      "type": "configured"
    },
@@ -523,6 +524,32 @@
      "pkg-version": "2.3.1",
      "type": "pre-existing"
    },
+    {
+      "component-name": "lib",
+      "depends": [
+        "base-4.18.0.0",
+        "bytestring-0.11.4.0",
+        "deepseq-1.4.8.1",
+        "exceptions-0.10.7",
+        "template-haskell-2.20.0.0"
+      ],
+      "exe-depends": [],
+      "flags": {},
+      "id": "os-string-2.0.2.2-43cc51146abd95ef66b49ad80000db666690bf9c40fa3f65719027c636758afa",
+      "pkg-cabal-sha256": "704ea0b499f9d4e43c98fd11e2fcf6b8762a1daa91114aa195966ebcc76a8d51",
+      "pkg-name": "os-string",
+      "pkg-src": {
+        "repo": {
+          "type": "secure-repo",
+          "uri": "http://hackage.haskell.org/"
+        },
+        "type": "repo-tar"
+      },
+      "pkg-src-sha256": "3fcc0d7657207d5ee45ce8994a74c5baa2f1149bbd28b3b75e2f646ed4a7251c",
+      "pkg-version": "2.0.2.2",
+      "style": "global",
+      "type": "configured"
+    },
    {
      "depends": [
        "base-4.18.0.0",
@@ -556,8 +583,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "primitive-0.8.0.0-ad645076af9195e65e5c77d3a3850c7fb7f4153156656431f6be749f834f8371",
-      "pkg-cabal-sha256": "d0ff45fa6e61f92af23611ceb8b9a6a04c236b50fb70c60e2ed3bfa532703670",
+      "id": "primitive-0.9.0.0-2c39c967275eb63540987163c5102ca552751baf8950befdbba639379bc36226",
+      "pkg-cabal-sha256": "2e08c5409e3559c7f1669ef50e9a0d9a397e68ecf51110d5e2cedf05cdd7d93c",
      "pkg-name": "primitive",
      "pkg-src": {
        "repo": {
@@ -566,8 +593,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "5553c21b4a789f9b591eed69e598cc58484c274af29250e517b5a8bcc62b995f",
-      "pkg-version": "0.8.0.0",
+      "pkg-src-sha256": "696d4bd291c94d736142d6182117dca4258d3ef28bfefdb649ac8b5ecd0999c7",
+      "pkg-version": "0.9.0.0",
      "style": "global",
      "type": "configured"
    },
@@ -595,8 +622,8 @@
      ],
      "exe-depends": [],
      "flags": {},
-      "id": "random-1.2.1.1-ffe51cd199197248564e73f28ef3f36986c68df7ef6a63469d008e73ce9372ad",
-      "pkg-cabal-sha256": "e7c1f881159d5cc788619c9ee8b8f340ba2ff0db571cdf3d1a1968ebc5108789",
+      "id": "random-1.2.1.2-5e0e2119062206b8f1d093c88355fc9f1acad3a3bc7f4682099050a7a51ccba9",
+      "pkg-cabal-sha256": "32397de181e20ccaacf806ec70de9308cf044f089a2be37c936f3f8967bde867",
      "pkg-name": "random",
      "pkg-src": {
        "repo": {
@@ -605,8 +632,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "3e1272f7ed6a4d7bd1712b90143ec326fee9b225789222379fea20a9c90c9b76",
-      "pkg-version": "1.2.1.1",
+      "pkg-src-sha256": "790f4dc2d2327c453ff6aac7bf15399fd123d55e927935f68f84b5df42d9a4b4",
+      "pkg-version": "1.2.1.2",
      "style": "global",
      "type": "configured"
    },
@@ -618,39 +645,39 @@
      "type": "pre-existing"
    },
    {
-      "bin-file": "/home/matt/.cabal/store/ghc-9.6.1/shake-0.19.7-e-shake-f393a0ff756be874a46bf49b589c952f684766fa6a51197c7394cb4ec81ecdc1/bin/shake",
-      "component-name": "exe:shake",
+      "component-name": "lib",
      "depends": [
        "base-4.18.0.0",
        "binary-0.8.9.1",
        "bytestring-0.11.4.0",
        "deepseq-1.4.8.1",
        "directory-1.3.8.1",
-        "extra-1.7.14-1e4d753e3e2a6a6678a92d2f5e20632ba08c7fce2a76b57b3cdf948436f94baf",
+        "extra-1.7.16-8af818d7b1052dbc43075b68911ac7c5c8e16ff5b40a0e284199219e3b576998",
        "filepath-1.4.100.1",
-        "filepattern-0.1.3-98137a12500a6ef2d4f8abc95ceae109795bd04281a1a080d2dc16589fe7ce12",
-        "hashable-1.4.3.0-fa09dc739bc3ac124d6fb0122e78a2d32fbce2118312a0ea3fbf79ec62fb1803",
+        "filepattern-0.1.3-c1a76347461ac708d05eb5e96075b9fe06240b794bc747f7992c6ebdd7146256",
+        "hashable-1.4.4.0-b4be4ab269e648fe6d65797701702780ae7b692e2ec9405cea0523ea7ab63dec",
        "heaps-0.4-84f785fa326505d8cac138316c7ca1fae826bac79403765826b5e0e8b4ca6459",
        "js-dgtable-0.5.2-929f5bb1639fd2d41e313c57e9a1322999779829eab0b2562697ea02d35cb572",
        "js-flot-0.8.3-6ef19e2feb165ecbdc5faf2cc57c67ac671129ac8bfa15f49d808e2c55182e5a",
        "js-jquery-3.3.1-7aa226a6aaf4a0a4ab8c2edaf9ce49229001fbdf5d86e863b4c2ece60a4532ed",
-        "primitive-0.8.0.0-ad645076af9195e65e5c77d3a3850c7fb7f4153156656431f6be749f834f8371",
+        "primitive-0.9.0.0-2c39c967275eb63540987163c5102ca552751baf8950befdbba639379bc36226",
        "process-1.6.17.0",
-        "random-1.2.1.1-ffe51cd199197248564e73f28ef3f36986c68df7ef6a63469d008e73ce9372ad",
+        "random-1.2.1.2-5e0e2119062206b8f1d093c88355fc9f1acad3a3bc7f4682099050a7a51ccba9",
        "time-1.12.2",
        "transformers-0.6.1.0",
        "unix-2.8.1.0",
-        "unordered-containers-0.2.19.1-c2eca776baf4fc617346651ed0756aa01198f94ae1b6c3ec26d525fc4e2d0d0b",
+        "unordered-containers-0.2.20-077eefc60f1775d521b43e090236ccbdfd063e00ad29d5fda49ab1fb3abf1404",
        "utf8-string-1.0.2-721e9e04faa6601f986dacde9b25ed4ab91af08c4232b52f8ff34c6b34918053"
      ],
      "exe-depends": [],
      "flags": {
        "cloud": false,
        "embed-files": false,
-        "portable": false
+        "portable": false,
+        "threaded": true
      },
-      "id": "shake-0.19.7-e-shake-f393a0ff756be874a46bf49b589c952f684766fa6a51197c7394cb4ec81ecdc1",
-      "pkg-cabal-sha256": "3cb5814cce210b9756fa9246ff1b2a1e1b86be46fdc4c5e2baacdc5bf83ce5c3",
+      "id": "shake-0.19.8-787778b4650ae6e487d7a35bca769dc0c49bd4db08e434162bd17cdfd1cefa7c",
+      "pkg-cabal-sha256": "03c8f06de478e07ad6fde95984c9206920106d0d8432ecb7ab825ef108d45382",
      "pkg-name": "shake",
      "pkg-src": {
        "repo": {
@@ -659,44 +686,46 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "352a56af12f70b50d564dcb61131555577281957ee196f1702a3723c0a3699d1",
-      "pkg-version": "0.19.7",
+      "pkg-src-sha256": "6384e33a26a2590bf33719e88881076b899ac4b5340c1c9271e4caa37e9d6535",
+      "pkg-version": "0.19.8",
      "style": "global",
      "type": "configured"
    },
    {
-      "component-name": "lib",
+      "bin-file": "/home/matt/.cabal/store/ghc-9.6.1/shake-0.19.8-e-shake-0a33f161f08b04221fce99cf7e9ad75a1b1ef12112654788d5195df7792fd339/bin/shake",
+      "component-name": "exe:shake",
      "depends": [
        "base-4.18.0.0",
        "binary-0.8.9.1",
        "bytestring-0.11.4.0",
        "deepseq-1.4.8.1",
        "directory-1.3.8.1",
-        "extra-1.7.14-1e4d753e3e2a6a6678a92d2f5e20632ba08c7fce2a76b57b3cdf948436f94baf",
+        "extra-1.7.16-8af818d7b1052dbc43075b68911ac7c5c8e16ff5b40a0e284199219e3b576998",
        "filepath-1.4.100.1",
-        "filepattern-0.1.3-98137a12500a6ef2d4f8abc95ceae109795bd04281a1a080d2dc16589fe7ce12",
-        "hashable-1.4.3.0-fa09dc739bc3ac124d6fb0122e78a2d32fbce2118312a0ea3fbf79ec62fb1803",
+        "filepattern-0.1.3-c1a76347461ac708d05eb5e96075b9fe06240b794bc747f7992c6ebdd7146256",
+        "hashable-1.4.4.0-b4be4ab269e648fe6d65797701702780ae7b692e2ec9405cea0523ea7ab63dec",
        "heaps-0.4-84f785fa326505d8cac138316c7ca1fae826bac79403765826b5e0e8b4ca6459",
        "js-dgtable-0.5.2-929f5bb1639fd2d41e313c57e9a1322999779829eab0b2562697ea02d35cb572",
        "js-flot-0.8.3-6ef19e2feb165ecbdc5faf2cc57c67ac671129ac8bfa15f49d808e2c55182e5a",
        "js-jquery-3.3.1-7aa226a6aaf4a0a4ab8c2edaf9ce49229001fbdf5d86e863b4c2ece60a4532ed",
-        "primitive-0.8.0.0-ad645076af9195e65e5c77d3a3850c7fb7f4153156656431f6be749f834f8371",
+        "primitive-0.9.0.0-2c39c967275eb63540987163c5102ca552751baf8950befdbba639379bc36226",
        "process-1.6.17.0",
-        "random-1.2.1.1-ffe51cd199197248564e73f28ef3f36986c68df7ef6a63469d008e73ce9372ad",
+        "random-1.2.1.2-5e0e2119062206b8f1d093c88355fc9f1acad3a3bc7f4682099050a7a51ccba9",
        "time-1.12.2",
        "transformers-0.6.1.0",
        "unix-2.8.1.0",
-        "unordered-containers-0.2.19.1-c2eca776baf4fc617346651ed0756aa01198f94ae1b6c3ec26d525fc4e2d0d0b",
+        "unordered-containers-0.2.20-077eefc60f1775d521b43e090236ccbdfd063e00ad29d5fda49ab1fb3abf1404",
        "utf8-string-1.0.2-721e9e04faa6601f986dacde9b25ed4ab91af08c4232b52f8ff34c6b34918053"
      ],
      "exe-depends": [],
      "flags": {
        "cloud": false,
        "embed-files": false,
-        "portable": false
+        "portable": false,
+        "threaded": true
      },
-      "id": "shake-0.19.7-f622ff9a218d4e335264ef86e06a3002b88f0c61e8a964b3c1cba2569bf91ab9",
-      "pkg-cabal-sha256": "3cb5814cce210b9756fa9246ff1b2a1e1b86be46fdc4c5e2baacdc5bf83ce5c3",
+      "id": "shake-0.19.8-e-shake-0a33f161f08b04221fce99cf7e9ad75a1b1ef12112654788d5195df7792fd339",
+      "pkg-cabal-sha256": "03c8f06de478e07ad6fde95984c9206920106d0d8432ecb7ab825ef108d45382",
      "pkg-name": "shake",
      "pkg-src": {
        "repo": {
@@ -705,8 +734,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "352a56af12f70b50d564dcb61131555577281957ee196f1702a3723c0a3699d1",
-      "pkg-version": "0.19.7",
+      "pkg-src-sha256": "6384e33a26a2590bf33719e88881076b899ac4b5340c1c9271e4caa37e9d6535",
+      "pkg-version": "0.19.8",
      "style": "global",
      "type": "configured"
    },
@@ -721,7 +750,7 @@
        "optimised-mixer": false
      },
      "id": "splitmix-0.1.0.5-38ff255f4209f9dd24bf92483a9c2a25ebe06dcb92ab79bb7e95f1b913d9d4cf",
-      "pkg-cabal-sha256": "bac0ae8d46a04e410666b0c8081cff63f060f29157983b569ca86ddb6e6e0dc6",
+      "pkg-cabal-sha256": "caa9b4a92abf1496c7f6a3c0f4e357426a54880077cb9f04e260a8bfa034b77b",
      "pkg-name": "splitmix",
      "pkg-src": {
        "repo": {
@@ -808,15 +837,15 @@
      "depends": [
        "base-4.18.0.0",
        "deepseq-1.4.8.1",
-        "hashable-1.4.3.0-fa09dc739bc3ac124d6fb0122e78a2d32fbce2118312a0ea3fbf79ec62fb1803",
+        "hashable-1.4.4.0-b4be4ab269e648fe6d65797701702780ae7b692e2ec9405cea0523ea7ab63dec",
        "template-haskell-2.20.0.0"
      ],
      "exe-depends": [],
      "flags": {
        "debug": false
      },
-      "id": "unordered-containers-0.2.19.1-c2eca776baf4fc617346651ed0756aa01198f94ae1b6c3ec26d525fc4e2d0d0b",
-      "pkg-cabal-sha256": "9ad8972c2e913c37b1d4f0e1261517fd7a1b8c8a58077e057be69837e3dbaa00",
+      "id": "unordered-containers-0.2.20-077eefc60f1775d521b43e090236ccbdfd063e00ad29d5fda49ab1fb3abf1404",
+      "pkg-cabal-sha256": "746c32b23f93cb13e52309e54e82d69e4315105f9815b1fcac25a57071505cff",
      "pkg-name": "unordered-containers",
      "pkg-src": {
        "repo": {
@@ -825,8 +854,8 @@
        },
        "type": "repo-tar"
      },
-      "pkg-src-sha256": "1b27bec5e0d522b27a6029ebf4c4a6d40acbc083c787008e32fb55c4b1d128d2",
-      "pkg-version": "0.2.19.1",
+      "pkg-src-sha256": "d9cfb287cf00592d39dc9c3cac8b99627ea08f2c01798e70130fc39f7c90f11d",
+      "pkg-version": "0.2.20",
      "style": "global",
      "type": "configured"
    },
No results found