Fix windows process creation handling wrt #1036

Update submodule
Merge branch 'issue-1032'
2024-04-07 18:07:01 +08:00 · 2024-03-31 22:09:42 +08:00 · 2024-03-31 22:09:07 +08:00 · 2024-03-31 20:30:37 +08:00 · 2024-03-31 19:36:59 +08:00 · 2024-03-31 19:04:49 +08:00
49 changed files with 23846 additions and 23782 deletions
--- a/.github/workflows/cabal.project.yaml
+++ b/.github/workflows/cabal.project.yaml
@@ -0,0 +1,39 @@
+name: Test cabal.project files
+
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - 'v*'
+  pull_request:
+    branches:
+      - master
+  schedule:
+    - cron: '0 2 * * *'
+
+jobs:
+  build:
+    name: Build binary
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macOS-latest, macOS-11, windows-latest, ubuntu-latest]
+        ghc: ["8.10.7", "9.0.2", "9.2.8", "9.4.8"]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: 'true'
+
+      - name: Run build
+        run: |
+          env
+          ghcup --version
+          ghcup run -i --cabal latest -- cabal update
+          ghcup run -i --cabal latest --ghc ${GHC_VER} -- cabal build --project-file=cabal.ghc${GHC_VER//./}.project
+        env:
+          GHC_VER: ${{ matrix.ghc }}
+        shell: bash
+
--- a/.github/workflows/cross.yaml
+++ b/.github/workflows/cross.yaml
@@ -21,8 +21,8 @@ jobs:
    name: Build linux binary
    runs-on: [self-hosted, Linux, X64, maerwald]
    env:
-      CABAL_VER: 3.10.1.0
-      JSON_VERSION: "0.0.7"
+      CABAL_VER: 3.10.3.0
+      JSON_VERSION: "0.0.8"
      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
      S3_HOST: ${{ secrets.S3_HOST }}
@@ -31,7 +31,7 @@ jobs:
      ARCH: 64
    steps:
      - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          submodules: 'true'

@@ -50,7 +50,7 @@ jobs:

      - if: always()
        name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: artifacts
          path: |
@@ -61,13 +61,13 @@ jobs:
    needs: "build"
    runs-on: [self-hosted, Linux, X64]
    container:
-      image: registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:8d0224e6b2a08157649651e69302380b2bd24e11
+      image: registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb12:a9297a370025101b479cfd4977f8f910814e03ab
      options: --user root
      env:
-        CABAL_VER: 3.6.2.0
+        CABAL_VER: 3.10.3.0
        BUILD_CONF_ARGS: "--enable-unregisterised"
        HADRIAN_FLAVOUR: ""
-        JSON_VERSION: "0.0.7"
+        JSON_VERSION: "0.0.8"
        GHC_VER: 8.10.6
        GHC_TARGET_VERSION: "8.10.7"
        ARCH: 64
@@ -77,11 +77,11 @@ jobs:
        WRAPPER: "run"
    steps:
      - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          submodules: 'true'

-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
        with:
          name: artifacts
          path: ./out
@@ -89,11 +89,18 @@ jobs:
      - name: Run test (64 bit linux)
        run: |
          sudo apt-get update -y
-          sudo apt-get install -y libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl gzip
-          sudo apt-get install -y gcc-arm-linux-gnueabihf
+          sudo apt-get install -y libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl gzip libstdc++-11-dev
+          sudo apt-get install -y gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf
          sudo dpkg --add-architecture armhf
          sudo apt-get update -y
-          sudo apt-get install -y libncurses-dev:armhf
+          sudo apt-get install -y libncurses-dev:armhf libstdc++-11-dev:armhf
+          # ld.bfd is broken on armv7: https://sourceware.org/bugzilla/show_bug.cgi?id=16177
+          update-alternatives --install "/usr/bin/x86_64-linux-gnu-ld" "ld" "/usr/bin/x86_64-linux-gnu-ld.gold" 20
+          update-alternatives --install "/usr/bin/x86_64-linux-gnu-ld" "ld" "/usr/bin/x86_64-linux-gnu-ld.bfd" 10
+          update-alternatives --set "ld" "/usr/bin/x86_64-linux-gnu-ld.gold"
+          update-alternatives --install "/usr/bin/arm-linux-gnueabihf-ld" "ld-arm" "/usr/bin/arm-linux-gnueabihf-ld.gold" 20
+          update-alternatives --install "/usr/bin/arm-linux-gnueabihf-ld" "ld-arm" "/usr/bin/arm-linux-gnueabihf-ld.bfd" 10
+          update-alternatives --set "ld-arm" "/usr/bin/arm-linux-gnueabihf-ld.gold"
          sh .github/scripts/cross.sh

  test-cross-js:
@@ -101,13 +108,13 @@ jobs:
    needs: "build"
    runs-on: [self-hosted, Linux, X64]
    container:
-      image: registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:8d0224e6b2a08157649651e69302380b2bd24e11
+      image: registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb12:a9297a370025101b479cfd4977f8f910814e03ab
      options: --user root
      env:
-        CABAL_VER: 3.6.2.0
+        CABAL_VER: 3.10.3.0
        BUILD_CONF_ARGS: ""
        HADRIAN_FLAVOUR: "default+native_bignum"
-        JSON_VERSION: "0.0.7"
+        JSON_VERSION: "0.0.8"
        GHC_VER: 9.6.2
        GHC_TARGET_VERSION: "9.6.2"
        ARCH: 64
@@ -117,11 +124,11 @@ jobs:
        WRAPPER: "emconfigure"
    steps:
      - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          submodules: 'true'

-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
        with:
          name: artifacts
          path: ./out
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -40,7 +40,7 @@ jobs:
            ARCH: 64
    steps:
      - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          submodules: 'true'

@@ -94,11 +94,11 @@ jobs:
      fail-fast: true
      matrix:
        include:
-          - os: [self-hosted, Linux, ARM64]
+          - os: [self-hosted, Linux, ARM64, maerwald]
            ARTIFACT: "armv7-linux-ghcup"
            GHC_VER: 9.2.8
            ARCH: ARM
-          - os: [self-hosted, Linux, ARM64]
+          - os: [self-hosted, Linux, ARM64, maerwald]
            ARTIFACT: "aarch64-linux-ghcup"
            GHC_VER: 9.4.8
            ARCH: ARM64
@@ -109,7 +109,7 @@ jobs:
        shell: bash

      - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          submodules: 'true'

@@ -126,6 +126,7 @@ jobs:
          AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
          AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
          S3_HOST: ${{ env.S3_HOST }}
+          LD: ld.gold

      - if: matrix.ARCH == 'ARM64'
        uses: docker://hasufell/arm64v8-debian-haskell:10
@@ -177,7 +178,7 @@ jobs:
            ARCH: 64
    steps:
      - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          submodules: 'true'

@@ -258,7 +259,7 @@ jobs:
      RUNNER_OS: FreeBSD
    steps:
      - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          submodules: 'true'

@@ -305,7 +306,7 @@ jobs:

    steps:
      - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          submodules: 'true'

@@ -365,12 +366,12 @@ jobs:
    strategy:
      matrix:
        include:
-          - os: [self-hosted, Linux, ARM64]
+          - os: [self-hosted, Linux, ARM64, maerwald]
            ARTIFACT: "armv7-linux-ghcup"
            GHC_VER: 9.2.8
            ARCH: ARM
            DISTRO: Ubuntu
-          - os: [self-hosted, Linux, ARM64]
+          - os: [self-hosted, Linux, ARM64, maerwald]
            ARTIFACT: "aarch64-linux-ghcup"
            GHC_VER: 9.4.8
            ARCH: ARM64
@@ -378,7 +379,7 @@ jobs:

    steps:
      - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          submodules: 'true'

@@ -397,6 +398,7 @@ jobs:
          ARCH: ${{ matrix.ARCH }}
          GHC_VER: ${{ matrix.GHC_VER }}
          DISTRO: Ubuntu
+          LD: ld.gold

      - if: matrix.ARCH == 'ARM64'
        uses: docker://hasufell/arm64v8-debian-haskell:10
@@ -446,7 +448,7 @@ jobs:

    steps:
      - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          submodules: 'true'

@@ -508,7 +510,7 @@ jobs:
      RUNNER_OS: FreeBSD
    steps:
      - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          submodules: 'true'

@@ -545,7 +547,7 @@ jobs:
      S3_HOST: ${{ secrets.S3_HOST }}
    steps:
      - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          submodules: 'true'

--- a/.github/workflows/stack.yaml
+++ b/.github/workflows/stack.yaml
@@ -0,0 +1,35 @@
+name: Test stack.yaml
+
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - 'v*'
+  pull_request:
+    branches:
+      - master
+  schedule:
+    - cron: '0 2 * * *'
+
+jobs:
+  build:
+    name: Build binary
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macOS-latest, macOS-11, windows-latest, ubuntu-latest]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: 'true'
+
+      - name: Run build
+        run: |
+          env
+          ghcup --version
+          ghcup run -i --stack latest -- stack build
+        shell: bash
+
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,22 @@
 # Revision history for ghcup

-## 0.1.22.0 -- ????-??-??
+## 0.1.22.0 -- 2024-03-13

 ### New features

+* A help screen/tutorial in the TUI by @lsmor (Luis Morillo)
 * Beef up `--overwrite-version`, fixes [#998](https://github.com/haskell/ghcup-hs/issues/998)
  * e.g. `ghcup compile hls -g master --overwrite-version='%v-%h' --ghc 9.4.8` will produce a binary called `haskell-language-server-wrapper-<version-from-cabal-file>-<short-git-commit-hash>`... refer to `ghcup compile hls --help` for more information
 * Allow to set ghcup msys2 environment wrt [#982](https://github.com/haskell/ghcup-hs/issues/982)
 * Add mechanism to warn on new metadata versions, fixes [#860](https://github.com/haskell/ghcup-hs/issues/860)
+* Add pre-install message support via ghcup metadata, wrt [#1016](https://github.com/haskell/ghcup-hs/issues/1016)
+* Allow to remove all unset versions, fixes [#1019](https://github.com/haskell/ghcup-hs/issues/1019)
+  * e.g.: `ghcup gc --unset`

 ### Improvements and bug fixes

+* Fix potential [HSEC-2024-0002](https://haskell.github.io/security-advisories/advisory/HSEC-2024-0002.html)
+* Fix TUI crash in windows terminal 1.19 [#1013](https://github.com/haskell/ghcup-hs/issues/1013)
 * Clean up on git clone errors, fixes [#1004](https://github.com/haskell/ghcup-hs/issues/1004)
 * Error out on empty UserSettings wrt [#922](https://github.com/haskell/ghcup-hs/issues/922)
 * Fix failure mode when metadata is garbage, fixes [#921](https://github.com/haskell/ghcup-hs/issues/921)
--- a/app/ghcup/Main.hs
+++ b/app/ghcup/Main.hs
@@ -90,6 +90,7 @@ toSettings options = do
         gpgSetting  = fromMaybe (fromMaybe (Types.gpgSetting defaultSettings) uGPGSetting) optGpg
         platformOverride = optPlatform <|> (uPlatformOverride <|> Types.platformOverride defaultSettings)
         mirrors  = fromMaybe (Types.mirrors defaultSettings) uMirrors
+         defGHCConfOptions  = fromMaybe (Types.defGHCConfOptions defaultSettings) uDefGHCConfOptions
     in (Settings {..}, keyBindings)
 #if defined(INTERNAL_DOWNLOADER)
   defaultDownloader = Internal
--- a/cabal.ghc8107.Unix.project
+++ b/cabal.ghc8107.Unix.project
@@ -0,0 +1,60 @@
+packages: ./ghcup.cabal
+
+optional-packages: ./vendored/*/*.cabal
+
+if impl(ghc < 9.0)
+    package ghcup
+        flags: +tui -tar
+else
+    package ghcup
+        flags: +tui +tar
+
+constraints: http-io-streams -brotli,
+             any.aeson >= 2.0.1.0,
+             any.hsc2hs ==0.68.8,
+             bzlib-conduit >= 0.3.0.3,
+             bz2 >= 1.0.1.1,
+             bzlib >= 0.5.2.0,
+             directory >= 1.3.8.3,
+             filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0
+
+if os(mingw32)
+  constraints: zlib +bundled-c-zlib,
+               lzma +static,
+               text -simdutf,
+               vty-windows >=0.2.0.2
+
+  if impl(ghc >= 9.4)
+    constraints: language-c >= 0.9.3
+
+
+source-repository-package
+  type: git
+  location: https://github.com/haskell/tar.git
+  tag: d94a988be4311b830149a9f8fc16739927e5fc1c
+
+source-repository-package
+  type: git
+  location: https://github.com/hasufell/uri-bytestring.git
+  tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001
+
+package libarchive
+  flags: -system-libarchive
+
+package aeson-pretty
+  flags: +lib-only
+
+package cabal-plan
+  flags: -exe
+
+package aeson
+  flags: +ordered-keymap
+
+package streamly
+  flags: +use-unliftio
+
+package *
+  test-show-details: direct
+
+allow-newer: cabal-install-parsers:tar, streamly:Win32
+
--- a/cabal.ghc8107.Unix.project.freeze
+++ b/cabal.ghc8107.Unix.project.freeze
@@ -14,7 +14,7 @@ constraints: any.Cabal ==3.10.2.1,
             aeson +ordered-keymap,
             any.aeson-pretty ==0.8.10,
             aeson-pretty +lib-only,
-             any.alex ==3.5.0.0,
+             any.alex ==3.5.1.0,
             any.ansi-terminal ==1.0.2,
             ansi-terminal -example,
             any.ansi-terminal-types ==0.11.5,
@@ -44,8 +44,9 @@ constraints: any.Cabal ==3.10.2.1,
             any.brick ==2.1.1,
             brick -demos,
             any.bytestring ==0.11.5.3,
-             any.bz2 ==1.0.1.0,
+             any.bz2 ==1.0.1.1,
             bz2 -cross +with-bzlib,
+             any.bzip2-clib ==1.0.8,
             any.c2hs ==0.28.8,
             c2hs +base3 -regression,
             any.cabal-install-parsers ==0.6.1.1,
@@ -76,7 +77,8 @@ constraints: any.Cabal ==3.10.2.1,
             any.data-clist ==0.2,
             any.data-fix ==0.3.2,
             any.deepseq ==1.4.4.0,
-             any.directory ==1.3.8.1,
+             any.directory ==1.3.8.3,
+             directory -os-string,
             any.disk-free-space ==0.1.0.1,
             any.distributive ==0.6.2.1,
             distributive +semigroups +tagged,
@@ -84,7 +86,7 @@ constraints: any.Cabal ==3.10.2.1,
             dlist -werror,
             any.exceptions ==0.10.4,
             any.file-uri ==0.1.0.0,
-             any.filepath ==1.4.300.1,
+             any.filepath ==1.4.101.0,
             filepath -cpphs,
             any.foldable1-classes-compat ==0.1,
             foldable1-classes-compat +tagged,
@@ -103,7 +105,7 @@ constraints: any.Cabal ==3.10.2.1,
             any.haskus-utils-types ==1.5.1,
             any.haskus-utils-variant ==3.3,
             any.heaps ==0.4,
-             any.hsc2hs ==0.68.10,
+             any.hsc2hs ==0.68.8,
             hsc2hs -in-ghc-tree,
             any.hspec ==2.10.10,
             any.hspec-core ==2.10.10,
@@ -125,8 +127,8 @@ constraints: any.Cabal ==3.10.2.1,
             language-c -allwarnings +iecfpextension +usebytestrings,
             any.libarchive ==3.0.4.2,
             libarchive -cross -low-memory +no-exe -system-libarchive,
-             any.libyaml-streamly ==0.2.2,
-             libyaml-streamly -no-unicode -system-libyaml,
+             any.libyaml-streamly ==0.2.2.1,
+             libyaml-streamly -no-unicode +system-libyaml,
             any.lockfree-queue ==0.2.4,
             any.lukko ==0.1.1.3,
             lukko +ofd-locking,
@@ -241,7 +243,7 @@ constraints: any.Cabal ==3.10.2.1,
             vector +boundschecks -internalchecks -unsafechecks -wall,
             any.vector-binary-instances ==0.2.5.2,
             any.vector-stream ==0.1.0.1,
-             any.versions ==6.0.5,
+             any.versions ==6.0.6,
             any.vty ==6.2,
             any.vty-crossplatform ==0.4.0.0,
             vty-crossplatform -demos,
@@ -255,4 +257,4 @@ constraints: any.Cabal ==3.10.2.1,
             any.zlib ==0.6.3.0,
             zlib -bundled-c-zlib -non-blocking-ffi -pkg-config,
             any.zlib-bindings ==0.1.1.5
-index-state: hackage.haskell.org 2024-02-18T14:07:35Z
+index-state: hackage.haskell.org 2024-03-13T09:43:35Z
--- a/cabal.ghc8107.Win32.project
+++ b/cabal.ghc8107.Win32.project
@@ -0,0 +1,60 @@
+packages: ./ghcup.cabal
+
+optional-packages: ./vendored/*/*.cabal
+
+if impl(ghc < 9.0)
+    package ghcup
+        flags: +tui -tar
+else
+    package ghcup
+        flags: +tui +tar
+
+constraints: http-io-streams -brotli,
+             any.aeson >= 2.0.1.0,
+             any.hsc2hs ==0.68.8,
+             bzlib-conduit >= 0.3.0.3,
+             bz2 >= 1.0.1.1,
+             bzlib >= 0.5.2.0,
+             directory >= 1.3.8.3,
+             filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0
+
+if os(mingw32)
+  constraints: zlib +bundled-c-zlib,
+               lzma +static,
+               text -simdutf,
+               vty-windows >=0.2.0.2
+
+  if impl(ghc >= 9.4)
+    constraints: language-c >= 0.9.3
+
+
+source-repository-package
+  type: git
+  location: https://github.com/haskell/tar.git
+  tag: d94a988be4311b830149a9f8fc16739927e5fc1c
+
+source-repository-package
+  type: git
+  location: https://github.com/hasufell/uri-bytestring.git
+  tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001
+
+package libarchive
+  flags: -system-libarchive
+
+package aeson-pretty
+  flags: +lib-only
+
+package cabal-plan
+  flags: -exe
+
+package aeson
+  flags: +ordered-keymap
+
+package streamly
+  flags: +use-unliftio
+
+package *
+  test-show-details: direct
+
+allow-newer: cabal-install-parsers:tar, streamly:Win32
+
--- a/cabal.ghc8107.Win32.project.freeze
+++ b/cabal.ghc8107.Win32.project.freeze
@@ -0,0 +1,245 @@
+active-repositories: hackage.haskell.org:merge
+constraints: any.Cabal ==3.10.2.0 || ==3.10.2.1,
+             any.Cabal-syntax ==3.10.1.0 || ==3.10.2.0,
+             any.HUnit ==1.6.2.0,
+             any.OneTuple ==0.4.1.1,
+             any.QuickCheck ==2.14.3,
+             QuickCheck -old-random +templatehaskell,
+             any.StateVar ==1.2.2,
+             any.Win32 ==2.6.2.1 || ==2.13.4.0,
+             any.abstract-deque ==0.3,
+             abstract-deque -usecas,
+             any.aeson ==2.2.1.0,
+             aeson +ordered-keymap,
+             any.aeson-pretty ==0.8.10,
+             aeson-pretty +lib-only,
+             any.alex ==3.5.1.0,
+             any.ansi-terminal ==1.0.2,
+             ansi-terminal -example,
+             any.ansi-terminal-types ==0.11.5,
+             any.ansi-wl-pprint ==0.6.9,
+             ansi-wl-pprint -example,
+             any.array ==0.5.4.0,
+             any.assoc ==1.1,
+             assoc +tagged,
+             any.async ==2.2.5,
+             async -bench,
+             any.atomic-primops ==0.8.5,
+             atomic-primops -debug,
+             any.attoparsec ==0.14.4,
+             attoparsec -developer,
+             any.base ==4.14.3.0,
+             any.base-compat ==0.13.1,
+             any.base-orphans ==0.9.1,
+             any.base16-bytestring ==1.0.2.0,
+             any.bifunctors ==5.6.1,
+             bifunctors +tagged,
+             any.bimap ==0.5.0,
+             any.binary ==0.8.8.0 || ==0.8.9.1,
+             any.binary-instances ==1.0.4,
+             any.binary-orphans ==1.0.4.1,
+             any.blaze-builder ==0.4.2.3,
+             any.brick ==2.1.1,
+             brick -demos,
+             any.bytestring ==0.10.12.0 || ==0.11.5.3,
+             any.bz2 ==1.0.1.1,
+             bz2 -cross +with-bzlib,
+             any.bzip2-clib ==1.0.8,
+             any.c2hs ==0.28.8,
+             c2hs +base3 -regression,
+             any.cabal-install-parsers ==0.6.1.1,
+             any.cabal-plan ==0.7.3.0,
+             cabal-plan -_ -exe -license-report,
+             any.call-stack ==0.4.0,
+             any.case-insensitive ==1.2.1.0,
+             any.casing ==0.1.4.1,
+             any.chs-cabal ==0.1.1.1,
+             any.chs-deps ==0.1.0.0,
+             chs-deps -cross,
+             any.colour ==2.3.6,
+             any.comonad ==5.0.8,
+             comonad +containers +distributive +indexed-traversable,
+             any.composition-prelude ==3.0.0.2,
+             composition-prelude -development,
+             any.config-ini ==0.2.7.0,
+             config-ini -enable-doctests,
+             any.containers ==0.6.5.1,
+             any.contravariant ==1.5.5,
+             contravariant +semigroups +statevar +tagged,
+             any.cpphs ==1.20.9.1,
+             cpphs -old-locale,
+             any.cryptohash-sha256 ==0.11.102.1,
+             cryptohash-sha256 -exe +use-cbits,
+             any.data-array-byte ==0.1.0.1,
+             any.data-clist ==0.2,
+             any.data-fix ==0.3.2,
+             any.deepseq ==1.4.4.0,
+             any.directory ==1.3.6.0 || ==1.3.8.3,
+             directory -os-string,
+             any.disk-free-space ==0.1.0.1,
+             any.distributive ==0.6.2.1,
+             distributive +semigroups +tagged,
+             any.dlist ==1.0,
+             dlist -werror,
+             any.exceptions ==0.10.4,
+             any.file-uri ==0.1.0.0,
+             any.filepath ==1.4.2.1 || ==1.4.101.0,
+             filepath -cpphs,
+             any.foldable1-classes-compat ==0.1,
+             foldable1-classes-compat +tagged,
+             any.free ==5.2,
+             any.fusion-plugin-types ==0.1.0,
+             any.generic-arbitrary ==0.2.2,
+             any.generically ==0.1.1,
+             any.ghc-boot-th ==8.10.7,
+             any.ghc-prim ==0.6.1,
+             any.happy ==1.20.1.1,
+             any.hashable ==1.4.3.0,
+             hashable +integer-gmp -random-initial-seed,
+             any.haskell-lexer ==1.1.1,
+             any.haskus-utils-data ==1.4,
+             any.haskus-utils-types ==1.5.1,
+             any.haskus-utils-variant ==3.3,
+             any.heaps ==0.4,
+             any.hsc2hs ==0.68.8,
+             hsc2hs -in-ghc-tree,
+             any.hspec ==2.10.10,
+             any.hspec-core ==2.10.10,
+             any.hspec-discover ==2.10.10,
+             any.hspec-expectations ==0.8.2,
+             any.hspec-golden-aeson ==0.9.0.0,
+             any.indexed-profunctors ==0.1.1.1,
+             any.indexed-traversable ==0.1.3,
+             any.indexed-traversable-instances ==0.1.1.2,
+             any.integer-conversion ==0.1.0.1,
+             any.integer-gmp ==1.0.3.0,
+             any.integer-logarithms ==1.0.3.1,
+             integer-logarithms -check-bounds +integer-gmp,
+             any.language-c ==0.9.3,
+             language-c -allwarnings +iecfpextension +usebytestrings,
+             any.libarchive ==3.0.4.2,
+             libarchive -cross -low-memory +no-exe -system-libarchive,
+             any.libyaml-clib ==0.2.5,
+             any.libyaml-streamly ==0.2.2.1,
+             libyaml-streamly -no-unicode -system-libyaml,
+             any.lockfree-queue ==0.2.4,
+             any.lukko ==0.1.1.3,
+             lukko +ofd-locking,
+             any.lzma-static ==5.2.5.5,
+             any.megaparsec ==9.2.1,
+             megaparsec -dev,
+             any.microlens ==0.4.13.1,
+             any.microlens-mtl ==0.2.0.3,
+             any.microlens-th ==0.4.3.14,
+             any.mtl ==2.2.2,
+             any.mtl-compat ==0.2.2,
+             mtl-compat -two-point-one -two-point-two,
+             any.network ==3.1.4.0,
+             network -devel,
+             any.network-uri ==2.6.4.2,
+             any.optics ==0.4.2.1,
+             any.optics-core ==0.4.1.1,
+             optics-core -explicit-generic-labels,
+             any.optics-extra ==0.4.2.1,
+             any.optics-th ==0.4.1,
+             any.optparse-applicative ==0.17.1.0,
+             optparse-applicative +process,
+             any.os-release ==1.0.2.1,
+             os-release -devel,
+             any.parsec ==3.1.14.0 || ==3.1.17.0,
+             any.parser-combinators ==1.3.0,
+             parser-combinators -dev,
+             any.polyparse ==1.13,
+             any.pretty ==1.1.3.6,
+             any.pretty-terminal ==0.1.0.0,
+             any.primitive ==0.8.0.0,
+             any.process ==1.6.13.2 || ==1.6.18.0,
+             any.profunctors ==5.6.2,
+             any.quickcheck-arbitrary-adt ==0.3.1.0,
+             any.quickcheck-io ==0.2.0,
+             any.random ==1.2.1.2,
+             any.recursion-schemes ==5.2.2.5,
+             recursion-schemes +template-haskell,
+             any.regex-base ==0.94.0.2,
+             any.regex-posix ==0.96.0.1,
+             regex-posix -_regex-posix-clib,
+             any.regex-posix-clib ==2.7,
+             any.resourcet ==1.2.6,
+             any.retry ==0.9.3.1,
+             retry -lib-werror,
+             any.rts ==1.0.1,
+             any.safe ==0.3.21,
+             any.safe-exceptions ==0.1.7.4,
+             any.scientific ==0.3.7.0,
+             scientific -bytestring-builder -integer-simple,
+             any.semialign ==1.3,
+             semialign +semigroupoids,
+             any.semigroupoids ==6.0.0.1,
+             semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers,
+             any.setenv ==0.1.1.3,
+             any.split ==0.2.5,
+             any.splitmix ==0.1.0.5,
+             splitmix -optimised-mixer,
+             any.stm ==2.5.0.1,
+             any.streamly ==0.8.3,
+             streamly -debug -dev -fusion-plugin -has-llvm -inspection -limit-build-mem -no-fusion +opt -streamk -streamly-core -use-c-malloc +use-unliftio,
+             any.strict ==0.5,
+             any.strict-base ==0.4.0.0,
+             any.tagged ==0.8.8,
+             tagged +deepseq +transformers,
+             any.tagsoup ==0.14.8,
+             any.tar ==0.6.0.0,
+             any.tasty ==1.5,
+             tasty +unix,
+             any.tasty-hunit ==0.10.1,
+             any.template-haskell ==2.16.0.0,
+             any.temporary ==1.3,
+             any.text ==1.2.4.1 || ==2.0.2,
+             text -developer -simdutf,
+             any.text-binary ==0.2.1.1,
+             any.text-iso8601 ==0.1,
+             any.text-short ==0.1.5,
+             text-short -asserts,
+             any.text-zipper ==0.13,
+             any.tf-random ==0.5,
+             any.th-abstraction ==0.6.0.0,
+             any.th-compat ==0.1.4,
+             any.th-lift ==0.8.4,
+             any.th-lift-instances ==0.1.20,
+             any.these ==1.2,
+             any.time ==1.9.3 || ==1.11.1.2,
+             any.time-compat ==1.9.6.1,
+             time-compat -old-locale,
+             any.transformers ==0.5.6.2,
+             any.transformers-base ==0.4.6,
+             transformers-base +orphaninstances,
+             any.transformers-compat ==0.7.2,
+             transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
+             any.unicode-data ==0.3.1,
+             unicode-data -ucd2haskell,
+             any.unix-compat ==0.7.1,
+             unix-compat -old-time,
+             any.unliftio-core ==0.2.1.0,
+             any.unordered-containers ==0.2.20,
+             unordered-containers -debug,
+             any.uri-bytestring ==0.3.3.1,
+             uri-bytestring -lib-werror,
+             any.utf8-string ==1.0.2,
+             any.uuid-types ==1.0.5.1,
+             any.vector ==0.13.1.0,
+             vector +boundschecks -internalchecks -unsafechecks -wall,
+             any.vector-binary-instances ==0.2.5.2,
+             any.vector-stream ==0.1.0.1,
+             any.versions ==6.0.6,
+             any.vty ==6.2,
+             any.vty-crossplatform ==0.4.0.0,
+             vty-crossplatform -demos,
+             any.vty-windows ==0.2.0.2,
+             any.witherable ==0.4.2,
+             any.word-wrap ==0.5,
+             any.word8 ==0.1.3,
+             any.yaml-streamly ==0.12.4,
+             yaml-streamly +no-examples +no-exe,
+             any.zlib ==0.6.3.0,
+             zlib +bundled-c-zlib -non-blocking-ffi -pkg-config
+index-state: hackage.haskell.org 2024-03-15T23:51:46Z
--- a/cabal.ghc8107.project
+++ b/cabal.ghc8107.project
@@ -1,50 +1,8 @@
-packages: ./ghcup.cabal
-
-optional-packages: ./vendored/*/*.cabal
-
-if impl(ghc < 9.0)
-    package ghcup
-        flags: +tui -tar
-else
-    package ghcup
-        flags: +tui +tar
-
-constraints: http-io-streams -brotli,
-             any.aeson >= 2.0.1.0
-
 if os(mingw32)
-  if impl(ghc >= 9.4)
-    constraints: language-c >= 0.9.3
-
-source-repository-package
-  type: git
-  location: https://github.com/haskell/tar.git
-  tag: d94a988be4311b830149a9f8fc16739927e5fc1c
-
-source-repository-package
-  type: git
-  location: https://github.com/hasufell/uri-bytestring.git
-  tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001
-
-package libarchive
-  flags: -system-libarchive
-
-package aeson-pretty
-  flags: +lib-only
-
-package cabal-plan
-  flags: -exe
-
-package aeson
-  flags: +ordered-keymap
-
-package streamly
-  flags: +use-unliftio
-
-package *
-  test-show-details: direct
-
-allow-newer: cabal-install-parsers:tar, streamly:Win32
-
+  import: cabal.ghc8107.Win32.project
+  import: cabal.ghc8107.Win32.project.freeze
+else
+  import: cabal.ghc8107.Unix.project
+  import: cabal.ghc8107.Unix.project.freeze

 with-compiler: ghc-8.10.7
--- a/cabal.ghc902.Unix.project
+++ b/cabal.ghc902.Unix.project
@@ -0,0 +1,60 @@
+packages: ./ghcup.cabal
+
+optional-packages: ./vendored/*/*.cabal
+
+if impl(ghc < 9.0)
+    package ghcup
+        flags: +tui -tar
+else
+    package ghcup
+        flags: +tui +tar
+
+constraints: http-io-streams -brotli,
+             any.aeson >= 2.0.1.0,
+             any.hsc2hs ==0.68.8,
+             bzlib-conduit >= 0.3.0.3,
+             bz2 >= 1.0.1.1,
+             bzlib >= 0.5.2.0,
+             directory >= 1.3.8.3,
+             filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0
+
+if os(mingw32)
+  constraints: zlib +bundled-c-zlib,
+               lzma +static,
+               text -simdutf,
+               vty-windows >=0.2.0.2
+
+  if impl(ghc >= 9.4)
+    constraints: language-c >= 0.9.3
+
+
+source-repository-package
+  type: git
+  location: https://github.com/haskell/tar.git
+  tag: d94a988be4311b830149a9f8fc16739927e5fc1c
+
+source-repository-package
+  type: git
+  location: https://github.com/hasufell/uri-bytestring.git
+  tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001
+
+package libarchive
+  flags: -system-libarchive
+
+package aeson-pretty
+  flags: +lib-only
+
+package cabal-plan
+  flags: -exe
+
+package aeson
+  flags: +ordered-keymap
+
+package streamly
+  flags: +use-unliftio
+
+package *
+  test-show-details: direct
+
+allow-newer: cabal-install-parsers:tar, streamly:Win32
+
--- a/cabal.ghc902.Unix.project.freeze
+++ b/cabal.ghc902.Unix.project.freeze
@@ -14,7 +14,7 @@ constraints: any.Cabal ==3.10.2.1,
             aeson +ordered-keymap,
             any.aeson-pretty ==0.8.10,
             aeson-pretty +lib-only,
-             any.alex ==3.5.0.0,
+             any.alex ==3.5.1.0,
             any.ansi-terminal ==1.0.2,
             ansi-terminal -example,
             any.ansi-terminal-types ==0.11.5,
@@ -47,9 +47,10 @@ constraints: any.Cabal ==3.10.2.1,
             any.brick ==2.1.1,
             brick -demos,
             any.bytestring ==0.11.5.3,
-             any.bz2 ==1.0.1.0,
+             any.bz2 ==1.0.1.1,
             bz2 -cross +with-bzlib,
-             any.bzlib-conduit ==0.3.0.2,
+             any.bzip2-clib ==1.0.8,
+             any.bzlib-conduit ==0.3.0.3,
             any.c2hs ==0.28.8,
             c2hs +base3 -regression,
             any.cabal-install-parsers ==0.6.1.1,
@@ -81,7 +82,8 @@ constraints: any.Cabal ==3.10.2.1,
             any.deepseq ==1.4.5.0,
             any.digest ==0.0.2.1,
             digest -have_arm64_crc32c -have_builtin_prefetch -have_mm_prefetch -have_sse42 -have_strong_getauxval -have_weak_getauxval +pkg-config,
-             any.directory ==1.3.8.1,
+             any.directory ==1.3.8.3,
+             directory -os-string,
             any.disk-free-space ==0.1.0.1,
             any.distributive ==0.6.2.1,
             distributive +semigroups +tagged,
@@ -89,7 +91,7 @@ constraints: any.Cabal ==3.10.2.1,
             dlist -werror,
             any.exceptions ==0.10.4,
             any.file-uri ==0.1.0.0,
-             any.filepath ==1.4.300.1,
+             any.filepath ==1.4.101.0,
             filepath -cpphs,
             any.foldable1-classes-compat ==0.1,
             foldable1-classes-compat +tagged,
@@ -109,7 +111,7 @@ constraints: any.Cabal ==3.10.2.1,
             any.haskus-utils-types ==1.5.1,
             any.haskus-utils-variant ==3.3,
             any.heaps ==0.4,
-             any.hsc2hs ==0.68.10,
+             any.hsc2hs ==0.68.8,
             hsc2hs -in-ghc-tree,
             any.hspec ==2.10.10,
             any.hspec-core ==2.10.10,
@@ -128,8 +130,8 @@ constraints: any.Cabal ==3.10.2.1,
             io-streams +network -nointeractivetests +zlib,
             any.language-c ==0.9.3,
             language-c -allwarnings +iecfpextension +usebytestrings,
-             any.libyaml-streamly ==0.2.2,
-             libyaml-streamly -no-unicode -system-libyaml,
+             any.libyaml-streamly ==0.2.2.1,
+             libyaml-streamly -no-unicode +system-libyaml,
             any.lockfree-queue ==0.2.4,
             any.lukko ==0.1.1.3,
             lukko +ofd-locking,
@@ -140,7 +142,7 @@ constraints: any.Cabal ==3.10.2.1,
             any.microlens-mtl ==0.2.0.3,
             any.microlens-th ==0.4.3.14,
             any.monad-control ==1.0.3.1,
-             any.mono-traversable ==1.0.15.3,
+             any.mono-traversable ==1.0.17.0,
             any.mtl ==2.2.2,
             any.mtl-compat ==0.2.2,
             mtl-compat -two-point-one -two-point-two,
@@ -250,7 +252,7 @@ constraints: any.Cabal ==3.10.2.1,
             vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks,
             any.vector-binary-instances ==0.2.5.2,
             any.vector-stream ==0.1.0.1,
-             any.versions ==6.0.5,
+             any.versions ==6.0.6,
             any.vty ==6.2,
             any.vty-crossplatform ==0.4.0.0,
             vty-crossplatform -demos,
@@ -268,4 +270,4 @@ constraints: any.Cabal ==3.10.2.1,
             any.zlib-bindings ==0.1.1.5,
             any.zstd ==0.1.3.0,
             zstd +standalone
-index-state: hackage.haskell.org 2024-02-18T14:07:35Z
+index-state: hackage.haskell.org 2024-03-13T09:43:35Z
--- a/cabal.ghc902.Win32.project
+++ b/cabal.ghc902.Win32.project
@@ -0,0 +1,61 @@
+packages: ./ghcup.cabal
+
+optional-packages: ./vendored/*/*.cabal
+
+if impl(ghc < 9.0)
+    package ghcup
+        flags: +tui -tar
+else
+    package ghcup
+        flags: +tui +tar
+
+constraints: http-io-streams -brotli,
+             any.aeson >= 2.0.1.0,
+             any.hsc2hs ==0.68.8,
+             bzlib-conduit >= 0.3.0.3,
+             bz2 >= 1.0.1.1,
+             bzlib >= 0.5.2.0,
+             directory >= 1.3.8.3,
+             filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0
+
+if os(mingw32)
+  constraints: zlib +bundled-c-zlib,
+               lzma +static,
+               text -simdutf,
+               vty-windows >=0.2.0.2
+
+  if impl(ghc >= 9.4)
+    constraints: language-c >= 0.9.3
+
+
+source-repository-package
+  type: git
+  location: https://github.com/haskell/tar.git
+  tag: d94a988be4311b830149a9f8fc16739927e5fc1c
+
+source-repository-package
+  type: git
+  location: https://github.com/hasufell/uri-bytestring.git
+  tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001
+
+package libarchive
+  flags: -system-libarchive
+
+package aeson-pretty
+  flags: +lib-only
+
+package cabal-plan
+  flags: -exe
+
+package aeson
+  flags: +ordered-keymap
+
+package streamly
+  flags: +use-unliftio
+
+package *
+  test-show-details: direct
+
+allow-newer: cabal-install-parsers:tar, streamly:Win32
+
+
--- a/cabal.ghc902.Win32.project.freeze
+++ b/cabal.ghc902.Win32.project.freeze
@@ -0,0 +1,258 @@
+active-repositories: hackage.haskell.org:merge
+constraints: any.Cabal ==3.10.2.1,
+             any.Cabal-syntax ==3.10.2.0,
+             any.HUnit ==1.6.2.0,
+             any.OneTuple ==0.4.1.1,
+             any.QuickCheck ==2.14.3,
+             QuickCheck -old-random +templatehaskell,
+             any.StateVar ==1.2.2,
+             any.Win32 ==2.12.0.1 || ==2.13.4.0,
+             any.abstract-deque ==0.3,
+             abstract-deque -usecas,
+             any.aeson ==2.2.1.0,
+             aeson +ordered-keymap,
+             any.aeson-pretty ==0.8.10,
+             aeson-pretty +lib-only,
+             any.alex ==3.5.1.0,
+             any.ansi-terminal ==1.0.2,
+             ansi-terminal -example,
+             any.ansi-terminal-types ==0.11.5,
+             any.ansi-wl-pprint ==0.6.9,
+             ansi-wl-pprint -example,
+             any.array ==0.5.4.0,
+             any.assoc ==1.1,
+             assoc +tagged,
+             any.async ==2.2.5,
+             async -bench,
+             any.atomic-primops ==0.8.5,
+             atomic-primops -debug,
+             any.attoparsec ==0.14.4,
+             attoparsec -developer,
+             any.base ==4.15.1.0,
+             any.base-compat ==0.13.1,
+             any.base-orphans ==0.9.1,
+             any.base16-bytestring ==1.0.2.0,
+             any.bifunctors ==5.6.1,
+             bifunctors +tagged,
+             any.bimap ==0.5.0,
+             any.binary ==0.8.9.1,
+             any.binary-instances ==1.0.4,
+             any.binary-orphans ==1.0.4.1,
+             any.bindings-DSL ==1.0.25,
+             any.bitvec ==1.1.5.0,
+             bitvec +simd,
+             any.blaze-builder ==0.4.2.3,
+             any.brick ==2.1.1,
+             brick -demos,
+             any.bytestring ==0.11.5.3,
+             any.bz2 ==1.0.1.1,
+             bz2 -cross +with-bzlib,
+             any.bzip2-clib ==1.0.8,
+             any.bzlib-conduit ==0.3.0.3,
+             any.c2hs ==0.28.8,
+             c2hs +base3 -regression,
+             any.cabal-install-parsers ==0.6.1.1,
+             any.cabal-plan ==0.7.3.0,
+             cabal-plan -_ -exe -license-report,
+             any.call-stack ==0.4.0,
+             any.case-insensitive ==1.2.1.0,
+             any.casing ==0.1.4.1,
+             any.cereal ==0.5.8.3,
+             cereal -bytestring-builder,
+             any.colour ==2.3.6,
+             any.comonad ==5.0.8,
+             comonad +containers +distributive +indexed-traversable,
+             any.conduit ==1.3.5,
+             any.conduit-extra ==1.3.6,
+             any.conduit-zstd ==0.0.2.0,
+             any.config-ini ==0.2.7.0,
+             config-ini -enable-doctests,
+             any.containers ==0.6.4.1,
+             any.contravariant ==1.5.5,
+             contravariant +semigroups +statevar +tagged,
+             any.cryptohash-sha256 ==0.11.102.1,
+             cryptohash-sha256 -exe +use-cbits,
+             any.data-array-byte ==0.1.0.1,
+             any.data-clist ==0.2,
+             any.data-default-class ==0.1.2.0,
+             any.data-fix ==0.3.2,
+             any.deepseq ==1.4.5.0,
+             any.digest ==0.0.2.1,
+             digest -have_arm64_crc32c -have_builtin_prefetch -have_mm_prefetch -have_sse42 -have_strong_getauxval -have_weak_getauxval +pkg-config,
+             any.directory ==1.3.6.2 || ==1.3.8.3,
+             directory -os-string,
+             any.disk-free-space ==0.1.0.1,
+             any.distributive ==0.6.2.1,
+             distributive +semigroups +tagged,
+             any.dlist ==1.0,
+             dlist -werror,
+             any.exceptions ==0.10.4,
+             any.file-uri ==0.1.0.0,
+             any.filepath ==1.4.2.1 || ==1.4.101.0,
+             filepath -cpphs,
+             any.foldable1-classes-compat ==0.1,
+             foldable1-classes-compat +tagged,
+             any.free ==5.2,
+             any.fusion-plugin-types ==0.1.0,
+             any.generic-arbitrary ==0.2.2,
+             any.generically ==0.1.1,
+             any.ghc-bignum ==1.1,
+             any.ghc-boot-th ==9.0.2,
+             any.ghc-prim ==0.7.0,
+             any.happy ==1.20.1.1,
+             any.hashable ==1.4.3.0,
+             hashable +integer-gmp -random-initial-seed,
+             any.haskell-lexer ==1.1.1,
+             any.haskus-utils-data ==1.4,
+             any.haskus-utils-types ==1.5.1,
+             any.haskus-utils-variant ==3.3,
+             any.heaps ==0.4,
+             any.hsc2hs ==0.68.8,
+             hsc2hs -in-ghc-tree,
+             any.hspec ==2.10.10,
+             any.hspec-core ==2.10.10,
+             any.hspec-discover ==2.10.10,
+             any.hspec-expectations ==0.8.2,
+             any.hspec-golden-aeson ==0.9.0.0,
+             any.indexed-profunctors ==0.1.1.1,
+             any.indexed-traversable ==0.1.3,
+             any.indexed-traversable-instances ==0.1.1.2,
+             any.integer-conversion ==0.1.0.1,
+             any.integer-logarithms ==1.0.3.1,
+             integer-logarithms -check-bounds +integer-gmp,
+             any.language-c ==0.9.3,
+             language-c -allwarnings +iecfpextension +usebytestrings,
+             any.libyaml-clib ==0.2.5,
+             any.libyaml-streamly ==0.2.2.1,
+             libyaml-streamly -no-unicode -system-libyaml,
+             any.lockfree-queue ==0.2.4,
+             any.lukko ==0.1.1.3,
+             lukko +ofd-locking,
+             any.lzma-static ==5.2.5.5,
+             any.megaparsec ==9.2.2,
+             megaparsec -dev,
+             any.microlens ==0.4.13.1,
+             any.microlens-mtl ==0.2.0.3,
+             any.microlens-th ==0.4.3.14,
+             any.monad-control ==1.0.3.1,
+             any.mono-traversable ==1.0.17.0,
+             any.mtl ==2.2.2,
+             any.mtl-compat ==0.2.2,
+             mtl-compat -two-point-one -two-point-two,
+             any.network ==3.1.4.0,
+             network -devel,
+             any.network-uri ==2.6.4.2,
+             any.optics ==0.4.2.1,
+             any.optics-core ==0.4.1.1,
+             optics-core -explicit-generic-labels,
+             any.optics-extra ==0.4.2.1,
+             any.optics-th ==0.4.1,
+             any.optparse-applicative ==0.17.1.0,
+             optparse-applicative +process,
+             any.os-release ==1.0.2.1,
+             os-release -devel,
+             any.parsec ==3.1.17.0,
+             any.parser-combinators ==1.3.0,
+             parser-combinators -dev,
+             any.pretty ==1.1.3.6,
+             any.pretty-terminal ==0.1.0.0,
+             any.primitive ==0.8.0.0,
+             any.process ==1.6.13.2 || ==1.6.18.0,
+             any.profunctors ==5.6.2,
+             any.quickcheck-arbitrary-adt ==0.3.1.0,
+             any.quickcheck-io ==0.2.0,
+             any.random ==1.2.1.2,
+             any.recursion-schemes ==5.2.2.5,
+             recursion-schemes +template-haskell,
+             any.regex-base ==0.94.0.2,
+             any.regex-posix ==0.96.0.1,
+             regex-posix -_regex-posix-clib,
+             any.regex-posix-clib ==2.7,
+             any.resourcet ==1.2.6,
+             any.retry ==0.9.3.1,
+             retry -lib-werror,
+             any.rts ==1.0.2,
+             any.safe ==0.3.21,
+             any.safe-exceptions ==0.1.7.4,
+             any.scientific ==0.3.7.0,
+             scientific -bytestring-builder -integer-simple,
+             any.semialign ==1.3,
+             semialign +semigroupoids,
+             any.semigroupoids ==6.0.0.1,
+             semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers,
+             any.setenv ==0.1.1.3,
+             any.split ==0.2.5,
+             any.splitmix ==0.1.0.5,
+             splitmix -optimised-mixer,
+             any.stm ==2.5.0.0,
+             any.streaming-commons ==0.2.2.6,
+             streaming-commons -use-bytestring-builder,
+             any.streamly ==0.8.3,
+             streamly -debug -dev -fusion-plugin -has-llvm -inspection -limit-build-mem -no-fusion +opt -streamk -streamly-core -use-c-malloc +use-unliftio,
+             any.strict ==0.5,
+             any.strict-base ==0.4.0.0,
+             any.tagged ==0.8.8,
+             tagged +deepseq +transformers,
+             any.tagsoup ==0.14.8,
+             any.tar ==0.6.0.0,
+             any.tasty ==1.5,
+             tasty +unix,
+             any.tasty-hunit ==0.10.1,
+             any.template-haskell ==2.17.0.0,
+             any.temporary ==1.3,
+             any.text ==2.0.2,
+             text -developer -simdutf,
+             any.text-binary ==0.2.1.1,
+             any.text-iso8601 ==0.1,
+             any.text-short ==0.1.5,
+             text-short -asserts,
+             any.text-zipper ==0.13,
+             any.tf-random ==0.5,
+             any.th-abstraction ==0.6.0.0,
+             any.th-compat ==0.1.4,
+             any.th-lift ==0.8.4,
+             any.th-lift-instances ==0.1.20,
+             any.these ==1.2,
+             any.time ==1.9.3 || ==1.11.1.2,
+             any.time-compat ==1.9.6.1,
+             time-compat -old-locale,
+             any.transformers ==0.5.6.2,
+             any.transformers-base ==0.4.6,
+             transformers-base +orphaninstances,
+             any.transformers-compat ==0.7.2,
+             transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
+             any.typed-process ==0.2.11.1,
+             any.unicode-data ==0.3.1,
+             unicode-data -ucd2haskell,
+             any.unix-compat ==0.7.1,
+             unix-compat -old-time,
+             any.unliftio-core ==0.2.1.0,
+             any.unordered-containers ==0.2.20,
+             unordered-containers -debug,
+             any.uri-bytestring ==0.3.3.1,
+             uri-bytestring -lib-werror,
+             any.utf8-string ==1.0.2,
+             any.uuid-types ==1.0.5.1,
+             any.vector ==0.13.1.0,
+             vector +boundschecks -internalchecks -unsafechecks -wall,
+             any.vector-algorithms ==0.9.0.1,
+             vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks,
+             any.vector-binary-instances ==0.2.5.2,
+             any.vector-stream ==0.1.0.1,
+             any.versions ==6.0.6,
+             any.vty ==6.2,
+             any.vty-crossplatform ==0.4.0.0,
+             vty-crossplatform -demos,
+             any.vty-windows ==0.2.0.2,
+             any.witherable ==0.4.2,
+             any.word-wrap ==0.5,
+             any.word8 ==0.1.3,
+             any.yaml-streamly ==0.12.4,
+             yaml-streamly +no-examples +no-exe,
+             any.zip ==2.0.0,
+             zip -dev -disable-bzip2 -disable-zstd,
+             any.zlib ==0.6.3.0,
+             zlib +bundled-c-zlib -non-blocking-ffi -pkg-config,
+             any.zstd ==0.1.3.0,
+             zstd +standalone
+index-state: hackage.haskell.org 2024-03-15T23:51:46Z
--- a/cabal.ghc902.project
+++ b/cabal.ghc902.project
@@ -1,50 +1,8 @@
-packages: ./ghcup.cabal
-
-optional-packages: ./vendored/*/*.cabal
-
-if impl(ghc < 9.0)
-    package ghcup
-        flags: +tui -tar
-else
-    package ghcup
-        flags: +tui +tar
-
-constraints: http-io-streams -brotli,
-             any.aeson >= 2.0.1.0
-
 if os(mingw32)
-  if impl(ghc >= 9.4)
-    constraints: language-c >= 0.9.3
-
-source-repository-package
-  type: git
-  location: https://github.com/haskell/tar.git
-  tag: d94a988be4311b830149a9f8fc16739927e5fc1c
-
-source-repository-package
-  type: git
-  location: https://github.com/hasufell/uri-bytestring.git
-  tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001
-
-package libarchive
-  flags: -system-libarchive
-
-package aeson-pretty
-  flags: +lib-only
-
-package cabal-plan
-  flags: -exe
-
-package aeson
-  flags: +ordered-keymap
-
-package streamly
-  flags: +use-unliftio
-
-package *
-  test-show-details: direct
-
-allow-newer: cabal-install-parsers:tar, streamly:Win32
-
+  import: cabal.ghc902.Win32.project
+  import: cabal.ghc902.Win32.project.freeze
+else
+  import: cabal.ghc902.Unix.project
+  import: cabal.ghc902.Unix.project.freeze

 with-compiler: ghc-9.0.2
--- a/cabal.ghc928.Unix.project
+++ b/cabal.ghc928.Unix.project
@@ -0,0 +1,60 @@
+packages: ./ghcup.cabal
+
+optional-packages: ./vendored/*/*.cabal
+
+if impl(ghc < 9.0)
+    package ghcup
+        flags: +tui -tar
+else
+    package ghcup
+        flags: +tui +tar
+
+constraints: http-io-streams -brotli,
+             any.aeson >= 2.0.1.0,
+             any.hsc2hs ==0.68.8,
+             bzlib-conduit >= 0.3.0.3,
+             bz2 >= 1.0.1.1,
+             bzlib >= 0.5.2.0,
+             directory >= 1.3.8.3,
+             filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0
+
+if os(mingw32)
+  constraints: zlib +bundled-c-zlib,
+               lzma +static,
+               text -simdutf,
+               vty-windows >=0.2.0.2
+
+  if impl(ghc >= 9.4)
+    constraints: language-c >= 0.9.3
+
+
+source-repository-package
+  type: git
+  location: https://github.com/haskell/tar.git
+  tag: d94a988be4311b830149a9f8fc16739927e5fc1c
+
+source-repository-package
+  type: git
+  location: https://github.com/hasufell/uri-bytestring.git
+  tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001
+
+package libarchive
+  flags: -system-libarchive
+
+package aeson-pretty
+  flags: +lib-only
+
+package cabal-plan
+  flags: -exe
+
+package aeson
+  flags: +ordered-keymap
+
+package streamly
+  flags: +use-unliftio
+
+package *
+  test-show-details: direct
+
+allow-newer: cabal-install-parsers:tar, streamly:Win32
+
--- a/cabal.ghc928.Unix.project.freeze
+++ b/cabal.ghc928.Unix.project.freeze
@@ -14,7 +14,7 @@ constraints: any.Cabal ==3.10.2.1,
             aeson +ordered-keymap,
             any.aeson-pretty ==0.8.10,
             aeson-pretty +lib-only,
-             any.alex ==3.5.0.0,
+             any.alex ==3.5.1.0,
             any.ansi-terminal ==1.0.2,
             ansi-terminal -example,
             any.ansi-terminal-types ==0.11.5,
@@ -47,9 +47,10 @@ constraints: any.Cabal ==3.10.2.1,
             any.brick ==2.1.1,
             brick -demos,
             any.bytestring ==0.11.4.0,
-             any.bz2 ==1.0.1.0,
+             any.bz2 ==1.0.1.1,
             bz2 -cross +with-bzlib,
-             any.bzlib-conduit ==0.3.0.2,
+             any.bzip2-clib ==1.0.8,
+             any.bzlib-conduit ==0.3.0.3,
             any.c2hs ==0.28.8,
             c2hs +base3 -regression,
             any.cabal-install-parsers ==0.6.1.1,
@@ -81,7 +82,8 @@ constraints: any.Cabal ==3.10.2.1,
             any.deepseq ==1.4.6.1,
             any.digest ==0.0.2.1,
             digest -have_arm64_crc32c -have_builtin_prefetch -have_mm_prefetch -have_sse42 -have_strong_getauxval -have_weak_getauxval +pkg-config,
-             any.directory ==1.3.7.1,
+             any.directory ==1.3.8.3,
+             directory -os-string,
             any.disk-free-space ==0.1.0.1,
             any.distributive ==0.6.2.1,
             distributive +semigroups +tagged,
@@ -89,7 +91,7 @@ constraints: any.Cabal ==3.10.2.1,
             dlist -werror,
             any.exceptions ==0.10.4,
             any.file-uri ==0.1.0.0,
-             any.filepath ==1.4.300.1,
+             any.filepath ==1.4.101.0,
             filepath -cpphs,
             any.foldable1-classes-compat ==0.1,
             foldable1-classes-compat +tagged,
@@ -109,7 +111,7 @@ constraints: any.Cabal ==3.10.2.1,
             any.haskus-utils-types ==1.5.1,
             any.haskus-utils-variant ==3.3,
             any.heaps ==0.4,
-             any.hsc2hs ==0.68.10,
+             any.hsc2hs ==0.68.8,
             hsc2hs -in-ghc-tree,
             any.hspec ==2.10.10,
             any.hspec-core ==2.10.10,
@@ -128,8 +130,8 @@ constraints: any.Cabal ==3.10.2.1,
             io-streams +network -nointeractivetests +zlib,
             any.language-c ==0.9.3,
             language-c -allwarnings +iecfpextension +usebytestrings,
-             any.libyaml-streamly ==0.2.2,
-             libyaml-streamly -no-unicode -system-libyaml,
+             any.libyaml-streamly ==0.2.2.1,
+             libyaml-streamly -no-unicode +system-libyaml,
             any.lockfree-queue ==0.2.4,
             any.lukko ==0.1.1.3,
             lukko +ofd-locking,
@@ -140,7 +142,7 @@ constraints: any.Cabal ==3.10.2.1,
             any.microlens-mtl ==0.2.0.3,
             any.microlens-th ==0.4.3.14,
             any.monad-control ==1.0.3.1,
-             any.mono-traversable ==1.0.15.3,
+             any.mono-traversable ==1.0.17.0,
             any.mtl ==2.2.2,
             any.mtl-compat ==0.2.2,
             mtl-compat -two-point-one -two-point-two,
@@ -232,7 +234,8 @@ constraints: any.Cabal ==3.10.2.1,
             any.typed-process ==0.2.11.1,
             any.unicode-data ==0.3.1,
             unicode-data -ucd2haskell,
-             any.unix ==2.7.2.2,
+             any.unix ==2.8.5.0,
+             unix -os-string,
             any.unix-bytestring ==0.3.7.8,
             any.unix-compat ==0.7.1,
             unix-compat -old-time,
@@ -249,7 +252,7 @@ constraints: any.Cabal ==3.10.2.1,
             vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks,
             any.vector-binary-instances ==0.2.5.2,
             any.vector-stream ==0.1.0.1,
-             any.versions ==6.0.5,
+             any.versions ==6.0.6,
             any.vty ==6.2,
             any.vty-crossplatform ==0.4.0.0,
             vty-crossplatform -demos,
@@ -267,4 +270,4 @@ constraints: any.Cabal ==3.10.2.1,
             any.zlib-bindings ==0.1.1.5,
             any.zstd ==0.1.3.0,
             zstd +standalone
-index-state: hackage.haskell.org 2024-02-18T14:07:35Z
+index-state: hackage.haskell.org 2024-03-13T09:43:35Z
--- a/cabal.ghc928.Win32.project
+++ b/cabal.ghc928.Win32.project
@@ -0,0 +1,60 @@
+packages: ./ghcup.cabal
+
+optional-packages: ./vendored/*/*.cabal
+
+if impl(ghc < 9.0)
+    package ghcup
+        flags: +tui -tar
+else
+    package ghcup
+        flags: +tui +tar
+
+constraints: http-io-streams -brotli,
+             any.aeson >= 2.0.1.0,
+             any.hsc2hs ==0.68.8,
+             bzlib-conduit >= 0.3.0.3,
+             bz2 >= 1.0.1.1,
+             bzlib >= 0.5.2.0,
+             directory >= 1.3.8.3,
+             filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0
+
+if os(mingw32)
+  constraints: zlib +bundled-c-zlib,
+               lzma +static,
+               text -simdutf,
+               vty-windows >=0.2.0.2
+
+  if impl(ghc >= 9.4)
+    constraints: language-c >= 0.9.3
+
+
+source-repository-package
+  type: git
+  location: https://github.com/haskell/tar.git
+  tag: d94a988be4311b830149a9f8fc16739927e5fc1c
+
+source-repository-package
+  type: git
+  location: https://github.com/hasufell/uri-bytestring.git
+  tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001
+
+package libarchive
+  flags: -system-libarchive
+
+package aeson-pretty
+  flags: +lib-only
+
+package cabal-plan
+  flags: -exe
+
+package aeson
+  flags: +ordered-keymap
+
+package streamly
+  flags: +use-unliftio
+
+package *
+  test-show-details: direct
+
+allow-newer: cabal-install-parsers:tar, streamly:Win32
+
--- a/cabal.ghc928.Win32.project.freeze
+++ b/cabal.ghc928.Win32.project.freeze
@@ -0,0 +1,258 @@
+active-repositories: hackage.haskell.org:merge
+constraints: any.Cabal ==3.10.2.1,
+             any.Cabal-syntax ==3.10.2.0,
+             any.HUnit ==1.6.2.0,
+             any.OneTuple ==0.4.1.1,
+             any.QuickCheck ==2.14.3,
+             QuickCheck -old-random +templatehaskell,
+             any.StateVar ==1.2.2,
+             any.Win32 ==2.12.0.1 || ==2.13.4.0,
+             any.abstract-deque ==0.3,
+             abstract-deque -usecas,
+             any.aeson ==2.2.1.0,
+             aeson +ordered-keymap,
+             any.aeson-pretty ==0.8.10,
+             aeson-pretty +lib-only,
+             any.alex ==3.5.1.0,
+             any.ansi-terminal ==1.0.2,
+             ansi-terminal -example,
+             any.ansi-terminal-types ==0.11.5,
+             any.ansi-wl-pprint ==0.6.9,
+             ansi-wl-pprint -example,
+             any.array ==0.5.4.0,
+             any.assoc ==1.1,
+             assoc +tagged,
+             any.async ==2.2.5,
+             async -bench,
+             any.atomic-primops ==0.8.5,
+             atomic-primops -debug,
+             any.attoparsec ==0.14.4,
+             attoparsec -developer,
+             any.base ==4.16.4.0,
+             any.base-compat ==0.13.1,
+             any.base-orphans ==0.9.1,
+             any.base16-bytestring ==1.0.2.0,
+             any.bifunctors ==5.6.1,
+             bifunctors +tagged,
+             any.bimap ==0.5.0,
+             any.binary ==0.8.9.0,
+             any.binary-instances ==1.0.4,
+             any.binary-orphans ==1.0.4.1,
+             any.bindings-DSL ==1.0.25,
+             any.bitvec ==1.1.5.0,
+             bitvec +simd,
+             any.blaze-builder ==0.4.2.3,
+             any.brick ==2.1.1,
+             brick -demos,
+             any.bytestring ==0.11.4.0,
+             any.bz2 ==1.0.1.1,
+             bz2 -cross +with-bzlib,
+             any.bzip2-clib ==1.0.8,
+             any.bzlib-conduit ==0.3.0.3,
+             any.c2hs ==0.28.8,
+             c2hs +base3 -regression,
+             any.cabal-install-parsers ==0.6.1.1,
+             any.cabal-plan ==0.7.3.0,
+             cabal-plan -_ -exe -license-report,
+             any.call-stack ==0.4.0,
+             any.case-insensitive ==1.2.1.0,
+             any.casing ==0.1.4.1,
+             any.cereal ==0.5.8.3,
+             cereal -bytestring-builder,
+             any.colour ==2.3.6,
+             any.comonad ==5.0.8,
+             comonad +containers +distributive +indexed-traversable,
+             any.conduit ==1.3.5,
+             any.conduit-extra ==1.3.6,
+             any.conduit-zstd ==0.0.2.0,
+             any.config-ini ==0.2.7.0,
+             config-ini -enable-doctests,
+             any.containers ==0.6.5.1,
+             any.contravariant ==1.5.5,
+             contravariant +semigroups +statevar +tagged,
+             any.cryptohash-sha256 ==0.11.102.1,
+             cryptohash-sha256 -exe +use-cbits,
+             any.data-array-byte ==0.1.0.1,
+             any.data-clist ==0.2,
+             any.data-default-class ==0.1.2.0,
+             any.data-fix ==0.3.2,
+             any.deepseq ==1.4.6.1,
+             any.digest ==0.0.2.1,
+             digest -have_arm64_crc32c -have_builtin_prefetch -have_mm_prefetch -have_sse42 -have_strong_getauxval -have_weak_getauxval +pkg-config,
+             any.directory ==1.3.6.2 || ==1.3.8.3,
+             directory -os-string,
+             any.disk-free-space ==0.1.0.1,
+             any.distributive ==0.6.2.1,
+             distributive +semigroups +tagged,
+             any.dlist ==1.0,
+             dlist -werror,
+             any.exceptions ==0.10.4,
+             any.file-uri ==0.1.0.0,
+             any.filepath ==1.4.2.2 || ==1.4.101.0,
+             filepath -cpphs,
+             any.foldable1-classes-compat ==0.1,
+             foldable1-classes-compat +tagged,
+             any.free ==5.2,
+             any.fusion-plugin-types ==0.1.0,
+             any.generic-arbitrary ==0.2.2,
+             any.generically ==0.1.1,
+             any.ghc-bignum ==1.2,
+             any.ghc-boot-th ==9.2.8,
+             any.ghc-prim ==0.8.0,
+             any.happy ==1.20.1.1,
+             any.hashable ==1.4.3.0,
+             hashable +integer-gmp -random-initial-seed,
+             any.haskell-lexer ==1.1.1,
+             any.haskus-utils-data ==1.4,
+             any.haskus-utils-types ==1.5.1,
+             any.haskus-utils-variant ==3.3,
+             any.heaps ==0.4,
+             any.hsc2hs ==0.68.8,
+             hsc2hs -in-ghc-tree,
+             any.hspec ==2.10.10,
+             any.hspec-core ==2.10.10,
+             any.hspec-discover ==2.10.10,
+             any.hspec-expectations ==0.8.2,
+             any.hspec-golden-aeson ==0.9.0.0,
+             any.indexed-profunctors ==0.1.1.1,
+             any.indexed-traversable ==0.1.3,
+             any.indexed-traversable-instances ==0.1.1.2,
+             any.integer-conversion ==0.1.0.1,
+             any.integer-logarithms ==1.0.3.1,
+             integer-logarithms -check-bounds +integer-gmp,
+             any.language-c ==0.9.3,
+             language-c -allwarnings +iecfpextension +usebytestrings,
+             any.libyaml-clib ==0.2.5,
+             any.libyaml-streamly ==0.2.2.1,
+             libyaml-streamly -no-unicode -system-libyaml,
+             any.lockfree-queue ==0.2.4,
+             any.lukko ==0.1.1.3,
+             lukko +ofd-locking,
+             any.lzma-static ==5.2.5.5,
+             any.megaparsec ==9.2.2,
+             megaparsec -dev,
+             any.microlens ==0.4.13.1,
+             any.microlens-mtl ==0.2.0.3,
+             any.microlens-th ==0.4.3.14,
+             any.monad-control ==1.0.3.1,
+             any.mono-traversable ==1.0.17.0,
+             any.mtl ==2.2.2,
+             any.mtl-compat ==0.2.2,
+             mtl-compat -two-point-one -two-point-two,
+             any.network ==3.1.4.0,
+             network -devel,
+             any.network-uri ==2.6.4.2,
+             any.optics ==0.4.2.1,
+             any.optics-core ==0.4.1.1,
+             optics-core -explicit-generic-labels,
+             any.optics-extra ==0.4.2.1,
+             any.optics-th ==0.4.1,
+             any.optparse-applicative ==0.17.1.0,
+             optparse-applicative +process,
+             any.os-release ==1.0.2.1,
+             os-release -devel,
+             any.parsec ==3.1.17.0,
+             any.parser-combinators ==1.3.0,
+             parser-combinators -dev,
+             any.pretty ==1.1.3.6,
+             any.pretty-terminal ==0.1.0.0,
+             any.primitive ==0.8.0.0,
+             any.process ==1.6.16.0 || ==1.6.18.0,
+             any.profunctors ==5.6.2,
+             any.quickcheck-arbitrary-adt ==0.3.1.0,
+             any.quickcheck-io ==0.2.0,
+             any.random ==1.2.1.2,
+             any.recursion-schemes ==5.2.2.5,
+             recursion-schemes +template-haskell,
+             any.regex-base ==0.94.0.2,
+             any.regex-posix ==0.96.0.1,
+             regex-posix -_regex-posix-clib,
+             any.regex-posix-clib ==2.7,
+             any.resourcet ==1.2.6,
+             any.retry ==0.9.3.1,
+             retry -lib-werror,
+             any.rts ==1.0.2,
+             any.safe ==0.3.21,
+             any.safe-exceptions ==0.1.7.4,
+             any.scientific ==0.3.7.0,
+             scientific -bytestring-builder -integer-simple,
+             any.semialign ==1.3,
+             semialign +semigroupoids,
+             any.semigroupoids ==6.0.0.1,
+             semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers,
+             any.setenv ==0.1.1.3,
+             any.split ==0.2.5,
+             any.splitmix ==0.1.0.5,
+             splitmix -optimised-mixer,
+             any.stm ==2.5.0.2,
+             any.streaming-commons ==0.2.2.6,
+             streaming-commons -use-bytestring-builder,
+             any.streamly ==0.8.3,
+             streamly -debug -dev -fusion-plugin -has-llvm -inspection -limit-build-mem -no-fusion +opt -streamk -streamly-core -use-c-malloc +use-unliftio,
+             any.strict ==0.5,
+             any.strict-base ==0.4.0.0,
+             any.tagged ==0.8.8,
+             tagged +deepseq +transformers,
+             any.tagsoup ==0.14.8,
+             any.tar ==0.6.0.0,
+             any.tasty ==1.5,
+             tasty +unix,
+             any.tasty-hunit ==0.10.1,
+             any.template-haskell ==2.18.0.0,
+             any.temporary ==1.3,
+             any.text ==2.0.2,
+             text -developer -simdutf,
+             any.text-binary ==0.2.1.1,
+             any.text-iso8601 ==0.1,
+             any.text-short ==0.1.5,
+             text-short -asserts,
+             any.text-zipper ==0.13,
+             any.tf-random ==0.5,
+             any.th-abstraction ==0.6.0.0,
+             any.th-compat ==0.1.4,
+             any.th-lift ==0.8.4,
+             any.th-lift-instances ==0.1.20,
+             any.these ==1.2,
+             any.time ==1.11.1.1 || ==1.11.1.2,
+             any.time-compat ==1.9.6.1,
+             time-compat -old-locale,
+             any.transformers ==0.5.6.2,
+             any.transformers-base ==0.4.6,
+             transformers-base +orphaninstances,
+             any.transformers-compat ==0.7.2,
+             transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
+             any.typed-process ==0.2.11.1,
+             any.unicode-data ==0.3.1,
+             unicode-data -ucd2haskell,
+             any.unix-compat ==0.7.1,
+             unix-compat -old-time,
+             any.unliftio-core ==0.2.1.0,
+             any.unordered-containers ==0.2.20,
+             unordered-containers -debug,
+             any.uri-bytestring ==0.3.3.1,
+             uri-bytestring -lib-werror,
+             any.utf8-string ==1.0.2,
+             any.uuid-types ==1.0.5.1,
+             any.vector ==0.13.1.0,
+             vector +boundschecks -internalchecks -unsafechecks -wall,
+             any.vector-algorithms ==0.9.0.1,
+             vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks,
+             any.vector-binary-instances ==0.2.5.2,
+             any.vector-stream ==0.1.0.1,
+             any.versions ==6.0.6,
+             any.vty ==6.2,
+             any.vty-crossplatform ==0.4.0.0,
+             vty-crossplatform -demos,
+             any.vty-windows ==0.2.0.2,
+             any.witherable ==0.4.2,
+             any.word-wrap ==0.5,
+             any.word8 ==0.1.3,
+             any.yaml-streamly ==0.12.4,
+             yaml-streamly +no-examples +no-exe,
+             any.zip ==2.0.0,
+             zip -dev -disable-bzip2 -disable-zstd,
+             any.zlib ==0.6.3.0,
+             zlib +bundled-c-zlib -non-blocking-ffi -pkg-config,
+             any.zstd ==0.1.3.0,
+             zstd +standalone
+index-state: hackage.haskell.org 2024-03-15T23:51:46Z
--- a/cabal.ghc928.project
+++ b/cabal.ghc928.project
@@ -1,50 +1,8 @@
-packages: ./ghcup.cabal
-
-optional-packages: ./vendored/*/*.cabal
-
-if impl(ghc < 9.0)
-    package ghcup
-        flags: +tui -tar
-else
-    package ghcup
-        flags: +tui +tar
-
-constraints: http-io-streams -brotli,
-             any.aeson >= 2.0.1.0
-
 if os(mingw32)
-  if impl(ghc >= 9.4)
-    constraints: language-c >= 0.9.3
-
-source-repository-package
-  type: git
-  location: https://github.com/haskell/tar.git
-  tag: d94a988be4311b830149a9f8fc16739927e5fc1c
-
-source-repository-package
-  type: git
-  location: https://github.com/hasufell/uri-bytestring.git
-  tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001
-
-package libarchive
-  flags: -system-libarchive
-
-package aeson-pretty
-  flags: +lib-only
-
-package cabal-plan
-  flags: -exe
-
-package aeson
-  flags: +ordered-keymap
-
-package streamly
-  flags: +use-unliftio
-
-package *
-  test-show-details: direct
-
-allow-newer: cabal-install-parsers:tar, streamly:Win32
-
+  import: cabal.ghc928.Win32.project
+  import: cabal.ghc928.Win32.project.freeze
+else
+  import: cabal.ghc928.Unix.project
+  import: cabal.ghc928.Unix.project.freeze

 with-compiler: ghc-9.2.8
--- a/cabal.ghc948.Unix.project
+++ b/cabal.ghc948.Unix.project
@@ -0,0 +1,60 @@
+packages: ./ghcup.cabal
+
+optional-packages: ./vendored/*/*.cabal
+
+if impl(ghc < 9.0)
+    package ghcup
+        flags: +tui -tar
+else
+    package ghcup
+        flags: +tui +tar
+
+constraints: http-io-streams -brotli,
+             any.aeson >= 2.0.1.0,
+             any.hsc2hs ==0.68.8,
+             bzlib-conduit >= 0.3.0.3,
+             bz2 >= 1.0.1.1,
+             bzlib >= 0.5.2.0,
+             directory >= 1.3.8.3,
+             filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0
+
+if os(mingw32)
+  constraints: zlib +bundled-c-zlib,
+               lzma +static,
+               text -simdutf,
+               vty-windows >=0.2.0.2
+
+  if impl(ghc >= 9.4)
+    constraints: language-c >= 0.9.3
+
+
+source-repository-package
+  type: git
+  location: https://github.com/haskell/tar.git
+  tag: d94a988be4311b830149a9f8fc16739927e5fc1c
+
+source-repository-package
+  type: git
+  location: https://github.com/hasufell/uri-bytestring.git
+  tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001
+
+package libarchive
+  flags: -system-libarchive
+
+package aeson-pretty
+  flags: +lib-only
+
+package cabal-plan
+  flags: -exe
+
+package aeson
+  flags: +ordered-keymap
+
+package streamly
+  flags: +use-unliftio
+
+package *
+  test-show-details: direct
+
+allow-newer: cabal-install-parsers:tar, streamly:Win32
+
--- a/cabal.ghc948.Unix.project.freeze
+++ b/cabal.ghc948.Unix.project.freeze
@@ -14,7 +14,7 @@ constraints: any.Cabal ==3.10.2.1,
             aeson +ordered-keymap,
             any.aeson-pretty ==0.8.10,
             aeson-pretty +lib-only,
-             any.alex ==3.5.0.0,
+             any.alex ==3.5.1.0,
             any.ansi-terminal ==1.0.2,
             ansi-terminal -example,
             any.ansi-terminal-types ==0.11.5,
@@ -47,9 +47,10 @@ constraints: any.Cabal ==3.10.2.1,
             any.brick ==2.1.1,
             brick -demos,
             any.bytestring ==0.11.5.3,
-             any.bz2 ==1.0.1.0,
+             any.bz2 ==1.0.1.1,
             bz2 -cross +with-bzlib,
-             any.bzlib-conduit ==0.3.0.2,
+             any.bzip2-clib ==1.0.8,
+             any.bzlib-conduit ==0.3.0.3,
             any.c2hs ==0.28.8,
             c2hs +base3 -regression,
             any.cabal-install-parsers ==0.6.1.1,
@@ -80,7 +81,8 @@ constraints: any.Cabal ==3.10.2.1,
             any.deepseq ==1.4.8.0,
             any.digest ==0.0.2.1,
             digest -have_arm64_crc32c -have_builtin_prefetch -have_mm_prefetch -have_sse42 -have_strong_getauxval -have_weak_getauxval +pkg-config,
-             any.directory ==1.3.8.1,
+             any.directory ==1.3.8.3,
+             directory -os-string,
             any.disk-free-space ==0.1.0.1,
             any.distributive ==0.6.2.1,
             distributive +semigroups +tagged,
@@ -88,7 +90,7 @@ constraints: any.Cabal ==3.10.2.1,
             dlist -werror,
             any.exceptions ==0.10.5,
             any.file-uri ==0.1.0.0,
-             any.filepath ==1.4.300.1,
+             any.filepath ==1.4.101.0,
             filepath -cpphs,
             any.foldable1-classes-compat ==0.1,
             foldable1-classes-compat +tagged,
@@ -108,7 +110,7 @@ constraints: any.Cabal ==3.10.2.1,
             any.haskus-utils-types ==1.5.1,
             any.haskus-utils-variant ==3.3,
             any.heaps ==0.4,
-             any.hsc2hs ==0.68.10,
+             any.hsc2hs ==0.68.8,
             hsc2hs -in-ghc-tree,
             any.hspec ==2.10.10,
             any.hspec-core ==2.10.10,
@@ -127,8 +129,8 @@ constraints: any.Cabal ==3.10.2.1,
             io-streams +network -nointeractivetests +zlib,
             any.language-c ==0.9.3,
             language-c -allwarnings +iecfpextension +usebytestrings,
-             any.libyaml-streamly ==0.2.2,
-             libyaml-streamly -no-unicode -system-libyaml,
+             any.libyaml-streamly ==0.2.2.1,
+             libyaml-streamly -no-unicode +system-libyaml,
             any.lockfree-queue ==0.2.4,
             any.lukko ==0.1.1.3,
             lukko +ofd-locking,
@@ -139,7 +141,7 @@ constraints: any.Cabal ==3.10.2.1,
             any.microlens-mtl ==0.2.0.3,
             any.microlens-th ==0.4.3.14,
             any.monad-control ==1.0.3.1,
-             any.mono-traversable ==1.0.15.3,
+             any.mono-traversable ==1.0.17.0,
             any.mtl ==2.2.2,
             any.mtl-compat ==0.2.2,
             mtl-compat -two-point-one -two-point-two,
@@ -248,7 +250,7 @@ constraints: any.Cabal ==3.10.2.1,
             vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks,
             any.vector-binary-instances ==0.2.5.2,
             any.vector-stream ==0.1.0.1,
-             any.versions ==6.0.5,
+             any.versions ==6.0.6,
             any.vty ==6.2,
             any.vty-crossplatform ==0.4.0.0,
             vty-crossplatform -demos,
@@ -266,4 +268,4 @@ constraints: any.Cabal ==3.10.2.1,
             any.zlib-bindings ==0.1.1.5,
             any.zstd ==0.1.3.0,
             zstd +standalone
-index-state: hackage.haskell.org 2024-02-18T14:07:35Z
+index-state: hackage.haskell.org 2024-03-13T09:43:35Z
--- a/cabal.ghc948.Win32.project
+++ b/cabal.ghc948.Win32.project
@@ -0,0 +1,61 @@
+packages: ./ghcup.cabal
+
+optional-packages: ./vendored/*/*.cabal
+
+if impl(ghc < 9.0)
+    package ghcup
+        flags: +tui -tar
+else
+    package ghcup
+        flags: +tui +tar
+
+constraints: http-io-streams -brotli,
+             any.aeson >= 2.0.1.0,
+             any.hsc2hs ==0.68.8,
+             bzlib-conduit >= 0.3.0.3,
+             bz2 >= 1.0.1.1,
+             bzlib >= 0.5.2.0,
+             directory >= 1.3.8.3,
+             filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0
+
+if os(mingw32)
+  constraints: zlib +bundled-c-zlib,
+               lzma +static,
+               text -simdutf,
+               vty-windows >=0.2.0.2
+
+  if impl(ghc >= 9.4)
+    constraints: language-c >= 0.9.3
+
+
+source-repository-package
+  type: git
+  location: https://github.com/haskell/tar.git
+  tag: d94a988be4311b830149a9f8fc16739927e5fc1c
+
+source-repository-package
+  type: git
+  location: https://github.com/hasufell/uri-bytestring.git
+  tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001
+
+package libarchive
+  flags: -system-libarchive
+
+package aeson-pretty
+  flags: +lib-only
+
+package cabal-plan
+  flags: -exe
+
+package aeson
+  flags: +ordered-keymap
+
+package streamly
+  flags: +use-unliftio
+
+package *
+  test-show-details: direct
+
+allow-newer: cabal-install-parsers:tar, streamly:Win32
+
+
--- a/cabal.ghc948.Win32.project.freeze
+++ b/cabal.ghc948.Win32.project.freeze
@@ -0,0 +1,256 @@
+active-repositories: hackage.haskell.org:merge
+constraints: any.Cabal ==3.10.2.1,
+             any.Cabal-syntax ==3.10.2.0,
+             any.HUnit ==1.6.2.0,
+             any.OneTuple ==0.4.1.1,
+             any.QuickCheck ==2.14.3,
+             QuickCheck -old-random +templatehaskell,
+             any.StateVar ==1.2.2,
+             any.Win32 ==2.12.0.1 || ==2.13.4.0,
+             any.abstract-deque ==0.3,
+             abstract-deque -usecas,
+             any.aeson ==2.2.1.0,
+             aeson +ordered-keymap,
+             any.aeson-pretty ==0.8.10,
+             aeson-pretty +lib-only,
+             any.alex ==3.5.1.0,
+             any.ansi-terminal ==1.0.2,
+             ansi-terminal -example,
+             any.ansi-terminal-types ==0.11.5,
+             any.ansi-wl-pprint ==0.6.9,
+             ansi-wl-pprint -example,
+             any.array ==0.5.4.0,
+             any.assoc ==1.1,
+             assoc +tagged,
+             any.async ==2.2.5,
+             async -bench,
+             any.atomic-primops ==0.8.5,
+             atomic-primops -debug,
+             any.attoparsec ==0.14.4,
+             attoparsec -developer,
+             any.base ==4.17.2.1,
+             any.base-compat ==0.13.1,
+             any.base-orphans ==0.9.1,
+             any.base16-bytestring ==1.0.2.0,
+             any.bifunctors ==5.6.1,
+             bifunctors +tagged,
+             any.bimap ==0.5.0,
+             any.binary ==0.8.9.1,
+             any.binary-instances ==1.0.4,
+             any.binary-orphans ==1.0.4.1,
+             any.bindings-DSL ==1.0.25,
+             any.bitvec ==1.1.5.0,
+             bitvec +simd,
+             any.blaze-builder ==0.4.2.3,
+             any.brick ==2.1.1,
+             brick -demos,
+             any.bytestring ==0.11.5.3,
+             any.bz2 ==1.0.1.1,
+             bz2 -cross +with-bzlib,
+             any.bzip2-clib ==1.0.8,
+             any.bzlib-conduit ==0.3.0.3,
+             any.c2hs ==0.28.8,
+             c2hs +base3 -regression,
+             any.cabal-install-parsers ==0.6.1.1,
+             any.cabal-plan ==0.7.3.0,
+             cabal-plan -_ -exe -license-report,
+             any.call-stack ==0.4.0,
+             any.case-insensitive ==1.2.1.0,
+             any.casing ==0.1.4.1,
+             any.cereal ==0.5.8.3,
+             cereal -bytestring-builder,
+             any.colour ==2.3.6,
+             any.comonad ==5.0.8,
+             comonad +containers +distributive +indexed-traversable,
+             any.conduit ==1.3.5,
+             any.conduit-extra ==1.3.6,
+             any.conduit-zstd ==0.0.2.0,
+             any.config-ini ==0.2.7.0,
+             config-ini -enable-doctests,
+             any.containers ==0.6.7,
+             any.contravariant ==1.5.5,
+             contravariant +semigroups +statevar +tagged,
+             any.cryptohash-sha256 ==0.11.102.1,
+             cryptohash-sha256 -exe +use-cbits,
+             any.data-clist ==0.2,
+             any.data-default-class ==0.1.2.0,
+             any.data-fix ==0.3.2,
+             any.deepseq ==1.4.8.0,
+             any.digest ==0.0.2.1,
+             digest -have_arm64_crc32c -have_builtin_prefetch -have_mm_prefetch -have_sse42 -have_strong_getauxval -have_weak_getauxval +pkg-config,
+             any.directory ==1.3.7.1 || ==1.3.8.3,
+             directory -os-string,
+             any.disk-free-space ==0.1.0.1,
+             any.distributive ==0.6.2.1,
+             distributive +semigroups +tagged,
+             any.dlist ==1.0,
+             dlist -werror,
+             any.exceptions ==0.10.5,
+             any.file-uri ==0.1.0.0,
+             any.filepath ==1.4.2.2 || ==1.4.101.0,
+             filepath -cpphs,
+             any.foldable1-classes-compat ==0.1,
+             foldable1-classes-compat +tagged,
+             any.free ==5.2,
+             any.fusion-plugin-types ==0.1.0,
+             any.generic-arbitrary ==0.2.2,
+             any.generically ==0.1.1,
+             any.ghc-bignum ==1.3,
+             any.ghc-boot-th ==9.4.8,
+             any.ghc-prim ==0.9.1,
+             any.happy ==1.20.1.1,
+             any.hashable ==1.4.3.0,
+             hashable +integer-gmp -random-initial-seed,
+             any.haskell-lexer ==1.1.1,
+             any.haskus-utils-data ==1.4,
+             any.haskus-utils-types ==1.5.1,
+             any.haskus-utils-variant ==3.3,
+             any.heaps ==0.4,
+             any.hsc2hs ==0.68.8,
+             hsc2hs -in-ghc-tree,
+             any.hspec ==2.10.10,
+             any.hspec-core ==2.10.10,
+             any.hspec-discover ==2.10.10,
+             any.hspec-expectations ==0.8.2,
+             any.hspec-golden-aeson ==0.9.0.0,
+             any.indexed-profunctors ==0.1.1.1,
+             any.indexed-traversable ==0.1.3,
+             any.indexed-traversable-instances ==0.1.1.2,
+             any.integer-conversion ==0.1.0.1,
+             any.integer-logarithms ==1.0.3.1,
+             integer-logarithms -check-bounds +integer-gmp,
+             any.language-c ==0.9.3,
+             language-c -allwarnings +iecfpextension +usebytestrings,
+             any.libyaml-clib ==0.2.5,
+             any.libyaml-streamly ==0.2.2.1,
+             libyaml-streamly -no-unicode -system-libyaml,
+             any.lockfree-queue ==0.2.4,
+             any.lukko ==0.1.1.3,
+             lukko +ofd-locking,
+             any.lzma-static ==5.2.5.5,
+             any.megaparsec ==9.2.2,
+             megaparsec -dev,
+             any.microlens ==0.4.13.1,
+             any.microlens-mtl ==0.2.0.3,
+             any.microlens-th ==0.4.3.14,
+             any.monad-control ==1.0.3.1,
+             any.mono-traversable ==1.0.17.0,
+             any.mtl ==2.2.2,
+             any.mtl-compat ==0.2.2,
+             mtl-compat -two-point-one -two-point-two,
+             any.network ==3.1.4.0,
+             network -devel,
+             any.network-uri ==2.6.4.2,
+             any.optics ==0.4.2.1,
+             any.optics-core ==0.4.1.1,
+             optics-core -explicit-generic-labels,
+             any.optics-extra ==0.4.2.1,
+             any.optics-th ==0.4.1,
+             any.optparse-applicative ==0.17.1.0,
+             optparse-applicative +process,
+             any.os-release ==1.0.2.1,
+             os-release -devel,
+             any.parsec ==3.1.16.1,
+             any.parser-combinators ==1.3.0,
+             parser-combinators -dev,
+             any.pretty ==1.1.3.6,
+             any.pretty-terminal ==0.1.0.0,
+             any.primitive ==0.8.0.0,
+             any.process ==1.6.18.0,
+             any.profunctors ==5.6.2,
+             any.quickcheck-arbitrary-adt ==0.3.1.0,
+             any.quickcheck-io ==0.2.0,
+             any.random ==1.2.1.2,
+             any.recursion-schemes ==5.2.2.5,
+             recursion-schemes +template-haskell,
+             any.regex-base ==0.94.0.2,
+             any.regex-posix ==0.96.0.1,
+             regex-posix -_regex-posix-clib,
+             any.regex-posix-clib ==2.7,
+             any.resourcet ==1.2.6,
+             any.retry ==0.9.3.1,
+             retry -lib-werror,
+             any.rts ==1.0.2,
+             any.safe ==0.3.21,
+             any.safe-exceptions ==0.1.7.4,
+             any.scientific ==0.3.7.0,
+             scientific -bytestring-builder -integer-simple,
+             any.semialign ==1.3,
+             semialign +semigroupoids,
+             any.semigroupoids ==6.0.0.1,
+             semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers,
+             any.setenv ==0.1.1.3,
+             any.split ==0.2.5,
+             any.splitmix ==0.1.0.5,
+             splitmix -optimised-mixer,
+             any.stm ==2.5.1.0,
+             any.streaming-commons ==0.2.2.6,
+             streaming-commons -use-bytestring-builder,
+             any.streamly ==0.8.3,
+             streamly -debug -dev -fusion-plugin -has-llvm -inspection -limit-build-mem -no-fusion +opt -streamk -streamly-core -use-c-malloc +use-unliftio,
+             any.strict ==0.5,
+             any.strict-base ==0.4.0.0,
+             any.tagged ==0.8.8,
+             tagged +deepseq +transformers,
+             any.tagsoup ==0.14.8,
+             any.tar ==0.6.0.0,
+             any.tasty ==1.5,
+             tasty +unix,
+             any.tasty-hunit ==0.10.1,
+             any.template-haskell ==2.19.0.0,
+             any.temporary ==1.3,
+             any.text ==2.0.2,
+             any.text-binary ==0.2.1.1,
+             any.text-iso8601 ==0.1,
+             any.text-short ==0.1.5,
+             text-short -asserts,
+             any.text-zipper ==0.13,
+             any.tf-random ==0.5,
+             any.th-abstraction ==0.6.0.0,
+             any.th-compat ==0.1.4,
+             any.th-lift ==0.8.4,
+             any.th-lift-instances ==0.1.20,
+             any.these ==1.2,
+             any.time ==1.11.1.2 || ==1.12.2,
+             any.time-compat ==1.9.6.1,
+             time-compat -old-locale,
+             any.transformers ==0.5.6.2,
+             any.transformers-base ==0.4.6,
+             transformers-base +orphaninstances,
+             any.transformers-compat ==0.7.2,
+             transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
+             any.typed-process ==0.2.11.1,
+             any.unicode-data ==0.3.1,
+             unicode-data -ucd2haskell,
+             any.unix-compat ==0.7.1,
+             unix-compat -old-time,
+             any.unliftio-core ==0.2.1.0,
+             any.unordered-containers ==0.2.20,
+             unordered-containers -debug,
+             any.uri-bytestring ==0.3.3.1,
+             uri-bytestring -lib-werror,
+             any.utf8-string ==1.0.2,
+             any.uuid-types ==1.0.5.1,
+             any.vector ==0.13.1.0,
+             vector +boundschecks -internalchecks -unsafechecks -wall,
+             any.vector-algorithms ==0.9.0.1,
+             vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks,
+             any.vector-binary-instances ==0.2.5.2,
+             any.vector-stream ==0.1.0.1,
+             any.versions ==6.0.6,
+             any.vty ==6.2,
+             any.vty-crossplatform ==0.4.0.0,
+             vty-crossplatform -demos,
+             any.vty-windows ==0.2.0.2,
+             any.witherable ==0.4.2,
+             any.word-wrap ==0.5,
+             any.word8 ==0.1.3,
+             any.yaml-streamly ==0.12.4,
+             yaml-streamly +no-examples +no-exe,
+             any.zip ==2.0.0,
+             zip -dev -disable-bzip2 -disable-zstd,
+             any.zlib ==0.6.3.0,
+             zlib +bundled-c-zlib -non-blocking-ffi -pkg-config,
+             any.zstd ==0.1.3.0,
+             zstd +standalone
+index-state: hackage.haskell.org 2024-03-15T23:51:46Z
--- a/cabal.ghc948.project
+++ b/cabal.ghc948.project
@@ -1,50 +1,8 @@
-packages: ./ghcup.cabal
-
-optional-packages: ./vendored/*/*.cabal
-
-if impl(ghc < 9.0)
-    package ghcup
-        flags: +tui -tar
-else
-    package ghcup
-        flags: +tui +tar
-
-constraints: http-io-streams -brotli,
-             any.aeson >= 2.0.1.0
-
 if os(mingw32)
-  if impl(ghc >= 9.4)
-    constraints: language-c >= 0.9.3
-
-source-repository-package
-  type: git
-  location: https://github.com/haskell/tar.git
-  tag: d94a988be4311b830149a9f8fc16739927e5fc1c
-
-source-repository-package
-  type: git
-  location: https://github.com/hasufell/uri-bytestring.git
-  tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001
-
-package libarchive
-  flags: -system-libarchive
-
-package aeson-pretty
-  flags: +lib-only
-
-package cabal-plan
-  flags: -exe
-
-package aeson
-  flags: +ordered-keymap
-
-package streamly
-  flags: +use-unliftio
-
-package *
-  test-show-details: direct
-
-allow-newer: cabal-install-parsers:tar, streamly:Win32
-
+  import: cabal.ghc948.Win32.project
+  import: cabal.ghc948.Win32.project.freeze
+else
+  import: cabal.ghc948.Unix.project
+  import: cabal.ghc948.Unix.project.freeze

 with-compiler: ghc-9.4.8
--- a/cabal.project
+++ b/cabal.project
@@ -10,12 +10,24 @@ else
        flags: +tui +tar

 constraints: http-io-streams -brotli,
-             any.aeson >= 2.0.1.0
+             any.aeson >= 2.0.1.0,
+             any.hsc2hs ==0.68.8,
+             bzlib-conduit >= 0.3.0.3,
+             bz2 >= 1.0.1.1,
+             bzlib >= 0.5.2.0,
+             directory >= 1.3.8.3,
+             filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0

 if os(mingw32)
+  constraints: zlib +bundled-c-zlib,
+               lzma +static,
+               text -simdutf,
+               vty-windows >=0.2.0.2
+
  if impl(ghc >= 9.4)
    constraints: language-c >= 0.9.3

+
 source-repository-package
  type: git
  location: https://github.com/haskell/tar.git
--- a/cabal.project.release
+++ b/cabal.project.release
@@ -18,7 +18,7 @@ elif os(mingw32)
  constraints: zlib +bundled-c-zlib,
               lzma +static,
               text -simdutf,
-               vty-windows >=0.1.0.3
+               vty-windows >=0.2.0.2
  if impl(ghc >= 9.4)
    constraints: language-c >= 0.9.3
 elif os(freebsd)
@@ -30,12 +30,18 @@ elif os(freebsd)
 constraints: http-io-streams -brotli,
             any.aeson >= 2.0.1.0,
             any.hsc2hs ==0.68.8,
+             bzlib-conduit >= 0.3.0.3,
+             bz2 >= 1.0.1.1,
+             bzlib >= 0.5.2.0,
             directory >= 1.3.8.3,
             filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0

 package libarchive
  flags: -system-libarchive

+package libyaml-streamly
+  flags: -system-libyaml
+
 package aeson-pretty
  flags: +lib-only

--- a/data/config.yaml
+++ b/data/config.yaml
@@ -128,3 +128,12 @@ mirrors:
    authority:
      host: "mirror.sjtu.edu.cn"

+# Arguments to pass to the configure script of the prebuilt bindist.
+#
+# Do not pass '--prefix' here.
+#
+# GHCup by default passes '--disable-ld-override', so if you want to enable
+# the vanilla way, which aggressively favors 'ld.gold' linker, add the following:
+def-ghc-conf-options:
+  - "--enable-ld-override"
+
--- a/data/metadata
+++ b/data/metadata
--- a/docs/dev.md
+++ b/docs/dev.md
@@ -1,7 +1,27 @@
-# Development
+# Development and contribution

 All you wanted to know about GHCup development.

+## Building
+
+GHCup supports development via cabal and stack. E.g.:
+
+* build via stack: `stack build`
+* build via cabal (with whatever GHC version): `cabal build`
+* build via cabal reproducibly with a specific GHC version
+    - GHC 8.10.7: `cabal build --project-file=cabal.ghc8107.project`
+    - GHC 9.0.2: `cabal build --project-file=cabal.ghc902.project`
+    - and so on (check supported versions via `ls cabal.ghc+([0-9]).project`)
+* build the release binaries: `cabal build --project-file=cabal.project.release`
+
+## Contribution process and expectations
+
+* discuss your idea first before implementing anything
+* GHCup is a dictatorship, so the final decisions are made by the author
+* we don't manage contributors... you can work on anything you like
+* reviews focus on logic and design, not on style and formatting
+* remember that features, decisions and bugs are high impact, since GHCup is used in CIs, github workflows, etc.
+
 ## Module graph

 [![Module graph](./modules_small.svg){: .center style="width:900px"}](./modules_wide.svg)
@@ -61,7 +81,7 @@ Some light suggestions:
 3. use `where` a lot, so the main function body reads like prose
 4. documentation is part of the code

-## Common Tasks
+## Common tasks

 ### Adding a new GHC version

--- a/docs/guide.md
+++ b/docs/guide.md
@@ -360,6 +360,28 @@ mirrors:

 The configuration depends on the host of the mirror and they have to provide the correct configuration.

+## Linkers
+
+The GHC bindist configure script by default doesn't honour the system `ld` that is set, but instead
+probes for `ld.lld`, `ld.gold` and only then `ld` in order, see
+[find_ld.m4](https://gitlab.haskell.org/ghc/ghc/-/blob/master/m4/find_ld.m4?ref_type=heads).
+
+This is controlled by the configure switch `--enable-ld-override`/`--disable-ld-override`, which is enabled by default in GHC.
+GHCup however [has decided](https://github.com/haskell/ghcup-hs/issues/1032) **to disable this switch by default**,
+for reasons of stability and simplicity.
+
+That means, when `--disable-ld-override` is passed, the linker is picked simply by:
+
+* checking if `LD` env var is set, then use whatever is specified
+* otherwise use `ld` binary in PATH (system/distro default)
+
+You can restore the GHC vanilla default by adding this to your `~/.ghcup/config.yaml`:
+
+```yaml
+def-ghc-conf-options:
+  - "--enable-ld-override"
+```
+
 # More on installation

 ## Customisation of the installation scripts
--- a/ghcup.cabal
+++ b/ghcup.cabal
@@ -175,6 +175,7 @@ library
    , base16-bytestring     >=0.1.1.6    && <1.1
    , binary                ^>=0.8.6.0
    , bytestring            >=0.10       && <0.12
+    , bz2                   ^>=1.0.1.1
    , Cabal                 ^>=3.0.0.0 || ^>=3.2.0.0 || ^>=3.4.0.0 || ^>=3.6.0.0 || ^>=3.8.0.0 || ^>= 3.10.0.0
    , case-insensitive      ^>=1.2.1.0
    , casing                ^>=0.1.4.1
@@ -244,7 +245,6 @@ library
    -- GHCup.OptParse.Run uses this
    exposed-modules: GHCup.Prelude.Process.Windows
    build-depends:
-      , bzlib
      , process  ^>=1.6.11.0
      , Win32    >=2.10

@@ -261,7 +261,6 @@ library
    install-includes: dirutils.h
    c-sources:        cbits/dirutils.c
    build-depends:
-      , bz2              >=0.5.0.5 && <1.1
      , terminal-size    ^>=0.3.3
      , unix             ^>=2.7 || ^>=2.8
      , unix-bytestring  ^>=0.3.7.3
--- a/lib-opt/GHCup/OptParse/Compile.hs
+++ b/lib-opt/GHCup/OptParse/Compile.hs
@@ -529,9 +529,14 @@ compile compileCommand settings Dirs{..} runAppState runLogger = do
          HLS.SourceDist targetVer -> do
            GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
            let vi = getVersionInfo (mkTVer targetVer) HLS dls
+            forM_ (_viPreInstall =<< vi) $ \msg -> do
+              lift $ logWarn msg
+              lift $ logWarn
+                "...waiting for 5 seconds, you can still abort..."
+              liftIO $ threadDelay 5000000 -- give the user a sec to intervene
            forM_ (_viPreCompile =<< vi) $ \msg -> do
-              lift $ logInfo msg
-              lift $ logInfo
+              lift $ logWarn msg
+              lift $ logWarn
                "...waiting for 5 seconds, you can still abort..."
              liftIO $ threadDelay 5000000 -- for compilation, give the user a sec to intervene
          _ -> pure ()
@@ -578,9 +583,14 @@ compile compileCommand settings Dirs{..} runAppState runLogger = do
          GHC.SourceDist targetVer -> do
            GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
            let vi = getVersionInfo (mkTVer targetVer) GHC dls
+            forM_ (_viPreInstall =<< vi) $ \msg -> do
+              lift $ logWarn msg
+              lift $ logWarn
+                "...waiting for 5 seconds, you can still abort..."
+              liftIO $ threadDelay 5000000 -- give the user a sec to intervene
            forM_ (_viPreCompile =<< vi) $ \msg -> do
-              lift $ logInfo msg
-              lift $ logInfo
+              lift $ logWarn msg
+              lift $ logWarn
                "...waiting for 5 seconds, you can still abort..."
              liftIO $ threadDelay 5000000 -- for compilation, give the user a sec to intervene
          _ -> pure ()
--- a/lib-opt/GHCup/OptParse/Config.hs
+++ b/lib-opt/GHCup/OptParse/Config.hs
@@ -133,7 +133,8 @@ updateSettings usl usr =
       gpgSetting' = uGPGSetting usl <|> uGPGSetting usr
       platformOverride' = uPlatformOverride usl <|> uPlatformOverride usr
       mirrors' = uMirrors usl <|> uMirrors usr
-   in UserSettings cache' metaCache' metaMode' noVerify' verbose' keepDirs' downloader' (updateKeyBindings (uKeyBindings usl) (uKeyBindings usr)) urlSource' noNetwork' gpgSetting' platformOverride' mirrors'
+       defGHCconfOptions' = uDefGHCConfOptions usl <|> uDefGHCConfOptions usr
+   in UserSettings cache' metaCache' metaMode' noVerify' verbose' keepDirs' downloader' (updateKeyBindings (uKeyBindings usl) (uKeyBindings usr)) urlSource' noNetwork' gpgSetting' platformOverride' mirrors' defGHCconfOptions'
 where
  updateKeyBindings :: Maybe UserKeyBindings -> Maybe UserKeyBindings -> Maybe UserKeyBindings
  updateKeyBindings Nothing Nothing = Nothing
--- a/lib-opt/GHCup/OptParse/GC.hs
+++ b/lib-opt/GHCup/OptParse/GC.hs
@@ -47,6 +47,7 @@ data GCOptions = GCOptions
  , gcHLSNoGHC :: Bool
  , gcCache :: Bool
  , gcTmp :: Bool
+  , gcUnset :: Bool
  } deriving (Eq, Show)


@@ -77,6 +78,9 @@ gcP =
  <*>
    switch
      (short 't' <> long "tmpdirs" <> help "Remove tmpdir leftovers")
+  <*>
+    switch
+      (short 'u' <> long "unset" <> help "Remove all tool versions that are not 'set'")



@@ -134,6 +138,7 @@ gc GCOptions{..} runAppState runLogger = runGC runAppState (do
  liftE $ when gcHLSNoGHC rmHLSNoGHC
  lift $ when gcCache rmCache
  lift $ when gcTmp rmTmp
+  liftE $ when gcUnset rmUnsetTools
   ) >>= \case
            VRight _ -> do
                  pure ExitSuccess
--- a/lib-opt/GHCup/OptParse/Install.hs
+++ b/lib-opt/GHCup/OptParse/Install.hs
@@ -24,6 +24,7 @@ import           GHCup.Prelude
 import           GHCup.Prelude.Logger
 import           GHCup.Prelude.String.QQ

+import           Control.Concurrent (threadDelay)
 #if !MIN_VERSION_base(4,13,0)
 import           Control.Monad.Fail             ( MonadFail )
 #endif
@@ -327,6 +328,11 @@ install installCommand settings getAppState' runLogger = case installCommand of
    (case instBindist of
       Nothing -> runInstGHC s' $ do
         (v, vi) <- liftE $ fromVersion instVer GHC
+         forM_ (_viPreInstall =<< vi) $ \msg -> do
+           lift $ logWarn msg
+           lift $ logWarn
+             "...waiting for 5 seconds, you can still abort..."
+           liftIO $ threadDelay 5000000 -- give the user a sec to intervene
         liftE $ runBothE' (installGHCBin
                     v
                     (maybe GHCupInternal IsolateDir isolateDir)
@@ -338,6 +344,11 @@ install installCommand settings getAppState' runLogger = case installCommand of
       Just uri -> do
         runInstGHC s'{ settings = settings {noVerify = True}} $ do
           (v, vi) <- liftE $ fromVersion instVer GHC
+           forM_ (_viPreInstall =<< vi) $ \msg -> do
+             lift $ logWarn msg
+             lift $ logWarn
+               "...waiting for 5 seconds, you can still abort..."
+             liftIO $ threadDelay 5000000 -- give the user a sec to intervene
           liftE $ runBothE' (installGHCBindist
                       (DownloadInfo uri (Just $ RegexDir "ghc-.*") "" Nothing Nothing)
                       v
@@ -399,6 +410,11 @@ install installCommand settings getAppState' runLogger = case installCommand of
    (case instBindist of
       Nothing -> runInstTool s' $ do
         (_tvVersion -> v, vi) <- liftE $ fromVersion instVer Cabal
+         forM_ (_viPreInstall =<< vi) $ \msg -> do
+           lift $ logWarn msg
+           lift $ logWarn
+             "...waiting for 5 seconds, you can still abort..."
+           liftIO $ threadDelay 5000000 -- give the user a sec to intervene
         liftE $ runBothE' (installCabalBin
                                    v
                                    (maybe GHCupInternal IsolateDir isolateDir)
@@ -408,6 +424,11 @@ install installCommand settings getAppState' runLogger = case installCommand of
       Just uri -> do
         runInstTool s'{ settings = settings { noVerify = True}} $ do
           (_tvVersion -> v, vi) <- liftE $ fromVersion instVer Cabal
+           forM_ (_viPreInstall =<< vi) $ \msg -> do
+             lift $ logWarn msg
+             lift $ logWarn
+               "...waiting for 5 seconds, you can still abort..."
+             liftIO $ threadDelay 5000000 -- give the user a sec to intervene
           liftE $ runBothE' (installCabalBindist
                                      (DownloadInfo uri Nothing "" Nothing Nothing)
                                      v
@@ -448,6 +469,11 @@ install installCommand settings getAppState' runLogger = case installCommand of
     (case instBindist of
       Nothing -> runInstTool s' $ do
         (_tvVersion -> v, vi) <- liftE $ fromVersion instVer HLS
+         forM_ (_viPreInstall =<< vi) $ \msg -> do
+           lift $ logWarn msg
+           lift $ logWarn
+             "...waiting for 5 seconds, you can still abort..."
+           liftIO $ threadDelay 5000000 -- give the user a sec to intervene
         liftE $ runBothE' (installHLSBin
                                    v
                                    (maybe GHCupInternal IsolateDir isolateDir)
@@ -457,6 +483,11 @@ install installCommand settings getAppState' runLogger = case installCommand of
       Just uri -> do
         runInstTool s'{ settings = settings { noVerify = True}} $ do
           (_tvVersion -> v, vi) <- liftE $ fromVersion instVer HLS
+           forM_ (_viPreInstall =<< vi) $ \msg -> do
+             lift $ logWarn msg
+             lift $ logWarn
+               "...waiting for 5 seconds, you can still abort..."
+             liftIO $ threadDelay 5000000 -- give the user a sec to intervene
           -- TODO: support legacy
           liftE $ runBothE' (installHLSBindist
                                      (DownloadInfo uri (if isWindows then Nothing else Just (RegexDir "haskell-language-server-*")) "" Nothing Nothing)
@@ -498,6 +529,11 @@ install installCommand settings getAppState' runLogger = case installCommand of
     (case instBindist of
        Nothing -> runInstTool s' $ do
          (_tvVersion -> v, vi) <- liftE $ fromVersion instVer Stack
+          forM_ (_viPreInstall =<< vi) $ \msg -> do
+            lift $ logWarn msg
+            lift $ logWarn
+              "...waiting for 5 seconds, you can still abort..."
+            liftIO $ threadDelay 5000000 -- give the user a sec to intervene
          liftE $ runBothE' (installStackBin
                                     v
                                     (maybe GHCupInternal IsolateDir isolateDir)
@@ -507,6 +543,11 @@ install installCommand settings getAppState' runLogger = case installCommand of
        Just uri -> do
          runInstTool s'{ settings = settings { noVerify = True}} $ do
            (_tvVersion -> v, vi) <- liftE $ fromVersion instVer Stack
+            forM_ (_viPreInstall =<< vi) $ \msg -> do
+              lift $ logWarn msg
+              lift $ logWarn
+                "...waiting for 5 seconds, you can still abort..."
+              liftIO $ threadDelay 5000000 -- give the user a sec to intervene
            liftE $ runBothE' (installStackBindist
                                       (DownloadInfo uri Nothing "" Nothing Nothing)
                                       v
--- a/lib-opt/GHCup/OptParse/Upgrade.hs
+++ b/lib-opt/GHCup/OptParse/Upgrade.hs
@@ -17,6 +17,7 @@ import           GHCup.Types
 import           GHCup.Prelude.File
 import           GHCup.Prelude.Logger

+import           Control.Concurrent (threadDelay)
 #if !MIN_VERSION_base(4,13,0)
 import           Control.Monad.Fail             ( MonadFail )
 #endif
@@ -135,8 +136,15 @@ upgrade uOpts force' fatal Dirs{..} runAppState runLogger = do
    UpgradeGHCupDir -> pure (Just (binDir </> "ghcup" <> exeExt))

  runUpgrade runAppState (do
-    v' <- liftE $ upgradeGHCup target force' fatal
    GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
+    Just (tver, vi) <- pure $ getLatest dls GHCup
+    let latestVer = _tvVersion tver
+    forM_ (_viPreInstall vi) $ \msg -> do
+      lift $ logWarn msg
+      lift $ logWarn
+        "...waiting for 5 seconds, you can still abort..."
+      liftIO $ threadDelay 5000000 -- give the user a sec to intervene
+    v' <- liftE $ upgradeGHCup' target force' fatal latestVer
    pure (v', dls)
    ) >>= \case
      VRight (v', dls) -> do
--- a/lib/GHCup.hs
+++ b/lib/GHCup.hs
@@ -273,7 +273,6 @@ getDebugInfo = do
    --[ GHCup upgrade etc ]--
    -------------------------

-
 -- | Upgrade ghcup and place it in @~\/.ghcup\/bin\/ghcup@,
 -- if no path is provided.
 upgradeGHCup :: ( MonadMask m
@@ -308,11 +307,48 @@ upgradeGHCup :: ( MonadMask m
                  m
                  Version
 upgradeGHCup mtarget force' fatal = do
-  Dirs {..} <- lift getDirs
  GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
-
-  lift $ logInfo "Upgrading GHCup..."
  let latestVer = _tvVersion $ fst (fromJust (getLatest dls GHCup))
+  upgradeGHCup' mtarget force' fatal latestVer
+
+
+-- | Upgrade ghcup and place it in @~\/.ghcup\/bin\/ghcup@,
+-- if no path is provided.
+upgradeGHCup' :: ( MonadMask m
+                 , MonadReader env m
+                 , HasDirs env
+                 , HasPlatformReq env
+                 , HasGHCupInfo env
+                 , HasSettings env
+                 , MonadCatch m
+                 , HasLog env
+                 , MonadThrow m
+                 , MonadFail m
+                 , MonadResource m
+                 , MonadIO m
+                 , MonadUnliftIO m
+                 )
+              => Maybe FilePath    -- ^ full file destination to write ghcup into
+              -> Bool              -- ^ whether to force update regardless
+                                   --   of currently installed version
+              -> Bool              -- ^ whether to throw an error if ghcup is shadowed
+              -> Version
+              -> Excepts
+                   '[ CopyError
+                    , DigestError
+                    , ContentLengthError
+                    , GPGError
+                    , GPGError
+                    , DownloadFailed
+                    , NoDownload
+                    , NoUpdate
+                    , ToolShadowed
+                    ]
+                   m
+                   Version
+upgradeGHCup' mtarget force' fatal latestVer = do
+  Dirs {..} <- lift getDirs
+  lift $ logInfo "Upgrading GHCup..."
  (Just ghcupPVPVer) <- pure $ pvpToVersion ghcUpVer ""
  when (not force' && (latestVer <= ghcupPVPVer)) $ throwE NoUpdate
  dli   <- liftE $ getDownloadInfo GHCup latestVer
@@ -506,6 +542,26 @@ rmOldGHC = do
  forM_ ghcs $ \ghc -> when (ghc `elem` oldGHCs) $ rmGHCVer ghc


+rmUnsetTools :: ( MonadReader env m
+                , HasGHCupInfo env
+                , HasPlatformReq env
+                , HasDirs env
+                , HasLog env
+                , MonadIO m
+                , MonadFail m
+                , MonadMask m
+                , MonadUnliftIO m
+                )
+             => Excepts '[NotInstalled, UninstallFailed] m ()
+rmUnsetTools = do
+  vers <- lift $ listVersions Nothing [ListInstalled True, ListSet False] False True (Nothing, Nothing)
+  forM_ vers $ \ListResult{..} -> case lTool of
+    GHC   -> liftE $ rmGHCVer (GHCTargetVersion lCross lVer)
+    HLS   -> liftE $ rmHLSVer lVer
+    Cabal -> liftE $ rmCabalVer lVer
+    Stack -> liftE $ rmStackVer lVer
+    GHCup -> pure ()
+

 rmProfilingLibs :: ( MonadReader env m
                   , HasDirs env
--- a/lib/GHCup/Download.hs
+++ b/lib/GHCup/Download.hs
@@ -177,7 +177,7 @@ getDownloadsF pfreq@(PlatformRequest arch plat _) = do
   where
    fromDownloadInfo :: DownloadInfo -> VersionInfo
    fromDownloadInfo dli = let aspec = M.singleton arch (M.singleton plat (M.singleton Nothing dli))
-                           in VersionInfo [] Nothing Nothing Nothing Nothing aspec Nothing Nothing Nothing
+                           in VersionInfo [] Nothing Nothing Nothing Nothing aspec Nothing Nothing Nothing Nothing

    fromStackDownloadInfo :: MonadThrow m => Stack.GHCDownloadInfo -> m DownloadInfo
    fromStackDownloadInfo (Stack.GHCDownloadInfo { gdiDownloadInfo = Stack.DownloadInfo{..} }) = do
--- a/lib/GHCup/GHC.hs
+++ b/lib/GHCup/GHC.hs
@@ -439,39 +439,22 @@ installUnpackedGHC path inst tver forceInstall addConfArgs
      liftE $ mergeGHCFileTree path inst tver forceInstall
  | otherwise = do
      PlatformRequest {..} <- lift getPlatformReq
+      Settings {..} <- lift getSettings

-      let ldOverride
-           | _tvVersion tver >= [vver|8.2.2|]
-           , _rPlatform `elem` [Linux Alpine, Darwin]
-           = ["--disable-ld-override"]
-           | otherwise
-           = []
+      addConfArgs' <- sanitizefGHCconfOptions (T.unpack <$> addConfArgs)
+      defGHCConfOptions' <- sanitizefGHCconfOptions defGHCConfOptions

      lift $ logInfo "Installing GHC (this may take a while)"
-      env <- case _rPlatform of
-               -- https://github.com/haskell/ghcup-hs/issues/967
-               Linux Alpine
-                 -- lets not touch LD for cross targets
-                 | Nothing <- _tvTarget tver -> do
-                     cEnv <- liftIO getEnvironment
-                     spaths <- liftIO getSearchPath
-                     has_ld_bfd <- isJust <$> liftIO (searchPath spaths "ld.bfd")
-                     let ldSet = isJust $ lookup "LD" cEnv
-                     -- only set LD if ld.bfd exists in PATH and LD is not set
-                     -- already
-                     if has_ld_bfd && not ldSet
-                     then do
-                       lift $ logInfo "Detected alpine linux... setting LD=ld.bfd"
-                       pure $ Just (("LD", "ld.bfd") : cEnv)
-                     else pure Nothing
-               _ -> pure Nothing
      lEM $ execLogged "sh"
                       ("./configure" : ("--prefix=" <> fromInstallDir inst)
-                        : (maybe mempty (\x -> ["--target=" <> T.unpack x]) (_tvTarget tver) <> ldOverride <> (T.unpack <$> addConfArgs))
+                        : (maybe mempty (\x -> ["--target=" <> T.unpack x]) (_tvTarget tver)
+                          <> ldOverride (_tvVersion tver)
+                          <> defGHCConfOptions'
+                          <> addConfArgs')
                       )
                       (Just $ fromGHCupPath path)
                       "ghc-configure"
-                       env
+                       Nothing
      tmpInstallDest <- lift withGHCupTmpDir
      lEM $ make ["DESTDIR=" <> fromGHCupPath tmpInstallDest, "install"] (Just $ fromGHCupPath path)
      liftE $ catchWarn $ lEM @_ @'[ProcessError] $ darwinNotarization _rPlatform (fromGHCupPath tmpInstallDest)
@@ -479,6 +462,7 @@ installUnpackedGHC path inst tver forceInstall addConfArgs
      pure ()


+
 mergeGHCFileTree :: ( MonadReader env m
                    , HasPlatformReq env
                    , HasDirs env
@@ -1313,6 +1297,8 @@ compileGHC targetGhc crossTarget vps bstrap jobs mbuildConfig patches aargs buil
                (_tvTarget tver)
      ++ ["--prefix=" <> ghcdir]
      ++ (if isWindows then ["--enable-tarballs-autodownload"] else [])
+      -- https://github.com/haskell/ghcup-hs/issues/1032
+      ++ ldOverride (_tvVersion tver)
      ++ fmap T.unpack aargs
      )
      (Just workdir)
@@ -1387,3 +1373,16 @@ postGHCInstall ver@GHCTargetVersion {..} = do
  forM_ v' $ \(mj, mi) -> lift (getGHCForPVP (PVP (fromIntegral mj :| [fromIntegral mi])) _tvTarget)
    >>= mapM_ (\v -> liftE $ setGHC v SetGHC_XY Nothing)

+
+ldOverride ::  Version -> [String]
+ldOverride ver
+  | ver >= [vver|8.2.2|]
+  = ["--disable-ld-override"]
+  | otherwise
+  = []
+
+sanitizefGHCconfOptions :: MonadFail m => [String] -> m [String]
+sanitizefGHCconfOptions args
+  | "--prefix" `elem` fmap (takeWhile (/= '=')) args = fail "Don't explicitly set --prefix ...aborting"
+  | otherwise = pure args
+
--- a/lib/GHCup/Prelude/Process/Windows.hs
+++ b/lib/GHCup/Prelude/Process/Windows.hs
@@ -150,7 +150,7 @@ executeOut' :: MonadIO m
            -> m CapturedProcess
 executeOut' path args chdir env' = do
  cp <- createProcessWithMingwPath ((proc path args){ cwd = chdir, env = env' })
-  (exit, out, err) <- liftIO $ readCreateProcessWithExitCodeBS cp ""
+  (exit, out, err) <- liftIO $ withRestorePath (env cp) $ readCreateProcessWithExitCodeBS cp ""
  pure $ CapturedProcess exit out err


@@ -166,20 +166,21 @@ execLogged :: ( MonadReader env m
           -> FilePath         -- ^ log filename (opened in append mode)
           -> Maybe [(String, String)] -- ^ optional environment
           -> m (Either ProcessError ())
-execLogged exe args chdir lfile env = do
+execLogged exe args chdir lfile env' = do
  Dirs {..} <- getDirs
  logDebug $ T.pack $ "Running " <> exe <> " with arguments " <> show args
  let stdoutLogfile = fromGHCupPath logsDir </> lfile <> ".stdout.log"
      stderrLogfile = fromGHCupPath logsDir </> lfile <> ".stderr.log"
  cp <- createProcessWithMingwPath ((proc exe args)
    { cwd = chdir
-    , env = env
+    , env = env'
    , std_in = CreatePipe
    , std_out = CreatePipe
    , std_err = CreatePipe
    })
  fmap (toProcessError exe args)
    $ liftIO
+    $ withRestorePath (env cp)
    $ withCreateProcess cp
    $ \_ mout merr ph ->
        case (mout, merr) of
@@ -213,16 +214,9 @@ exec :: MonadIO m
     -> Maybe FilePath   -- ^ optionally chdir into this
     -> Maybe [(String, String)] -- ^ optional environment
     -> m (Either ProcessError ())
-exec exe args chdir env = do
-  -- https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/375
-  forM_ (Map.fromList <$> env) $ \cEnv -> do
-    let paths = ["PATH", "Path"]
-        curPaths = (\x -> maybe [] splitSearchPath (Map.lookup x cEnv)) =<< paths
-        newPath = intercalate [searchPathSeparator] curPaths
-    liftIO $ setEnv "PATH" ""
-    liftIO $ setEnv "Path" newPath
-  cp <- createProcessWithMingwPath ((proc exe args) { cwd = chdir, env = env })
-  exit_code <- liftIO $ withCreateProcess cp $ \_ _ _ p -> waitForProcess p
+exec exe args chdir env' = do
+  cp <- createProcessWithMingwPath ((proc exe args) { cwd = chdir, env = env' })
+  exit_code <- liftIO $ withRestorePath (env cp) $ withCreateProcess cp $ \_ _ _ p -> waitForProcess p
  pure $ toProcessError exe args exit_code

 -- | Like 'exec', except doesn't add msys2 stuff to PATH.
@@ -233,13 +227,6 @@ execNoMinGW :: MonadIO m
     -> Maybe [(String, String)] -- ^ optional environment
     -> m (Either ProcessError ())
 execNoMinGW exe args chdir env = do
-  -- https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/375
-  forM_ (Map.fromList <$> env) $ \cEnv -> do
-    let paths = ["PATH", "Path"]
-        curPaths = (\x -> maybe [] splitSearchPath (Map.lookup x cEnv)) =<< paths
-        newPath = intercalate [searchPathSeparator] curPaths
-    liftIO $ setEnv "PATH" ""
-    liftIO $ setEnv "Path" newPath
  let cp = (proc exe args) { cwd = chdir, env = env }
  exit_code <- liftIO $ withCreateProcess cp $ \_ _ _ p -> waitForProcess p
  pure $ toProcessError exe args exit_code
@@ -270,7 +257,27 @@ createProcessWithMingwPath cp = do
      newPath = intercalate [searchPathSeparator] (mingWPaths ++ curPaths)
      envWithoutPath = foldr (\x y -> Map.delete x y) cEnv paths
      envWithNewPath = Map.insert "Path" newPath envWithoutPath
-  liftIO $ setEnv "Path" newPath
  pure $ cp { env = Just $ Map.toList envWithNewPath }


+withRestorePath :: MonadIO m => Maybe [(String, String)] -- ^ optional env we want to extract 'PATH' from
+                             -> m a                      -- ^ action to perform
+                             -> m a
+withRestorePath env action = do
+  -- https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/375
+  oldPATH <- liftIO $ lookupEnv "PATH"
+  oldPath <- liftIO $ lookupEnv "Path"
+
+  forM_ (Map.fromList <$> env) $ \cEnv -> do
+    let paths = ["PATH", "Path"]
+        curPaths = (\x -> maybe [] splitSearchPath (Map.lookup x cEnv)) =<< paths
+        newPath = intercalate [searchPathSeparator] curPaths
+    liftIO $ setEnv "PATH" ""
+    liftIO $ setEnv "Path" newPath
+    liftIO $ print newPath
+
+  r <- action
+  liftIO $ maybe (unsetEnv "PATH") (setEnv "PATH") oldPATH
+  liftIO $ maybe (unsetEnv "Path") (setEnv "Path") oldPath
+  pure r
+
--- a/lib/GHCup/Types.hs
+++ b/lib/GHCup/Types.hs
@@ -149,6 +149,7 @@ data VersionInfo = VersionInfo
  , _viTestDL      :: Maybe DownloadInfo -- ^ test tarball
  , _viArch        :: ArchitectureSpec   -- ^ descend for binary downloads per arch
  -- informative messages
+  , _viPreInstall  :: Maybe Text
  , _viPostInstall :: Maybe Text
  , _viPostRemove  :: Maybe Text
  , _viPreCompile  :: Maybe Text
@@ -378,24 +379,25 @@ data MetaMode = Strict
 instance NFData MetaMode

 data UserSettings = UserSettings
-  { uCache       :: Maybe Bool
-  , uMetaCache   :: Maybe Integer
-  , uMetaMode    :: Maybe MetaMode
-  , uNoVerify    :: Maybe Bool
-  , uVerbose     :: Maybe Bool
-  , uKeepDirs    :: Maybe KeepDirs
-  , uDownloader  :: Maybe Downloader
-  , uKeyBindings :: Maybe UserKeyBindings
-  , uUrlSource   :: Maybe URLSource
-  , uNoNetwork   :: Maybe Bool
-  , uGPGSetting  :: Maybe GPGSetting
-  , uPlatformOverride :: Maybe PlatformRequest
-  , uMirrors     :: Maybe DownloadMirrors
+  { uCache             :: Maybe Bool
+  , uMetaCache         :: Maybe Integer
+  , uMetaMode          :: Maybe MetaMode
+  , uNoVerify          :: Maybe Bool
+  , uVerbose           :: Maybe Bool
+  , uKeepDirs          :: Maybe KeepDirs
+  , uDownloader        :: Maybe Downloader
+  , uKeyBindings       :: Maybe UserKeyBindings
+  , uUrlSource         :: Maybe URLSource
+  , uNoNetwork         :: Maybe Bool
+  , uGPGSetting        :: Maybe GPGSetting
+  , uPlatformOverride  :: Maybe PlatformRequest
+  , uMirrors           :: Maybe DownloadMirrors
+  , uDefGHCConfOptions :: Maybe [String]
  }
  deriving (Show, GHC.Generic, Eq)

 defaultUserSettings :: UserSettings
-defaultUserSettings = UserSettings Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing
+defaultUserSettings = UserSettings Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing

 fromSettings :: Settings -> Maybe KeyBindings -> UserSettings
 fromSettings Settings{..} Nothing =
@@ -413,6 +415,7 @@ fromSettings Settings{..} Nothing =
    , uGPGSetting = Just gpgSetting
    , uPlatformOverride = platformOverride
    , uMirrors = Just mirrors
+    , uDefGHCConfOptions = Just defGHCConfOptions
  }
 fromSettings Settings{..} (Just KeyBindings{..}) =
  let ukb = UserKeyBindings
@@ -439,6 +442,7 @@ fromSettings Settings{..} (Just KeyBindings{..}) =
    , uGPGSetting = Just gpgSetting
    , uPlatformOverride = platformOverride
    , uMirrors = Just mirrors
+    , uDefGHCConfOptions = Just defGHCConfOptions
  }

 data UserKeyBindings = UserKeyBindings
@@ -511,19 +515,20 @@ instance NFData LeanAppState


 data Settings = Settings
-  { cache            :: Bool
-  , metaCache        :: Integer
-  , metaMode         :: MetaMode
-  , noVerify         :: Bool
-  , keepDirs         :: KeepDirs
-  , downloader       :: Downloader
-  , verbose          :: Bool
-  , urlSource        :: URLSource
-  , noNetwork        :: Bool
-  , gpgSetting       :: GPGSetting
-  , noColor          :: Bool -- this also exists in LoggerConfig
-  , platformOverride :: Maybe PlatformRequest
-  , mirrors          :: DownloadMirrors
+  { cache             :: Bool
+  , metaCache         :: Integer
+  , metaMode          :: MetaMode
+  , noVerify          :: Bool
+  , keepDirs          :: KeepDirs
+  , downloader        :: Downloader
+  , verbose           :: Bool
+  , urlSource         :: URLSource
+  , noNetwork         :: Bool
+  , gpgSetting        :: GPGSetting
+  , noColor           :: Bool -- this also exists in LoggerConfig
+  , platformOverride  :: Maybe PlatformRequest
+  , mirrors           :: DownloadMirrors
+  , defGHCConfOptions :: [String]
  }
  deriving (Show, GHC.Generic)

@@ -531,7 +536,7 @@ defaultMetaCache :: Integer
 defaultMetaCache = 300 -- 5 minutes

 defaultSettings :: Settings
-defaultSettings = Settings False defaultMetaCache Lax False Never Curl False GHCupURL False GPGNone False Nothing (DM mempty)
+defaultSettings = Settings False defaultMetaCache Lax False Never Curl False GHCupURL False GPGNone False Nothing (DM mempty) []

 instance NFData Settings

--- a/scripts/bootstrap/bootstrap-haskell
+++ b/scripts/bootstrap/bootstrap-haskell
@@ -39,7 +39,7 @@ die() {

 plat="$(uname -s)"
 arch=$(uname -m)
-ghver="0.1.20.0"
+ghver="0.1.22.0"
 : "${GHCUP_BASE_URL:=https://downloads.haskell.org/~ghcup}"

 export GHCUP_SKIP_UPDATE_CHECK=yes
--- a/scripts/dev/refreeze.sh
+++ b/scripts/dev/refreeze.sh
@@ -9,19 +9,33 @@ for ghc_ver in "$@" ; do
 	# shellcheck disable=SC3060
 	project_file=cabal.ghc${ghc_ver//./}.project

-	cp cabal.project "${project_file}"
 	case "$(uname -s)" in
        MSYS*|MINGW*)
-			cabal freeze --project-file="${project_file}" -w "ghc-${ghc_ver}"
+	        # shellcheck disable=SC3060
+	        project_file_os=cabal.ghc${ghc_ver//./}.Win32.project
+	        cp cabal.project "${project_file_os}"
+			cabal freeze --project-file="${project_file_os}" -w "ghc-${ghc_ver}" -ftui
 			;;
 		*)
-			cabal freeze --project-file="${project_file}" -w "ghc-${ghc_ver}" -ftui -finternal-downloader
+	        # shellcheck disable=SC3060
+	        project_file_os=cabal.ghc${ghc_ver//./}.Unix.project
+	        cp cabal.project "${project_file_os}"
+			cabal freeze --project-file="${project_file_os}" -w "ghc-${ghc_ver}" -ftui -finternal-downloader
 			;;
 	esac


-	echo "" >> "${project_file}"
-	echo "with-compiler: ghc-${ghc_ver}" >> "${project_file}"
+	sed -i -e '/ghcup/d' "${project_file_os}".freeze

-	sed -i -e '/ghcup/d' "${project_file}".freeze
+    cat <<EOF > "${project_file}" || die
+if os(mingw32)
+  import: cabal.ghc${ghc_ver//./}.Win32.project
+  import: cabal.ghc${ghc_ver//./}.Win32.project.freeze
+else
+  import: cabal.ghc${ghc_ver//./}.Unix.project
+  import: cabal.ghc${ghc_ver//./}.Unix.project.freeze
+
+with-compiler: ghc-${ghc_ver}
+EOF
 done
+
--- a/stack.yaml
+++ b/stack.yaml
@@ -8,7 +8,8 @@ extra-deps:
  - Cabal-syntax-3.8.1.0
  - Win32-2.14.0.0@sha256:e34af84fec733b5c0c8f052ec39499785e719e2fbbe308983adf26c82ea3704d,5942
  - brick-2.1.1@sha256:ff36d64f1027eac17a14a83de053067413accb58b79e5002dce2a79cb8a3dcb3,17385
-  - bzlib-0.5.1.0@sha256:197ea0ba028dd1fe274f7601dae58d23607c4760119bf40bc2087720f6734e6c,2288
+  - bzip2-clib-1.0.8@sha256:f595d0b797e3990b336a36986e5537e84105d13f01f4cb8b470ef671f75555ee,1139
+  - bz2-1.0.1.1@sha256:d21b768c3d41e0cd313beb866dc003a57004ec46b95a6aaf31963603861d1383,3741
  - cabal-install-parsers-0.6
  - cabal-plan-0.7.3.0
  - chs-cabal-0.1.1.1@sha256:e8c8c1bf1dbeec64ad86d67ae6dca1c45afd644d20869546dfdcd03910d3848d,1149
@@ -37,7 +38,7 @@ extra-deps:
  - vty-6.2@sha256:3536dc83a3fee17d9a114baf58fe47b6f080c24987266f0cd0b7b4b1fcd9cf19,3520
  - vty-crossplatform-0.4.0.0@sha256:50593f91ad16777d921138475a8d2784d538fd206addd30664c620278d6c8544,3172
  - vty-unix-0.2.0.0@sha256:2af3d0bdae3c4b7b7e567ee374efe32c7439fabdf9096465ce011a6c6736e9ae,2932
-  - vty-windows-0.2.0.1@sha256:6c75230057a708168dbc420975572511ad3ec09956bf73c3b6f4be03324e8b13,2815
+  - vty-windows-0.2.0.2
  - yaml-streamly-0.12.4@sha256:b5250c5dc71d668c43c42ed6f86f956d69125136ea960858527a4b2ff712d3d1,5165
  - github: hasufell/uri-bytestring
    commit: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001
--- a/test/ghcup-test/golden/unix/GHCupInfo.json
+++ b/test/ghcup-test/golden/unix/GHCupInfo.json
--- a/test/ghcup-test/golden/windows/GHCupInfo.json
+++ b/test/ghcup-test/golden/windows/GHCupInfo.json
--- a/test/optparse-test/GCTest.hs
+++ b/test/optparse-test/GCTest.hs
@@ -17,6 +17,7 @@ defaultOptions =
    False
    False
    False
+    False

 gcCheckList :: [(String, GCOptions)]
 gcCheckList =
@@ -33,7 +34,9 @@ gcCheckList =
  , ("gc --cache", defaultOptions{gcCache = True})
  , ("gc -t", defaultOptions{gcTmp = True})
  , ("gc --tmpdirs", defaultOptions{gcTmp = True})
-  , ("gc -o -p -s -h -c -t", GCOptions True True True True True True)
+  , ("gc -u", defaultOptions{gcUnset = True})
+  , ("gc --unset", defaultOptions{gcUnset = True})
+  , ("gc -o -p -s -h -c -t -u", GCOptions True True True True True True True)
  ]

 gcParseWith :: [String] -> IO GCOptions
Author	SHA1	Message	Date
Julian Ospald	b37ac53aaf	Fix windows process creation handling wrt #1036	2024-04-07 18:07:01 +08:00
Julian Ospald	be4a1bdf7a	Update submodule	2024-03-31 22:09:42 +08:00
Julian Ospald	7cad0ca9fe	Merge branch 'issue-1032'	2024-03-31 22:09:07 +08:00
Julian Ospald	bd6ac3068b	Use ld.gold on armv7	2024-03-31 20:30:37 +08:00
Julian Ospald	1e634131ca	Revert to old GHCs for armv7	2024-03-31 19:36:59 +08:00
Julian Ospald	87c61def9b	Fix missing C++ toolchain	2024-03-31 19:04:49 +08:00
Julian Ospald	11a3bd3e1b	Force ld.gold for armv7	2024-03-31 18:31:01 +08:00
Julian Ospald	243b200fb8	Add defGHCConfOptions option	2024-03-31 18:23:30 +08:00
Julian Ospald	700cf74001	Fix linux cross CI	2024-03-23 16:11:09 +08:00
Julian Ospald	95ac5c8fc6	Use deb 11	2024-03-23 15:18:56 +08:00
Julian Ospald	68225c1933	Update metadata submodule	2024-03-23 14:37:30 +08:00
Julian Ospald	1e0843d2ce	Update cross images	2024-03-23 14:24:38 +08:00
Julian Ospald	b853443c9e	Update cross CI	2024-03-23 13:47:34 +08:00
Julian Ospald	7a684add89	Pass --disable-ld-override when installing/compiling GHC Fixes #1032 Users can still run 'ghcup install ghc <ver> -- enable-ld-override'	2024-03-23 13:47:33 +08:00
Julian Ospald	63e714d1b1	Merge branch 'stack-ci'	2024-03-16 18:50:20 +08:00
Julian Ospald	3675c6b16c	Add contribution section to docs	2024-03-16 18:46:38 +08:00
Julian Ospald	7f8bb14112	Document cabal.project files etc.	2024-03-16 18:27:12 +08:00
Julian Ospald	a4290909b4	Use platform specific project files	2024-03-16 18:11:39 +08:00
Julian Ospald	36fb39553d	Fix refreeze	2024-03-16 17:32:38 +08:00
Julian Ospald	18abdbf2d9	Fix cabal.project for windows	2024-03-16 17:16:29 +08:00
Julian Ospald	89ac09bbe1	Add cabal.project workflow	2024-03-16 16:38:48 +08:00
Julian Ospald	65bf155326	Add stack.yaml workflow	2024-03-16 16:38:47 +08:00
Julian Ospald	6801bf9d88	Fix 'stack build', fixes #1026	2024-03-16 16:14:39 +08:00
Julian Ospald	456200e747	Update CHANGELOG	2024-03-13 21:14:14 +08:00
Julian Ospald	09e199a176	Bump bootstrap script to 0.1.22.0	2024-03-13 20:54:23 +08:00
Julian Ospald	2ecc61ad92	Disable system-libyaml for release builds	2024-03-13 18:47:10 +08:00
Julian Ospald	dd8b23ff86	Force maerwald runners	2024-03-13 18:34:29 +08:00
Julian Ospald	d78e7af80c	Update changelog	2024-03-13 16:22:34 +08:00
Julian Ospald	cf8ed4211b	Merge branch 'checkout-4'	2024-03-13 12:05:44 +08:00
Julian Ospald	39931d98b9	Bump checkout action to 4	2024-03-13 10:34:46 +08:00
Julian Ospald	ac18c044e1	Merge branch 'cross-wasm-commits'	2024-03-11 21:45:18 +08:00
Julian Ospald	e5c941b4d7	Merge branch 'issue-1019'	2024-03-11 21:44:49 +08:00
Julian Ospald	065b307d60	Fix cabal.project.release	2024-03-11 17:59:45 +08:00
Julian Ospald	5eaae9916d	Allow to remove all unset versions, fixes #1019	2024-03-11 17:42:26 +08:00
Julian Ospald	5d0a7b71a2	Merge branch 'issue-1016'	2024-03-11 17:34:21 +08:00
Julian Ospald	b4600b8183	Merge branch 'issue-1013'	2024-03-11 17:33:28 +08:00
Julian Ospald	f465243fc6	Merge branch 'bzlib-cve'	2024-03-11 17:32:29 +08:00
Julian Ospald	e4b0e8debf	Use fixed bzlib	2024-03-11 17:31:57 +08:00
Julian Ospald	d9d13dda5f	Fix crash in 'ghcup tui' on windows * https://github.com/haskell/ghcup-hs/issues/1013 * https://github.com/jtdaugherty/brick/issues/502#issuecomment-1974980299 * `4c395182cb`	2024-03-03 14:44:20 +08:00
Julian Ospald	aef10a699e	Add viPreInstall wrt #1016	2024-03-02 17:44:40 +08:00