Merge remote-tracking branch 'origin/pr/1048'

Installing a ghcjs bindist might require to install
a specific version of emscripten, and not the latest.

.github/scripts/test.sh

@@ -39,6 +39,12 @@ rm "ghcup-test${ext}" "ghcup-test-optparse${ext}"
 
 eghcup --numeric-version
 
+# test PATH on windows wrt msys2
+# https://github.com/haskell/ghcup-hs/pull/992/checks
+if [ "${OS}" = "Windows" ] ; then
+	eghcup run -m -- sh -c 'echo $PATH' | sed 's/:/\n/' | grep '^/mingw64/bin$'
+fi
+
 eghcup install ghc "${GHC_VER}"
 eghcup unset ghc "${GHC_VER}"
 ls -lah "$(eghcup whereis -d ghc "${GHC_VER}")"

.github/workflows/bootstrap.yaml

@@ -52,7 +52,9 @@ jobs:
       - if: runner.os == 'Windows'
         name: Run bootstrap
         run: |
+          $ErrorActionPreference = [System.Management.Automation.ActionPreference]::Stop
           $curDir = Get-Location
           Write-Host "Current Working Directory: $curDir"
-          ./scripts/bootstrap/bootstrap-haskell.ps1 -InstallDir ${GITHUB_WORKSPACE} -BootstrapUrl ("{0}/scripts/bootstrap/bootstrap-haskell" -f $curDir) -InBash
+          ./scripts/bootstrap/bootstrap-haskell.ps1 -InstallDir ${GITHUB_WORKSPACE} -BootstrapUrl ("{0}/scripts/bootstrap/bootstrap-haskell" -f $curDir) -InBash -Msys2Env "MINGW64"
         shell: pwsh
+

.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
+

.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

.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'
 

.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
+

CHANGELOG.md

@@ -1,5 +1,43 @@
 # Revision history for ghcup
 
+## 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)
+* Be less confusing when user tries to 'set' ghcup in TUI, fixes [#923](https://github.com/haskell/ghcup-hs/issues/923)
+* Fix prefetch for cross bindists
+* Fix misinterpretation of '+' in URI paths, fixes [#408](https://github.com/haskell/ghcup-hs/issues/408)
+* Stricter (and better) file uri handling
+* Set LD=ld.bfd on Alpine linux during bindist configure
+* Add rocky/void detection
+* Logging improvements
+* Remove the "show all tool" config in the TUI
+* Fix opening changelog on windows
+* Don't remove share dir link prematurely
+* Require user to explicitly choose subcommand for 'ghcup config'
+* Don't download twice when trying stack decoding
+
+### Refactoring and maintenance
+
+* Large TUI code cleanup by @lsmor (Luis Morillo)... more coming up soon
+* Allow building with `tar` instead of `libarchive` (mainly to make contributions easier)
+
 ## 0.1.20.0 -- 2023-11-10
 
 ### New features

app/ghcup/Main.hs

@@ -41,6 +41,7 @@ import           Data.Aeson                     ( decodeStrict', Value )
 import           Data.Aeson.Encode.Pretty       ( encodePretty )
 import           Data.Either
 import           Data.Functor
+import           Data.Versions (version)
 import           Data.Maybe
 import           GHC.IO.Encoding
 import           Haskus.Utils.Variant.Excepts
@@ -89,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
@@ -341,12 +343,14 @@ Report bugs at <https://github.com/haskell/ghcup-hs/issues>|]
   alreadyInstalling (Install (Left (InstallCabal InstallOptions{..})))   (Cabal, ver)    = cmp' Cabal instVer ver
   alreadyInstalling (Install (Left (InstallHLS InstallOptions{..})))     (HLS, ver)      = cmp' HLS instVer ver
   alreadyInstalling (Install (Left (InstallStack InstallOptions{..})))   (Stack, ver)    = cmp' Stack instVer ver
-  alreadyInstalling (Compile (CompileGHC GHCCompileOptions{ ovewrwiteVer = Just over }))
-    (GHC, ver)   = cmp' GHC (Just $ GHCVersion (mkTVer over)) ver
+  alreadyInstalling (Compile (CompileGHC GHCCompileOptions{ overwriteVer = Just [S over] })) (GHC, ver)
+    | Right over' <- version (T.pack over) = cmp' GHC (Just $ GHCVersion (mkTVer over')) ver
+    | otherwise = pure False
   alreadyInstalling (Compile (CompileGHC GHCCompileOptions{ targetGhc = GHC.SourceDist tver }))
     (GHC, ver)   = cmp' GHC (Just $ ToolVersion tver) ver
-  alreadyInstalling (Compile (CompileHLS HLSCompileOptions{ ovewrwiteVer = Right over }))
-    (HLS, ver)   = cmp' HLS (Just $ ToolVersion over) ver
+  alreadyInstalling (Compile (CompileHLS HLSCompileOptions{ overwriteVer = Just [S over] })) (HLS, ver)
+    | Right over' <- version (T.pack over) = cmp' HLS (Just $ ToolVersion over') ver
+    | otherwise = pure False
   alreadyInstalling (Compile (CompileHLS HLSCompileOptions{ targetHLS = HLS.SourceDist tver }))
     (HLS, ver)   = cmp' HLS (Just $ ToolVersion tver) ver
   alreadyInstalling (Compile (CompileHLS HLSCompileOptions{ targetHLS = HLS.HackageDist tver }))

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
+

cabal.ghc8107.Unix.project.freeze

@@ -1,6 +1,5 @@
 active-repositories: hackage.haskell.org:merge
-constraints: any.Cabal ==3.6.3.0,
-             Cabal -bundled-binary-generic,
+constraints: any.Cabal ==3.10.2.1,
              any.Cabal-syntax ==3.10.2.0,
              any.HUnit ==1.6.2.0,
              any.HsOpenSSL ==0.11.7.6,
@@ -11,11 +10,11 @@ constraints: any.Cabal ==3.6.3.0,
              any.StateVar ==1.2.2,
              any.abstract-deque ==0.3,
              abstract-deque -usecas,
-             any.aeson ==2.1.2.1,
-             aeson -cffi +ordered-keymap,
+             any.aeson ==2.2.1.0,
+             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,
@@ -26,31 +25,31 @@ constraints: any.Cabal ==3.6.3.0,
              assoc +tagged,
              any.async ==2.2.5,
              async -bench,
-             any.atomic-primops ==0.8.4,
+             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-compat-batteries ==0.13.1,
              any.base-orphans ==0.9.1,
              any.base16-bytestring ==1.0.2.0,
              any.base64-bytestring ==1.2.1.0,
              any.bifunctors ==5.6.1,
              bifunctors +tagged,
              any.bimap ==0.5.0,
-             any.binary ==0.8.8.0,
+             any.binary ==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,
-             any.bz2 ==1.0.1.0,
+             any.bytestring ==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,
+             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,
@@ -78,7 +77,8 @@ constraints: any.Cabal ==3.6.3.0,
              any.data-clist ==0.2,
              any.data-fix ==0.3.2,
              any.deepseq ==1.4.4.0,
-             any.directory ==1.3.6.0,
+             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,
@@ -86,7 +86,8 @@ constraints: any.Cabal ==3.6.3.0,
              dlist -werror,
              any.exceptions ==0.10.4,
              any.file-uri ==0.1.0.0,
-             any.filepath ==1.4.2.1,
+             any.filepath ==1.4.101.0,
+             filepath -cpphs,
              any.foldable1-classes-compat ==0.1,
              foldable1-classes-compat +tagged,
              any.free ==5.2,
@@ -104,29 +105,30 @@ constraints: any.Cabal ==3.6.3.0,
              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,
              any.hspec-discover ==2.10.10,
              any.hspec-expectations ==0.8.2,
              any.hspec-golden-aeson ==0.9.0.0,
-             any.http-io-streams ==0.1.6.3,
+             any.http-io-streams ==0.1.7.0,
              http-io-streams -brotli +fast-xor,
              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.io-streams ==1.5.2.2,
              io-streams +network -nointeractivetests +zlib,
-             any.language-c ==0.9.2,
+             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-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,
@@ -159,11 +161,11 @@ constraints: any.Cabal ==3.6.3.0,
              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,
+             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.1,
+             any.random ==1.2.1.2,
              any.recursion-schemes ==5.2.2.5,
              recursion-schemes +template-haskell,
              any.regex-base ==0.94.0.2,
@@ -205,11 +207,12 @@ constraints: any.Cabal ==3.6.3.0,
              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.5.0.0,
+             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,
@@ -224,7 +227,8 @@ constraints: any.Cabal ==3.6.3.0,
              transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
              any.unicode-data ==0.3.1,
              unicode-data -ucd2haskell,
-             any.unix ==2.7.2.2,
+             any.unix ==2.8.5.0,
+             unix -os-string,
              any.unix-bytestring ==0.3.7.8,
              any.unix-compat ==0.7.1,
              unix-compat -old-time,
@@ -239,11 +243,11 @@ constraints: any.Cabal ==3.6.3.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.4,
-             any.vty ==6.0,
-             any.vty-crossplatform ==0.2.0.0,
+             any.versions ==6.0.6,
+             any.vty ==6.2,
+             any.vty-crossplatform ==0.4.0.0,
              vty-crossplatform -demos,
-             any.vty-unix ==0.1.0.0,
+             any.vty-unix ==0.2.0.0,
              any.witherable ==0.4.2,
              any.word-wrap ==0.5,
              any.word8 ==0.1.3,
@@ -253,4 +257,4 @@ constraints: any.Cabal ==3.6.3.0,
              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-01-19T19:48:54Z
+index-state: hackage.haskell.org 2024-03-13T09:43:35Z

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
+

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

cabal.ghc8107.project

@@ -1,55 +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
-
-source-repository-package
-  type: git
-  location: https://github.com/hasufell/versions.git
-  tag: 79e18fbc44fae3064d8957c550cc0229465db320
-
-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
-
+  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

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
+

cabal.ghc902.Unix.project.freeze

@@ -1,6 +1,5 @@
 active-repositories: hackage.haskell.org:merge
-constraints: any.Cabal ==3.6.3.0,
-             Cabal -bundled-binary-generic,
+constraints: any.Cabal ==3.10.2.1,
              any.Cabal-syntax ==3.10.2.0,
              any.HUnit ==1.6.2.0,
              any.HsOpenSSL ==0.11.7.6,
@@ -11,11 +10,11 @@ constraints: any.Cabal ==3.6.3.0,
              any.StateVar ==1.2.2,
              any.abstract-deque ==0.3,
              abstract-deque -usecas,
-             any.aeson ==2.1.2.1,
-             aeson -cffi +ordered-keymap,
+             any.aeson ==2.2.1.0,
+             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,
@@ -26,20 +25,19 @@ constraints: any.Cabal ==3.6.3.0,
              assoc +tagged,
              any.async ==2.2.5,
              async -bench,
-             any.atomic-primops ==0.8.4,
+             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-compat-batteries ==0.13.1,
              any.base-orphans ==0.9.1,
              any.base16-bytestring ==1.0.2.0,
              any.base64-bytestring ==1.2.1.0,
              any.bifunctors ==5.6.1,
              bifunctors +tagged,
              any.bimap ==0.5.0,
-             any.binary ==0.8.8.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,
@@ -48,13 +46,14 @@ constraints: any.Cabal ==3.6.3.0,
              any.blaze-builder ==0.4.2.3,
              any.brick ==2.1.1,
              brick -demos,
-             any.bytestring ==0.10.12.1,
-             any.bz2 ==1.0.1.0,
+             any.bytestring ==0.11.5.3,
+             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,
+             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,
@@ -81,9 +80,10 @@ constraints: any.Cabal ==3.6.3.0,
              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.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,
+             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,
@@ -91,7 +91,8 @@ constraints: any.Cabal ==3.6.3.0,
              dlist -werror,
              any.exceptions ==0.10.4,
              any.file-uri ==0.1.0.0,
-             any.filepath ==1.4.2.1,
+             any.filepath ==1.4.101.0,
+             filepath -cpphs,
              any.foldable1-classes-compat ==0.1,
              foldable1-classes-compat +tagged,
              any.free ==5.2,
@@ -110,26 +111,27 @@ constraints: any.Cabal ==3.6.3.0,
              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,
              any.hspec-discover ==2.10.10,
              any.hspec-expectations ==0.8.2,
              any.hspec-golden-aeson ==0.9.0.0,
-             any.http-io-streams ==0.1.6.3,
+             any.http-io-streams ==0.1.7.0,
              http-io-streams -brotli +fast-xor,
              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.io-streams ==1.5.2.2,
              io-streams +network -nointeractivetests +zlib,
-             any.language-c ==0.9.2,
+             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.6.3.0,
              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,
@@ -163,11 +165,11 @@ constraints: any.Cabal ==3.6.3.0,
              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,
+             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.1,
+             any.random ==1.2.1.2,
              any.recursion-schemes ==5.2.2.5,
              recursion-schemes +template-haskell,
              any.regex-base ==0.94.0.2,
@@ -211,11 +213,12 @@ constraints: any.Cabal ==3.6.3.0,
              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.5.0.0,
+             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,
@@ -231,7 +234,8 @@ constraints: any.Cabal ==3.6.3.0,
              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,
@@ -248,11 +252,11 @@ constraints: any.Cabal ==3.6.3.0,
              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.4,
-             any.vty ==6.0,
-             any.vty-crossplatform ==0.2.0.0,
+             any.versions ==6.0.6,
+             any.vty ==6.2,
+             any.vty-crossplatform ==0.4.0.0,
              vty-crossplatform -demos,
-             any.vty-unix ==0.1.0.0,
+             any.vty-unix ==0.2.0.0,
              any.witherable ==0.4.2,
              any.word-wrap ==0.5,
              any.word8 ==0.1.3,
@@ -266,4 +270,4 @@ constraints: any.Cabal ==3.6.3.0,
              any.zlib-bindings ==0.1.1.5,
              any.zstd ==0.1.3.0,
              zstd +standalone
-index-state: hackage.haskell.org 2024-01-19T19:48:54Z
+index-state: hackage.haskell.org 2024-03-13T09:43:35Z

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
+
+

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

cabal.ghc902.project

@@ -1,55 +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
-
-source-repository-package
-  type: git
-  location: https://github.com/hasufell/versions.git
-  tag: 79e18fbc44fae3064d8957c550cc0229465db320
-
-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
-
+  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

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
+

cabal.ghc928.Unix.project.freeze

@@ -1,6 +1,5 @@
 active-repositories: hackage.haskell.org:merge
-constraints: any.Cabal ==3.6.3.0,
-             Cabal -bundled-binary-generic,
+constraints: any.Cabal ==3.10.2.1,
              any.Cabal-syntax ==3.10.2.0,
              any.HUnit ==1.6.2.0,
              any.HsOpenSSL ==0.11.7.6,
@@ -11,11 +10,11 @@ constraints: any.Cabal ==3.6.3.0,
              any.StateVar ==1.2.2,
              any.abstract-deque ==0.3,
              abstract-deque -usecas,
-             any.aeson ==2.1.2.1,
-             aeson -cffi +ordered-keymap,
+             any.aeson ==2.2.1.0,
+             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,
@@ -26,13 +25,12 @@ constraints: any.Cabal ==3.6.3.0,
              assoc +tagged,
              any.async ==2.2.5,
              async -bench,
-             any.atomic-primops ==0.8.4,
+             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-compat-batteries ==0.13.1,
              any.base-orphans ==0.9.1,
              any.base16-bytestring ==1.0.2.0,
              any.base64-bytestring ==1.2.1.0,
@@ -49,12 +47,13 @@ constraints: any.Cabal ==3.6.3.0,
              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,
+             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,
@@ -81,9 +80,10 @@ constraints: any.Cabal ==3.6.3.0,
              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.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,
+             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,
@@ -91,7 +91,8 @@ constraints: any.Cabal ==3.6.3.0,
              dlist -werror,
              any.exceptions ==0.10.4,
              any.file-uri ==0.1.0.0,
-             any.filepath ==1.4.2.2,
+             any.filepath ==1.4.101.0,
+             filepath -cpphs,
              any.foldable1-classes-compat ==0.1,
              foldable1-classes-compat +tagged,
              any.free ==5.2,
@@ -110,26 +111,27 @@ constraints: any.Cabal ==3.6.3.0,
              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,
              any.hspec-discover ==2.10.10,
              any.hspec-expectations ==0.8.2,
              any.hspec-golden-aeson ==0.9.0.0,
-             any.http-io-streams ==0.1.6.3,
+             any.http-io-streams ==0.1.7.0,
              http-io-streams -brotli +fast-xor,
              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.io-streams ==1.5.2.2,
              io-streams +network -nointeractivetests +zlib,
-             any.language-c ==0.9.2,
+             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.6.3.0,
              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,
@@ -163,11 +165,11 @@ constraints: any.Cabal ==3.6.3.0,
              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,
+             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.1,
+             any.random ==1.2.1.2,
              any.recursion-schemes ==5.2.2.5,
              recursion-schemes +template-haskell,
              any.regex-base ==0.94.0.2,
@@ -211,11 +213,12 @@ constraints: any.Cabal ==3.6.3.0,
              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.5.0.0,
+             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,
@@ -231,7 +234,8 @@ constraints: any.Cabal ==3.6.3.0,
              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,
@@ -248,11 +252,11 @@ constraints: any.Cabal ==3.6.3.0,
              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.4,
-             any.vty ==6.0,
-             any.vty-crossplatform ==0.2.0.0,
+             any.versions ==6.0.6,
+             any.vty ==6.2,
+             any.vty-crossplatform ==0.4.0.0,
              vty-crossplatform -demos,
-             any.vty-unix ==0.1.0.0,
+             any.vty-unix ==0.2.0.0,
              any.witherable ==0.4.2,
              any.word-wrap ==0.5,
              any.word8 ==0.1.3,
@@ -266,4 +270,4 @@ constraints: any.Cabal ==3.6.3.0,
              any.zlib-bindings ==0.1.1.5,
              any.zstd ==0.1.3.0,
              zstd +standalone
-index-state: hackage.haskell.org 2024-01-19T19:48:54Z
+index-state: hackage.haskell.org 2024-03-13T09:43:35Z

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
+

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

cabal.ghc928.project

@@ -1,55 +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
-
-source-repository-package
-  type: git
-  location: https://github.com/hasufell/versions.git
-  tag: 79e18fbc44fae3064d8957c550cc0229465db320
-
-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
-
+  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

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
+

cabal.ghc948.Unix.project.freeze

@@ -1,7 +1,6 @@
 active-repositories: hackage.haskell.org:merge
-constraints: any.Cabal ==3.6.3.0 || ==3.8.1.0,
-             Cabal -bundled-binary-generic,
-             any.Cabal-syntax ==3.8.1.0 || ==3.10.2.0,
+constraints: any.Cabal ==3.10.2.1,
+             any.Cabal-syntax ==3.10.2.0,
              any.HUnit ==1.6.2.0,
              any.HsOpenSSL ==0.11.7.6,
              HsOpenSSL -fast-bignum -homebrew-openssl -macports-openssl -use-pkg-config,
@@ -11,11 +10,11 @@ constraints: any.Cabal ==3.6.3.0 || ==3.8.1.0,
              any.StateVar ==1.2.2,
              any.abstract-deque ==0.3,
              abstract-deque -usecas,
-             any.aeson ==2.1.2.1,
-             aeson -cffi +ordered-keymap,
+             any.aeson ==2.2.1.0,
+             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,
@@ -26,13 +25,12 @@ constraints: any.Cabal ==3.6.3.0 || ==3.8.1.0,
              assoc +tagged,
              any.async ==2.2.5,
              async -bench,
-             any.atomic-primops ==0.8.4,
+             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-compat-batteries ==0.13.1,
              any.base-orphans ==0.9.1,
              any.base16-bytestring ==1.0.2.0,
              any.base64-bytestring ==1.2.1.0,
@@ -49,12 +47,13 @@ constraints: any.Cabal ==3.6.3.0 || ==3.8.1.0,
              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,
+             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,
@@ -80,9 +79,10 @@ constraints: any.Cabal ==3.6.3.0 || ==3.8.1.0,
              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.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,
+             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,
@@ -90,7 +90,8 @@ constraints: any.Cabal ==3.6.3.0 || ==3.8.1.0,
              dlist -werror,
              any.exceptions ==0.10.5,
              any.file-uri ==0.1.0.0,
-             any.filepath ==1.4.2.2,
+             any.filepath ==1.4.101.0,
+             filepath -cpphs,
              any.foldable1-classes-compat ==0.1,
              foldable1-classes-compat +tagged,
              any.free ==5.2,
@@ -109,26 +110,27 @@ constraints: any.Cabal ==3.6.3.0 || ==3.8.1.0,
              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,
              any.hspec-discover ==2.10.10,
              any.hspec-expectations ==0.8.2,
              any.hspec-golden-aeson ==0.9.0.0,
-             any.http-io-streams ==0.1.6.3,
+             any.http-io-streams ==0.1.7.0,
              http-io-streams -brotli +fast-xor,
              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.io-streams ==1.5.2.2,
              io-streams +network -nointeractivetests +zlib,
-             any.language-c ==0.9.2,
+             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.6.3.0 || ==3.8.1.0,
              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,
@@ -166,7 +168,7 @@ constraints: any.Cabal ==3.6.3.0 || ==3.8.1.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.1,
+             any.random ==1.2.1.2,
              any.recursion-schemes ==5.2.2.5,
              recursion-schemes +template-haskell,
              any.regex-base ==0.94.0.2,
@@ -209,16 +211,17 @@ constraints: any.Cabal ==3.6.3.0 || ==3.8.1.0,
              any.terminfo ==0.4.1.5,
              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.5.0.0,
+             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 ==1.11.1.2,
              any.time-compat ==1.9.6.1,
              time-compat -old-locale,
              any.transformers ==0.5.6.2,
@@ -229,7 +232,8 @@ constraints: any.Cabal ==3.6.3.0 || ==3.8.1.0,
              any.typed-process ==0.2.11.1,
              any.unicode-data ==0.3.1,
              unicode-data -ucd2haskell,
-             any.unix ==2.7.3,
+             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,
@@ -246,11 +250,11 @@ constraints: any.Cabal ==3.6.3.0 || ==3.8.1.0,
              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.4,
-             any.vty ==6.0,
-             any.vty-crossplatform ==0.2.0.0,
+             any.versions ==6.0.6,
+             any.vty ==6.2,
+             any.vty-crossplatform ==0.4.0.0,
              vty-crossplatform -demos,
-             any.vty-unix ==0.1.0.0,
+             any.vty-unix ==0.2.0.0,
              any.witherable ==0.4.2,
              any.word-wrap ==0.5,
              any.word8 ==0.1.3,
@@ -264,4 +268,4 @@ constraints: any.Cabal ==3.6.3.0 || ==3.8.1.0,
              any.zlib-bindings ==0.1.1.5,
              any.zstd ==0.1.3.0,
              zstd +standalone
-index-state: hackage.haskell.org 2024-01-19T19:48:54Z
+index-state: hackage.haskell.org 2024-03-13T09:43:35Z

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
+
+

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

cabal.ghc948.project

@@ -1,55 +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
-
-source-repository-package
-  type: git
-  location: https://github.com/hasufell/versions.git
-  tag: 79e18fbc44fae3064d8957c550cc0229465db320
-
-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
-
+  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

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
@@ -26,11 +38,6 @@ source-repository-package
   location: https://github.com/hasufell/uri-bytestring.git
   tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001
 
-source-repository-package
-  type: git
-  location: https://github.com/hasufell/versions.git
-  tag: 79e18fbc44fae3064d8957c550cc0229465db320
-
 package libarchive
   flags: -system-libarchive
 
@@ -49,5 +56,5 @@ package streamly
 package *
   test-show-details: direct
 
-allow-newer: cabal-install-parsers:tar
+allow-newer: cabal-install-parsers:tar, streamly:Win32
 

cabal.project.freeze

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

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)
@@ -29,11 +29,19 @@ elif os(freebsd)
 
 constraints: http-io-streams -brotli,
              any.aeson >= 2.0.1.0,
-             any.hsc2hs ==0.68.8
+             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
 
@@ -56,10 +64,5 @@ source-repository-package
   location: https://github.com/hasufell/uri-bytestring.git
   tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001
 
-source-repository-package
-  type: git
-  location: https://github.com/hasufell/versions.git
-  tag: 79e18fbc44fae3064d8957c550cc0229465db320
-
-allow-newer: cabal-install-parsers:tar
+allow-newer: cabal-install-parsers:tar, streamly:Win32
 

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"
+

data/metadata

@@ -1 +1 @@
-Subproject commit 7e1a50cfff66fdc4039535ea2251fd62a0521579
+Subproject commit c9dae0c58799854823e8c41858ca4cc172ef4c8b

docs/BUGS.md

@@ -1 +0,0 @@
-# Known BUGS

docs/TODO.md

@@ -1,39 +0,0 @@
-# TODOs and Remarks
-
-## Now
-
-* ghcup init?
-* merge two download files
-* fetch/unpack functionality
-* installing multiple versions of the same
-* post-install
-
-* proper test suite
-
-* !! update of 0.1.5 must go in ghcup-0.0.1.json !!
-
-* try to run exe before upgrade (backup to ~/.ghcup/bin/ghcup.old)
-* stdout flushing?
-* resume support (for make-install only)
-
-## Maybe
-
-* version ranges in json
-* sign the JSON? (Or check gpg keys?)
-* testing (especially distro detection -> unit tests)
-
-## Later
-
-* add support for RC/alpha/HEAD versions
-
-## Cleanups
-
-* avoid alternative for IO
-* use plucky or oops instead of Excepts
-
-## Questions
-
-* move out GHCup.Version module, bc it's not library-ish?
-* mirror support
-* interactive handling when distro doesn't exist and we know the tarball is incompatible?
-* ghcup-with wrapper to execute a command with a given ghc in PATH?

docs/about.md

@@ -40,6 +40,80 @@ All you wanted to know about GHCup.
 * [haskell.org](https://www.haskell.org/haskell-org-committee/) via CI and infrastructure
 * [Haskell Foundation](https://haskell.foundation/affiliates/) via affiliation
 
+## Project ownership and hierarchy
+
+The project at the time of writing (2024-04-22) follows the model of
+[benevolent dictator for life](https://en.wikipedia.org/wiki/Benevolent_dictator_for_life), which is
+Julian Ospald at the moment.
+
+Ideally, the ownership should be shared across a core team of collaborators sharing the same vision and
+engagement in the future.
+
+I do not believe in people making decisions over projects they are barely involved in. Instead I believe
+in listening to end users needs very carefully and making decisions based on that. People who want a direct
+influence on the decision process have to both demonstrate they share the vision of GHCup and do the actual
+work.
+
+"Work" here doesn't have to be "writing code". There are many ways to be engaged in a project.
+
+### Transition plan in case of maintainer absence
+
+In case the current maintainer of GHCup (Julian Ospald) is unreachable for a prolonged period of time (3 months),
+the ownership of this project will be automatically transferred to the following individuals:
+
+- [Moritz Angerman](https://github.com/angerman)
+- [Andrew Lelechenko](https://github.com/Bodigrim)
+
+They will be tasked with finding new maintainers in whatever way they see fit (be it appointing themselves or asking HF for help).
+
+The appointed owners may choose to stay owners after the transition period (whether it's in a passive or active capacity) or
+fully transfer ownership to someone else or an organization.
+
+The community shall be informed about this process.
+
+If not otherwise specified by the newly appointed owners, the following principles shall apply to the *transition period*:
+
+#### During the transition period
+
+During the transition period, no other individual or organization is allowed to drive changes to
+[ghcup-hs](https://github.com/haskell/ghcup-hs) repository, unless they are explicitly allowed to do so by the appointed owners.
+
+The following people (in addition to the owners) shall have full write access to the
+[ghcup-metadata](https://github.com/haskell/ghcup-metadata) repository
+(all files) for the length of the transition period, unless otherwise specified by the appointed owners:
+
+- [Ben Gamari](https://github.com/bgamari)
+- [Hécate Moonlight](https://github.com/Kleidukos)
+- [Mike Pilgrem](https://github.com/mpilgrem)
+- [Jens Petersen](https://github.com/juhp)
+
+Contributions to the metadata are expected to follow a review process. If that turns out to be impractical due to lack of engagement, a wait
+time of 2 days before merging shall be followed anyway, except for the `-vanilla` files, which may be merged at any time.
+
+#### Access
+
+The GHCup website, various scripts and unofficial bindists are hosted on haskell.org infrastructure. Contact the
+[Haskell.org committee](https://www.haskell.org/haskell-org-committee/) for access.
+
+The backup owners should already have admin rights on the GHCup repositories, which are hosted on the
+[Github haskell namespace](https://github.com/haskell). In case of issues contact one of the
+organization admins for access, e.g.:
+
+- [Andrew Lelechenko](https://github.com/orgs/haskell/people/Bodigrim)
+- [gbaz](https://github.com/orgs/haskell/people/gbaz)
+- [Hécate Moonlight](https://github.com/Kleidukos)
+- [davean](https://github.com/orgs/haskell/people/davean)
+- [chessai](https://github.com/orgs/haskell/people/chessai)
+
+The owners should already have access to the [hackage package](https://hackage.haskell.org/package/ghcup/maintainers/).
+In case of issues contact the [hackage trustees](https://github.com/haskell-infra/hackage-trustees).
+
+#### Private runners
+
+Private runners maintained by Julian Ospald may cease to work. Moritz Angerman will have SSH access to the machines.
+However, no one will have access to the Hetzner account and billing information. As such, those runners will simply
+have to be replaced.
+
 ## How to help
 
 * if you want to contribute code or documentation, check out the [issue tracker](https://github.com/haskell/ghcup-hs/issues) and the [Development guide](./dev.md)
@@ -113,7 +187,7 @@ cabal-install/HLS/stack are installed in `~/.ghcup/bin/<tool>-<ver>` and have un
 ### Custom ghc version names
 
 When installing ghc bindists with custom version names as outlined in
-[installing custom bindists](#installing-custom-bindists), then cabal might
+[installing custom bindists](guide.md#installing-custom-bindists), then cabal might
 be unable to find the correct `ghc-pkg` (also see [#73](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/73))
 if you use `cabal build --with-compiler=ghc-foo`. Instead, point it to the full path, such as:
 `cabal build --with-compiler=$HOME/.ghcup/ghc/<version-name>/bin/ghc` or set that GHC version

docs/css/extra.css

@@ -146,8 +146,16 @@ a:hover {
   color: #996FC2;
 }
 
+#toc-collapse a.nav-link {
+  color: var(--link-pink);
+}
+
+#toc-collapse a:hover.nav-link {
+  color: #996FC2;
+}
+
 .col-md-9 img.main-logo {
-  border: 0px; 
+  border: 0px;
   padding: 0px;
   margin: 0px;
 }

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
 

docs/guide.md

@@ -105,6 +105,7 @@ This is the complete list of env variables that change GHCup behavior:
 On windows, there's additionally:
 
 * `GHCUP_MSYS2`: Has to point to the root of an existing MSYS2 installation (when installed by GHCup, that's e.g. `C:\ghcup\msys64`). GHCup bootstrap takes care of this usually.
+* `GHCUP_MSYS2_ENV`: The [MSYS2 environment](https://www.msys2.org/docs/environments/) to use when executing e.g. `ghcup run --mingw-path`. Possible values are `MSYS`, `UCRT64`, `CLANG64`, `CLANGARM64`, `CLANG32`, `MINGW64`, `MINGW32`. Defaults to `MINGW64`, `MINGW32` or `CLANGARM64`, depending on the architecture. `MSYS` is always added as the last component. If you change this value after running the bootstrap script, you may need to make sure that the cabal config reflects this change, more specifically `extra-prog-path`, `extra-include-dirs` and `extra-lib-dirs`. (**NOTE: specifying anything other than the default is considered experimental**)
 
 ### XDG support
 
@@ -150,7 +151,7 @@ of metadata files to understand their purpose. These can be combined.
 For example, if you want access to both prerelease and cross bindists, you'd do:
 
 ```sh
-ghcup config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml
+ghcup config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml
 ghcup config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-cross-0.0.8.yaml
 ```
 
@@ -179,7 +180,7 @@ url-source:
 Also see [config.yaml](https://github.com/haskell/ghcup-hs/blob/master/data/config.yaml)
 for more options.
 
-You can also use an alternative metadata via one-shot cli option:
+You can also use an alternative metadata via the one-shot CLI option:
 
 ```sh
 ghcup --url-source=https://some-url/ghcup-0.0.8.yaml tui
@@ -199,14 +200,14 @@ url-source:
   - https://mirror.sjtu.edu.cn/ghcup/yaml/ghcup/data/ghcup-0.0.6.yaml
 ```
 
-Note that later versions of GHCup allow more sophisticated mirror support, see [here](./#mirrors-proper).
+Note that later versions of GHCup allow more sophisticated mirror support, see [here](#mirrors-proper).
 
 #### Known mirrors
 
 1. [https://mirror.sjtu.edu.cn/docs/ghcup](https://mirror.sjtu.edu.cn/docs/ghcup)
 2. [https://mirrors.ustc.edu.cn/help/ghcup.html](https://mirrors.ustc.edu.cn/help/ghcup.html)
 
-### Git based metadata config
+### Git-based metadata config
 
 If you don't like the way ghcup updates its metadata with caching and fetching via curl, you can also do as follows:
 
@@ -321,8 +322,24 @@ Stack metadata doesn't have a concept of those and we don't try to be smart when
 
 ### Windows
 
-On windows, you may find the following config options useful too:
-`skip-msys`, `extra-path`, `extra-include-dirs`, `extra-lib-dirs`.
+#### Using GHCup's MSYS2 installation
+
+Stack usually maintains its own msys2 installation. However, you can instruct it to use GHCup's MSYS2 or any other. E.g. if you
+had GHCup install msys2 into `C:\ghcup\msys64\`, then you would add the following config to stack's `config.yaml`
+(you can find its location via `stack path --stack-root`):
+
+```yaml
+skip-msys: true
+extra-lib-dirs:
+- C:\ghcup\msys64\mingw64\lib
+- C:\ghcup\msys64\mingw64\bin
+extra-path:
+- C:\ghcup\msys64\mingw64\bin
+- C:\ghcup\msys64\usr\bin
+- C:\ghcup\msys64\usr\local\bin
+extra-include-dirs:
+- C:\ghcup\msys64\mingw64\include
+```
 
 Also check out: [https://docs.haskellstack.org/en/stable/yaml_configuration](https://docs.haskellstack.org/en/stable/yaml_configuration)
 
@@ -359,6 +376,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
@@ -508,7 +547,7 @@ See `ghcup compile ghc --help` for further information.
 
 Since ghcup version 0.1.20.0, we provide cross bindists for GHC JS and WASM. These can be installed conveniently.
 However, these are intended as a developer preview only. By using these GHC variants, you are implicitly signing up to participate in GHC development!
-If you run into bugs or missing behavior, join the dev chat at https://matrix.to/#/#GHC:matrix.org. 
+If you run into bugs or missing behavior, join the dev chat at https://matrix.to/#/#GHC:matrix.org.
 
 First, add the cross release channel:
 
@@ -520,19 +559,24 @@ The next sections explain how to install each cross bindist.
 
 ### GHC JS cross bindists (experimental)
 
-You need the required emscripten JS toolchain:
+You need the required emscripten JS toolchain. GHC JS cross bindists might require you to install a specific
+version of emscripten. If that is the case, then ghcup will display the required emscripten version in the
+pre install message. You can use the following commands to install the emscripten toolchain on your system,
+substituting the required version for the bindist that you want to install.
+(Cf. [GHC-MR 10918](https://gitlab.haskell.org/ghc/ghc/-/merge_requests/10918))
 
 ```sh
 git clone https://github.com/emscripten-core/emsdk.git
 cd emsdk
-./emsdk install latest
-./emsdk activate latest
+./emsdk install VERSION
+./emsdk activate VERSION
 source ./emsdk_env.sh
 ```
 
-Instructions are also here: [Download and install — Emscripten 3.1.43-git (dev) documentation](https://emscripten.org/docs/getting_started/downloads.html).
+Instructions are also here: [Download and install — Emscripten documentation](https://emscripten.org/docs/getting_started/downloads.html).
 
-To install we need to invoke ghcup like so:
+To install you can either use the tui interface by invoking `emconfigure ghcup tui` or
+you can install directly like so:
 
 ```sh
 emconfigure ghcup install ghc --set javascript-unknown-ghcjs-9.6.2
@@ -560,6 +604,8 @@ export SKIP_GHC=yes
 source ~/.ghc-wasm/env
 ```
 
+**Note that some wasm bindists don't work with the master branch of ghc-wasm-meta. GHCup will warn you about such cases prior to installation and point you to the right commit.**
+
 To install, we need to invoke ghcup like so also passing the `--host=<host>` flag (adjust as needed):
 
 ```sh

docs/install.md

@@ -1,7 +1,7 @@
 # Installation
 
 GHCup makes it easy to install specific versions of GHC on GNU/Linux,
-macOS (aka Darwin), FreeBSD and Windows and can also bootstrap a fresh [Haskell developer environment](./#supported-tools) from scratch.
+macOS (aka Darwin), FreeBSD and Windows and can also bootstrap a fresh [Haskell developer environment](#supported-tools) from scratch.
 It follows the UNIX philosophy of [do one thing and do it well](https://en.wikipedia.org/wiki/Unix_philosophy#Do_One_Thing_and_Do_It_Well). Similar in scope to [rustup](https://github.com/rust-lang-nursery/rustup.rs), [pyenv](https://github.com/pyenv/pyenv) and [jenv](http://www.jenv.be).
 
 ## How to install
@@ -32,7 +32,7 @@ GHCup has two main channels for every tool: **recommended** and **latest**. By d
 
 *latest* follows the latest release of every tool, while *recommended* is at the discretion of the GHCup maintainers and based on community adoption (hackage libraries, tools like HLS, stackage support, etc.) and known bugs.
 
-Also see [tags and shortcuts](../guide/#tags-and-shortcuts) for more information.
+Also see [tags and shortcuts](guide.md#tags-and-shortcuts) for more information.
 
 ## System requirements
 
@@ -121,9 +121,9 @@ On Windows, msys2 should already have been set up during the installation, so mo
 
 ## Next steps
 
-1. Follow the [First steps guide](../steps) on how to build a "Hello world" program, use `ghc`, run an interactive REPL and create a Haskell project
+1. Follow the [First steps guide](steps.md) on how to build a "Hello world" program, use `ghc`, run an interactive REPL and create a Haskell project
 2. To understand the difference and overlap of `stack` and `cabal`, read on [here](https://gist.github.com/merijn/8152d561fb8b011f9313c48d876ceb07)
-3. To learn Haskell proper check out the links at [How to learn Haskell proper](../steps#how-to-learn-haskell-proper)
+3. To learn Haskell proper check out the links at [How to learn Haskell proper](steps.md#how-to-learn-haskell-proper)
 4. To learn more about Haskell Toolchain management, check out the [ghcup user guide](./guide.md)
 
 ## Uninstallation
@@ -382,7 +382,7 @@ All set. You can run `cabal init` now in an empty directory to start a project.
 ### Void Linux
 
 Since void linux can be installed with glibc and musl, it's hard to support correctly with ghcup.
-One way to make ghcup work on **Void Linux musl** is to follow the [Overriding distro detection](../guide/#overriding-distro-detection)
+One way to make ghcup work on **Void Linux musl** is to follow the [Overriding distro detection](guide.md#overriding-distro-detection)
 section and tell it to consider Alpine bindists only. E.g.:
 
 ```sh

docs/steps.md

@@ -13,7 +13,7 @@ installed a Haskell toolchain:
 The Glorious Glasgow Haskell Compilation System, version 8.10.7
 ```
 
-If this fails, consult [the Getting started page](../install) for information on
+If this fails, consult [the Getting started page](install.md) for information on
 how to install Haskell on your computer.
 
 This guide is partly based on [Gil Mizrahi's blog](https://gilmi.me/blog/post/2021/08/14/hs-core-tools).
@@ -44,7 +44,7 @@ follow the [GHC user guide](https://downloads.haskell.org/ghc/latest/docs/html/u
 Now we run our program:
 
 ```sh
-➜ ./hello 
+➜ ./hello
 Hello, Haskell!
 ```
 
@@ -99,7 +99,7 @@ To enter the environment run the program `ghci`.
 ```sh
 ➜ ghci
 GHCi, version 9.0.2: https://www.haskell.org/ghc/  :? for help
-ghci> 
+ghci>
 ```
 
 It provides an interactive prompt where Haskell expressions can be written and
@@ -199,7 +199,7 @@ And the modules of the relevant packages will be available for import:
 
 ```sh
 GHCi, version 9.0.1: https://www.haskell.org/ghc/  :? for help
-ghci> import Control.Concurrent.Async 
+ghci> import Control.Concurrent.Async
 ghci> import Say
 ghci> concurrently_ (sayString "Hello") (sayString "World")
 Hello

ghcup.cabal

@@ -1,9 +1,9 @@
 cabal-version:      2.4
 name:               ghcup
-version:            0.1.20.0
+version:            0.1.22.0
 license:            LGPL-3.0-only
 license-file:       LICENSE
-copyright:          Julian Ospald 2020
+copyright:          Julian Ospald 2024
 maintainer:         hasufell@posteo.de
 author:             Julian Ospald
 homepage:           https://github.com/haskell/ghcup-hs
@@ -43,7 +43,7 @@ flag tui
   description:
     Build the brick powered tui (ghcup tui).
 
-  default:     False
+  default:     True
   manual:      True
 
 flag internal-downloader
@@ -75,7 +75,7 @@ common app-common-depends
     , containers             ^>=0.6
     , deepseq                ^>=1.4
     , directory              ^>=1.3.6.0
-    , filepath               ^>=1.4.2.1
+    , filepath               >=1.4.101.0
     , haskus-utils-types     ^>=1.5
     , haskus-utils-variant   ^>=3.3
     , megaparsec             >=8.0.0    && <9.3
@@ -96,7 +96,7 @@ common app-common-depends
     , uri-bytestring         ^>=0.3.2.2
     , utf8-string            ^>=1.0
     , vector                 >=0.12     && <0.14
-    , versions               >=6.0.3    && <6.1
+    , versions               >=6.0.5      && <6.1
     , yaml-streamly          ^>=0.12.0
 
   if flag(tar)
@@ -175,7 +175,8 @@ library
     , base16-bytestring     >=0.1.1.6    && <1.1
     , binary                ^>=0.8.6.0
     , bytestring            >=0.10       && <0.12
-    , Cabal                 ^>=3.0.0.0 || ^>=3.2.0.0 || ^>=3.4.0.0 || ^>=3.6.0.0
+    , 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
     , containers            ^>=0.6
@@ -184,7 +185,7 @@ library
     , directory             ^>=1.3.6.0
     , disk-free-space       ^>=0.1.0.1
     , exceptions            ^>=0.10
-    , filepath              ^>=1.4.2.1
+    , filepath              >=1.4.101.0
     , file-uri              ^>=0.1.0.0
     , haskus-utils-types    ^>=1.5
     , haskus-utils-variant  ^>=3.3
@@ -212,7 +213,7 @@ library
     , unordered-containers  ^>=0.2.10.0
     , uri-bytestring        ^>=0.3.2.2
     , vector                 >=0.12     && <0.14
-    , versions              >=6.0.3      && <6.1
+    , versions               >=6.0.5      && <6.1
     , word8                 ^>=0.1.3
     , yaml-streamly         ^>=0.12.0
     , zlib                  ^>=0.6.2.2
@@ -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,14 +261,13 @@ 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
 
   if flag(tui)
     cpp-options:   -DBRICK
-    build-depends: vty ^>=6.0
+    build-depends: vty ^>=6.0 || ^>=6.1 || ^>=6.2
 
 library ghcup-optparse
   import:             app-common-depends
@@ -356,7 +355,7 @@ executable ghcup
     build-depends:
       , brick         ^>=2.1
       , transformers  ^>=0.5
-      , vty           ^>=6.0
+      , vty           ^>=6.0 || ^>=6.1 || ^>=6.2
       , optics        ^>=0.4
 
   if os(windows)
@@ -397,7 +396,7 @@ test-suite ghcup-test
     , bytestring                >=0.10    && <0.12
     , containers                ^>=0.6
     , directory                 ^>=1.3.6.0
-    , filepath                  ^>=1.4.2.1
+    , filepath                  >=1.4.101.0
     , generic-arbitrary         >=0.1.0   && <0.2.1 || >=0.2.2 && <0.3
     , ghcup
     , hspec                     >=2.7.10  && <2.11
@@ -408,7 +407,7 @@ test-suite ghcup-test
     , text                      ^>=2.0
     , time                      >=1.9.3   && <1.12
     , uri-bytestring            ^>=0.3.2.2
-    , versions                  >=6.0.3   && <6.1
+    , versions                   >=6.0.5      && <6.1
 
   if os(windows)
     cpp-options: -DIS_WINDOWS

hie.yaml

@@ -4,7 +4,9 @@ cradle:
     path: ./lib
   - component: "ghcup:exe:ghcup"
     path: ./app/ghcup
+  - component: "ghcup:lib:ghcup-optparse"
+    path: "./lib-opt"
   - component: "ghcup:test:ghcup-test"
-    path: ./test/ghcup-test
+    path: "./test/ghcup-test"
   - component: "ghcup:test:ghcup-optparse-test"
-    path: ./test/optparse-test
+    path: "./test/optparse-test"

lib-opt/GHCup/OptParse/Common.hs

@@ -17,7 +17,6 @@ import           GHCup.Platform
 import           GHCup.Types
 import           GHCup.Types.Optics
 import           GHCup.Utils
-import           GHCup.Utils.URI
 import           GHCup.Prelude
 import           GHCup.Prelude.Process
 import           GHCup.Prelude.Logger
@@ -78,7 +77,6 @@ import qualified Cabal.Config            as CC
     --[ Types ]--
     -------------
 
-
 -- a superset of ToolVersion
 data SetToolVersion = SetGHCVersion GHCTargetVersion
                     | SetToolVersion Version
@@ -314,6 +312,29 @@ gpgParser s' | t == T.pack "strict" = Right GPGStrict
 
 
 
+overWriteVersionParser :: String -> Either String [VersionPattern]
+overWriteVersionParser = first (const "Not a valid version pattern") . MP.parse (MP.many versionPattern <* MP.eof) "" . T.pack
+ where
+  versionPattern :: MP.Parsec Void Text VersionPattern
+  versionPattern = do
+    str' <- T.unpack <$> MP.takeWhileP Nothing (/= '%')
+    if str' /= mempty
+    then pure (S str')
+    else     fmap (const CabalVer)      v_cabal
+         <|> fmap (const GitBranchName) b_name
+         <|> fmap (const GitHashShort)  s_hash
+         <|> fmap (const GitHashLong)   l_hash
+         <|> fmap (const GitDescribe)   g_desc
+         <|> ((\a b -> S (a : T.unpack b)) <$> MP.satisfy (const True) <*> MP.takeWhileP Nothing (== '%')) -- invalid pattern, e.g. "%k"
+   where
+    v_cabal = MP.chunk "%v"
+    b_name  = MP.chunk "%b"
+    s_hash  = MP.chunk "%h"
+    l_hash  = MP.chunk "%H"
+    g_desc  = MP.chunk "%g"
+
+
+
     ------------------
     --[ Completers ]--
     ------------------

lib-opt/GHCup/OptParse/Compile.hs

@@ -36,7 +36,7 @@ import qualified Data.Versions as V
 import           Data.Text                      ( Text )
 import           Haskus.Utils.Variant.Excepts
 import           Options.Applicative     hiding ( style )
-import           Options.Applicative.Help.Pretty ( text )
+import           Options.Applicative.Help.Pretty ( text, vsep )
 import           Prelude                 hiding ( appendFile )
 import           System.Exit
 
@@ -74,7 +74,7 @@ data GHCCompileOptions = GHCCompileOptions
   , crossTarget  :: Maybe Text
   , addConfArgs  :: [Text]
   , setCompile   :: Bool
-  , ovewrwiteVer :: Maybe Version
+  , overwriteVer :: Maybe [VersionPattern]
   , buildFlavour :: Maybe String
   , buildSystem  :: Maybe BuildSystem
   , isolateDir   :: Maybe FilePath
@@ -86,7 +86,7 @@ data HLSCompileOptions = HLSCompileOptions
   , jobs         :: Maybe Int
   , setCompile   :: Bool
   , updateCabal  :: Bool
-  , ovewrwiteVer :: Either Bool Version
+  , overwriteVer :: Maybe [VersionPattern]
   , isolateDir   :: Maybe FilePath
   , cabalProject :: Maybe (Either FilePath URI)
   , cabalProjectLocal :: Maybe URI
@@ -155,8 +155,8 @@ Examples:
 Examples:
   # compile 1.7.0.0 from hackage for 8.10.7, running 'cabal update' before the build
   ghcup compile hls --version 1.7.0.0 --ghc 8.10.7 --cabal-update
-  # compile from master for ghc 9.2.3 using 'git describe' to name the binary and ignore the pinned index state
-  ghcup compile hls -g master --git-describe-version --ghc 9.2.3 -- --index-state=@(date '+%s')
+  # compile from master for ghc 9.2.3, appending the short git commit hash to the version and ignore the pinned index state
+  ghcup compile hls -g master -o '%v-%h' --ghc 9.2.3 -- --index-state=@(date '+%s')
   # compile a specific commit for ghc 9.2.3 and set a specific version for the binary name
   ghcup compile hls -g a32db0b -o 1.7.0.0-p1 --ghc 9.2.3|]
 
@@ -253,11 +253,16 @@ ghcCompileOpts =
     <*> fmap (fromMaybe False) (invertableSwitch "set" Nothing False (help "Set as active version after install"))
     <*> optional
           (option
-            (eitherReader
-              (first (const "Not a valid version") . version . T.pack)
+            (eitherReader overWriteVersionParser
             )
-            (short 'o' <> long "overwrite-version" <> metavar "OVERWRITE_VERSION" <> help
-              "Allows to overwrite the finally installed VERSION with a different one, e.g. when you build 8.10.4 with your own patches, you might want to set this to '8.10.4-p1'"
+            (short 'o' <> long "overwrite-version" <> metavar "OVERWRITE_VERSION"
+              <> helpDoc (Just $ vsep [ text "Overwrite the finally installed VERSION with a different one. Allows to specify patterns"
+                                      , text "%v  version"
+                                      , text "%b  branch name"
+                                      , text "%h  short commit hash"
+                                      , text "%H  long commit hash"
+                                      , text "%g  'git describe' output"
+                                      ])
             <> (completer $ versionCompleter [] GHC)
             )
           )
@@ -343,19 +348,25 @@ hlsCompileOpts =
     <*> switch (long "cabal-update" <> help "Run 'cabal update' before the build")
     <*>
          (
-          (Right <$> option
-            (eitherReader
-              (first (const "Not a valid version") . version . T.pack)
+          optional (option
+            (eitherReader overWriteVersionParser
             )
-            (short 'o' <> long "overwrite-version" <> metavar "OVERWRITE_VERSION" <> help
-              "Allows to overwrite the finally installed VERSION with a different one, e.g. when you build 8.10.4 with your own patches, you might want to set this to '8.10.4-p1'"
+            (short 'o' <> long "overwrite-version" <> metavar "OVERWRITE_VERSION"
+              <> helpDoc (Just $ vsep [ text "Overwrite the finally installed VERSION with a different one. Allows to specify patterns"
+                                      , text "%v  version from cabal file"
+                                      , text "%b  branch name"
+                                      , text "%h  short commit hash"
+                                      , text "%H  long commit hash"
+                                      , text "%g  'git describe' output"
+                                      ])
             <> (completer $ versionCompleter [] HLS)
             )
           )
           <|>
-          (Left <$> (switch
+          ((\b -> if b then Just [GitDescribe] else Nothing) <$> (switch
                       (long "git-describe-version"
                          <> help "Use the output of 'git describe' (if building from git) as the VERSION component of the installed binary."
+                         <> internal
                       )
                     )
           )
@@ -518,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 ()
@@ -529,7 +545,7 @@ compile compileCommand settings Dirs{..} runAppState runLogger = do
                     targetHLS
                     ghcs
                     jobs
-                    ovewrwiteVer
+                    overwriteVer
                     (maybe GHCupInternal IsolateDir isolateDir)
                     cabalProject
                     cabalProjectLocal
@@ -567,16 +583,21 @@ 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 ()
         targetVer <- liftE $ compileGHC
                     targetGhc
                     crossTarget
-                    ovewrwiteVer
+                    overwriteVer
                     bootstrapGhc
                     jobs
                     buildConfig

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

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

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

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

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

lib/GHCup/Download.hs

@@ -92,6 +92,8 @@ import qualified Data.Yaml.Aeson               as Y
 
 
 
+-- $setup
+-- >>> :set -XOverloadedStrings
 
 
 
@@ -175,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

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
@@ -807,7 +791,7 @@ compileGHC :: ( MonadMask m
               )
            => GHCVer
            -> Maybe Text               -- ^ cross target
-           -> Maybe Version            -- ^ overwrite version
+           -> Maybe [VersionPattern]
            -> Either Version FilePath  -- ^ version to bootstrap with
            -> Maybe Int                -- ^ jobs
            -> Maybe FilePath           -- ^ build config
@@ -843,12 +827,12 @@ compileGHC :: ( MonadMask m
                  ]
                 m
                 GHCTargetVersion
-compileGHC targetGhc crossTarget ov bstrap jobs mbuildConfig patches aargs buildFlavour buildSystem installDir
+compileGHC targetGhc crossTarget vps bstrap jobs mbuildConfig patches aargs buildFlavour buildSystem installDir
   = do
     pfreq@PlatformRequest { .. } <- lift getPlatformReq
     GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
 
-    (workdir, tmpUnpack, tver) <- case targetGhc of
+    (workdir, tmpUnpack, tver, ov) <- case targetGhc of
       -- unpack from version tarball
       SourceDist ver -> do
         lift $ logDebug $ "Requested to compile: " <> prettyVer ver <> " with " <> either prettyVer T.pack bstrap
@@ -870,7 +854,11 @@ compileGHC targetGhc crossTarget ov bstrap jobs mbuildConfig patches aargs build
                          (view dlSubdir dlInfo)
         liftE $ applyAnyPatch patches (fromGHCupPath workdir)
 
-        pure (workdir, tmpUnpack, Just (GHCTargetVersion crossTarget ver))
+        ov <- case vps of
+                Just vps' -> fmap Just $ expandVersionPattern (Just ver) "" "" "" "" vps'
+                Nothing   -> pure Nothing
+
+        pure (workdir, tmpUnpack, Just (GHCTargetVersion crossTarget ver), ov)
 
       RemoteDist uri -> do
         lift $ logDebug $ "Requested to compile (from uri): " <> T.pack (show uri)
@@ -894,13 +882,17 @@ compileGHC targetGhc crossTarget ov bstrap jobs mbuildConfig patches aargs build
 
         let workdir = appendGHCupPath tmpUnpack (takeDirectory bf)
 
-        pure (workdir, tmpUnpack, GHCTargetVersion crossTarget <$> tver)
+        ov <- case vps of
+                Just vps' -> fmap Just $ expandVersionPattern tver "" "" "" "" vps'
+                Nothing   -> pure Nothing
+
+        pure (workdir, tmpUnpack, GHCTargetVersion crossTarget <$> tver, ov)
 
       -- clone from git
       GitDist GitBranch{..} -> do
         tmpUnpack <- lift mkGhcupTmpDir
         let git args = execLogged "git" ("--no-pager":args) (Just $ fromGHCupPath tmpUnpack) "git" Nothing
-        tver <- reThrowAll @_ @'[PatchFailed, ProcessError, NotFoundInPATH, DigestError, ContentLengthError, DownloadFailed, GPGError] DownloadFailed $ do
+        (tver, ov) <- cleanUpOnError tmpUnpack $ reThrowAll @_ @'[PatchFailed, ProcessError, NotFoundInPATH, DigestError, ContentLengthError, DownloadFailed, GPGError] DownloadFailed $ do
           let rep = fromMaybe "https://gitlab.haskell.org/ghc/ghc.git" repo
           lift $ logInfo $ "Fetching git repo " <> T.pack rep <> " at ref " <> T.pack ref <> " (this may take a while)"
           lEM $ git [ "init" ]
@@ -932,6 +924,7 @@ compileGHC targetGhc crossTarget ov bstrap jobs mbuildConfig patches aargs build
                           then pure Nothing
                           else fmap Just $ liftE $ gitOut ["describe", "--tags"] (fromGHCupPath tmpUnpack)
           chash <- liftE $ gitOut ["rev-parse", "HEAD" ] (fromGHCupPath tmpUnpack)
+          branch <- liftE $ gitOut ["rev-parse", "--abbrev-ref", "HEAD" ] (fromGHCupPath tmpUnpack)
 
           -- clone submodules
           lEM $ git [ "submodule", "update", "--init", "--depth", "1" ]
@@ -949,9 +942,19 @@ compileGHC targetGhc crossTarget ov bstrap jobs mbuildConfig patches aargs build
                            (if isCommitHash ref then mempty else "\n  " <> "commit hash: " <> chash)
           liftIO $ threadDelay 5000000 -- give the user a sec to intervene
 
-          pure tver
+          ov <- case vps of
+                  Just vps' -> fmap Just $ expandVersionPattern
+                                             tver
+                                             (take 7 $ T.unpack chash)
+                                             (T.unpack chash)
+                                             (maybe "" T.unpack git_describe)
+                                             (T.unpack branch)
+                                             vps'
+                  Nothing -> pure Nothing
 
-        pure (tmpUnpack, tmpUnpack, GHCTargetVersion crossTarget <$> tver)
+          pure (tver, ov)
+
+        pure (tmpUnpack, tmpUnpack, GHCTargetVersion crossTarget <$> tver, ov)
     -- the version that's installed may differ from the
     -- compiled version, so the user can overwrite it
     installVer <- if | Just ov'   <- ov   -> pure (GHCTargetVersion crossTarget ov')
@@ -1091,7 +1094,7 @@ compileGHC targetGhc crossTarget ov bstrap jobs mbuildConfig patches aargs build
   compileHadrianBindist tver workdir ghcdir = do
     liftE $ configureBindist tver workdir ghcdir
 
-    lift $ logInfo "Building (this may take a while)..."
+    lift $ logInfo $ "Building GHC version " <> tVerToText tver <> " (this may take a while)..."
     hadrian_build <- liftE $ findHadrianFile workdir
     lEM $ execLogged hadrian_build
                           ( maybe [] (\j  -> ["-j" <> show j]         ) jobs
@@ -1163,7 +1166,7 @@ compileGHC targetGhc crossTarget ov bstrap jobs mbuildConfig patches aargs build
 
     liftE $ checkBuildConfig (build_mk workdir)
 
-    lift $ logInfo "Building (this may take a while)..."
+    lift $ logInfo $ "Building GHC version " <> tVerToText tver <> " (this may take a while)..."
     lEM $ make (maybe [] (\j -> ["-j" <> fS (show j)]) jobs) (Just workdir)
 
     if | isCross tver -> do
@@ -1294,6 +1297,8 @@ compileGHC targetGhc crossTarget ov bstrap jobs mbuildConfig patches aargs build
                 (_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)
@@ -1368,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
+

lib/GHCup/HLS.hs

@@ -335,7 +335,7 @@ compileHLS :: ( MonadMask m
            => HLSVer
            -> [Version]
            -> Maybe Int
-           -> Either Bool Version
+           -> Maybe [VersionPattern]
            -> InstallDir
            -> Maybe (Either FilePath URI)
            -> Maybe URI
@@ -353,7 +353,7 @@ compileHLS :: ( MonadMask m
                        , BuildFailed
                        , NotInstalled
                        ] m Version
-compileHLS targetHLS ghcs jobs ov installDir cabalProject cabalProjectLocal updateCabal patches cabalArgs = do
+compileHLS targetHLS ghcs jobs vps installDir cabalProject cabalProjectLocal updateCabal patches cabalArgs = do
   pfreq@PlatformRequest { .. } <- lift getPlatformReq
   GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
   Dirs { .. } <- lift getDirs
@@ -362,7 +362,7 @@ compileHLS targetHLS ghcs jobs ov installDir cabalProject cabalProjectLocal upda
     lift $ logInfo "Updating cabal DB"
     lEM $ exec "cabal" ["update"] (Just $ fromGHCupPath tmpDir) Nothing
 
-  (workdir, tmpUnpack, tver, git_describe) <- case targetHLS of
+  (workdir, tmpUnpack, tver, ov) <- case targetHLS of
     -- unpack from version tarball
     SourceDist tver -> do
       lift $ logDebug $ "Requested to compile: " <> prettyVer tver
@@ -382,7 +382,11 @@ compileHLS targetHLS ghcs jobs ov installDir cabalProject cabalProjectLocal upda
                        (liftE . intoSubdir tmpUnpack)
                        (view dlSubdir dlInfo)
 
-      pure (workdir, tmpUnpack, tver, Nothing)
+      ov <- case vps of
+              Just vps' -> fmap Just $ expandVersionPattern (Just tver) "" "" "" "" vps'
+              Nothing   -> pure Nothing
+
+      pure (workdir, tmpUnpack, tver, ov)
 
     HackageDist tver -> do
       lift $ logDebug $ "Requested to compile (from hackage): " <> prettyVer tver
@@ -396,7 +400,11 @@ compileHLS targetHLS ghcs jobs ov installDir cabalProject cabalProjectLocal upda
 
       let workdir = appendGHCupPath tmpUnpack hls
 
-      pure (workdir, tmpUnpack, tver, Nothing)
+      ov <- case vps of
+              Just vps' -> fmap Just $ expandVersionPattern (Just tver) "" "" "" "" vps'
+              Nothing   -> pure Nothing
+
+      pure (workdir, tmpUnpack, tver, ov)
 
     RemoteDist uri -> do
       lift $ logDebug $ "Requested to compile (from uri): " <> T.pack (show uri)
@@ -419,13 +427,17 @@ compileHLS targetHLS ghcs jobs ov installDir cabalProject cabalProjectLocal upda
 
       let workdir = appendGHCupPath tmpUnpack (takeDirectory cf)
 
-      pure (workdir, tmpUnpack, tver, Nothing)
+      ov <- case vps of
+              Just vps' -> fmap Just $ expandVersionPattern (Just tver) "" "" "" "" vps'
+              Nothing   -> pure Nothing
+
+      pure (workdir, tmpUnpack, tver, ov)
 
     -- clone from git
     GitDist GitBranch{..} -> do
       tmpUnpack <- lift mkGhcupTmpDir
       let git args = execLogged "git" ("--no-pager":args) (Just $ fromGHCupPath tmpUnpack) "git" Nothing
-      reThrowAll @_ @'[ProcessError] DownloadFailed $ do
+      cleanUpOnError tmpUnpack $ reThrowAll @_ @'[ProcessError] DownloadFailed $ do
         let rep = fromMaybe "https://github.com/haskell/haskell-language-server.git" repo
         lift $ logInfo $ "Fetching git repo " <> T.pack rep <> " at ref " <> T.pack ref <> " (this may take a while)"
         lEM $ git [ "init" ]
@@ -459,28 +471,31 @@ compileHLS targetHLS ghcs jobs ov installDir cabalProject cabalProjectLocal upda
                         then pure Nothing
                         else fmap Just $ gitOut ["describe", "--tags"] (fromGHCupPath tmpUnpack)
         chash <- gitOut ["rev-parse", "HEAD" ] (fromGHCupPath tmpUnpack)
+        branch <- gitOut ["rev-parse", "--abbrev-ref", "HEAD" ] (fromGHCupPath tmpUnpack)
         tver <- getCabalVersion (fromGHCupPath tmpUnpack </> "haskell-language-server.cabal")
 
         liftE $ catchWarn $ lEM @_ @'[ProcessError] $ darwinNotarization _rPlatform (fromGHCupPath tmpUnpack)
+
+        ov <- case vps of
+                Just vps' -> fmap Just $ expandVersionPattern
+                                           (Just tver)
+                                           (take 7 $ T.unpack chash)
+                                           (T.unpack chash)
+                                           (maybe "" T.unpack git_describe)
+                                           (T.unpack branch)
+                                           vps'
+                Nothing -> pure Nothing
+
         lift $ logInfo $ "Examining git ref " <> T.pack ref <> "\n  " <>
                                     "HLS version (from cabal file): " <> prettyVer tver <>
+                                    "\n  branch: " <> branch <>
                                     (if not shallow_clone then "\n  " <> "'git describe' output: " <> fromJust git_describe else mempty) <>
                                     (if isCommitHash ref then mempty else "\n  " <> "commit hash: " <> chash)
-
-        pure (tmpUnpack, tmpUnpack, tver, git_describe)
+        pure (tmpUnpack, tmpUnpack, tver, ov)
 
   -- the version that's installed may differ from the
   -- compiled version, so the user can overwrite it
-  installVer <- case ov of
-                  Left True -> case git_describe of
-                                 -- git describe
-                                 Just h -> either (fail . displayException) pure . version $ h
-                                 -- git describe, but not building from git, lol
-                                 Nothing -> pure tver
-                  -- default: use detected version
-                  Left False -> pure tver
-                  -- overwrite version with users value
-                  Right v -> pure v
+  installVer <- maybe (pure tver) pure ov
 
   liftE $ runBuildAction
     tmpUnpack
@@ -558,9 +573,7 @@ compileHLS targetHLS ghcs jobs ov installDir cabalProject cabalProjectLocal upda
 
   pure installVer
  where
-  gitDescribeRequested = case ov of
-                           Left b -> b
-                           _      -> False
+  gitDescribeRequested = maybe False (GitDescribe `elem`) vps
 
 
     -----------------

lib/GHCup/Prelude/Internal.hs

@@ -57,12 +57,10 @@ import qualified Data.Text.Lazy.Encoding       as TLE
 
 -- $setup
 -- >>> import Data.ByteString.Internal (c2w, w2c)
--- >>> import Test.QuickCheck
 -- >>> import Data.Word8
 -- >>> import qualified Data.Text as T
 -- >>> import qualified Data.Char as C
 -- >>> import Data.List
--- >>> instance Arbitrary T.Text where arbitrary = T.pack <$> arbitrary
 
 
 fS :: IsString a => String -> a
@@ -299,7 +297,7 @@ escapeVerRex = B.pack . go . B.unpack . verToBS
 
 
 recover :: (MonadIO m, MonadMask m) => m a -> m a
-recover action = 
+recover action =
   recovering (fullJitterBackoff 25000 <> limitRetries 10)
     [\_ -> Handler (\e -> pure $ isPermissionError e)
     ,\_ -> Handler (\e -> pure (ioeGetErrorType e == InappropriateType))

lib/GHCup/Prelude/Process/Posix.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE FlexibleContexts  #-}
 {-# LANGUAGE DataKinds  #-}
@@ -98,7 +99,12 @@ execLogged exe args chdir lfile env = do
   Dirs {..} <- getDirs
   logDebug $ T.pack $ "Running " <> exe <> " with arguments " <> show args
   let logfile = fromGHCupPath logsDir </> lfile <> ".log"
-  liftIO $ bracket (openFd logfile WriteOnly (Just newFilePerms) defaultFileFlags{ append = True })
+  liftIO $ bracket
+#if MIN_VERSION_unix(2,8,0)
+                   (openFd logfile WriteOnly defaultFileFlags{ append = True, creat = Just newFilePerms })
+#else
+                   (openFd logfile WriteOnly (Just newFilePerms) defaultFileFlags{ append = True })
+#endif
                    closeFd
                    (action verbose noColor)
  where
@@ -339,7 +345,11 @@ cleanup fds = for_ fds $ \fd -> handleIO (\_ -> pure ()) $ closeFd fd
 -- | Create a new regular file in write-only mode. The file must not exist.
 createRegularFileFd :: FileMode -> FilePath -> IO Fd
 createRegularFileFd fm dest =
+#if MIN_VERSION_unix(2,8,0)
+  openFd dest WriteOnly defaultFileFlags{ exclusive = True, creat = Just fm }
+#else
   openFd dest WriteOnly (Just fm) defaultFileFlags{ exclusive = True }
+#endif
 
 
 -- | Thin wrapper around `executeFile`.

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
@@ -263,24 +250,34 @@ createProcessWithMingwPath :: MonadIO m
                           => CreateProcess
                           -> m CreateProcess
 createProcessWithMingwPath cp = do
-  msys2Dir <- liftIO ghcupMsys2Dir
   cEnv <- Map.fromList <$> maybe (liftIO getEnvironment) pure (env cp)
-  let mingWPaths = [msys2Dir </> "mingw64" </> "bin"
-                   ,msys2Dir </> "usr" </> "bin"
-                   ]
-      paths = ["PATH", "Path"]
+  mingWPaths <- liftIO ghcupMsys2BinDirs'
+  let paths = ["PATH", "Path"]
       curPaths = (\x -> maybe [] splitSearchPath (Map.lookup x cEnv)) =<< paths
       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 }
 
-ghcupMsys2Dir :: IO FilePath
-ghcupMsys2Dir =
-  lookupEnv "GHCUP_MSYS2" >>= \case
-    Just fp -> pure fp
-    Nothing -> do
-      baseDir <- liftIO ghcupBaseDir
-      pure (fromGHCupPath baseDir </> "msys64")
+
+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
 

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
 
@@ -544,11 +549,23 @@ data Dirs = Dirs
   , dbDir      :: GHCupPath
   , recycleDir :: GHCupPath -- mainly used on windows
   , tmpDir     :: GHCupPath
+  , msys2Dir   :: FilePath
   }
   deriving (Show, GHC.Generic)
 
 instance NFData Dirs
 
+data MSYS2Env = MSYS
+              | UCRT64
+              | CLANG64
+              | CLANGARM64
+              | CLANG32
+              | MINGW64
+              | MINGW32
+  deriving (Eq, Show, Ord, GHC.Generic, Read)
+
+instance NFData MSYS2Env
+
 data KeepDirs = Always
               | Errors
               | Never
@@ -777,3 +794,13 @@ instance Pretty ToolVersion where
 data BuildSystem = Hadrian
                  | Make
   deriving (Show, Eq)
+
+
+data VersionPattern = CabalVer
+                    | GitHashShort
+                    | GitHashLong
+                    | GitDescribe
+                    | GitBranchName
+                    | S String
+  deriving (Eq, Show)
+

lib/GHCup/Utils.hs

@@ -108,6 +108,7 @@ import Data.Time (Day(..), diffDays, addDays)
 -- >>> import GHCup.Errors
 -- >>> import GHCup.Types
 -- >>> import GHCup.Types.Optics
+-- >>> import Data.Versions
 -- >>> import Optics
 -- >>> import GHCup.Prelude.Version.QQ
 -- >>> import qualified Data.Text.Encoding as E
@@ -120,8 +121,8 @@ import Data.Time (Day(..), diffDays, addDays)
 -- >>> let settings = defaultSettings { cache = True, metaCache = 0, noNetwork = True }
 -- >>> let leanAppState = LeanAppState settings dirs' defaultKeyBindings lc
 -- >>> cwd <- getCurrentDirectory
--- >>> (Right ref) <- pure $ parseURI strictURIParserOptions $ "file://" <> E.encodeUtf8 (T.pack cwd) <> "/data/metadata/" <> (urlBaseName . view pathL' $ ghcupURL)
--- >>> (VRight r) <- (fmap . fmap) _ghcupDownloads $ flip runReaderT leanAppState . runE @'[DigestError, GPGError, JSONError , DownloadFailed , FileDoesNotExistError, ContentLengthError] $ liftE $ getBase ref
+-- >>> (Right ref) <- pure $ GHCup.Utils.parseURI $ "file://" <> E.encodeUtf8 (T.pack cwd) <> "/data/metadata/" <> (urlBaseName . view pathL' $ ghcupURL)
+-- >>> (VRight r) <- (fmap . fmap) _ghcupDownloads $ flip runReaderT leanAppState . runE @'[DigestError, GPGError, JSONError , DownloadFailed , FileDoesNotExistError, ContentLengthError] $ liftE (getBase ref) >>= liftE . decodeMetadata @GHCupInfo
 
 
 
@@ -1083,27 +1084,6 @@ cleanUpOnError bdir action = do
   flip onException (lift exAction) $ onE_ exAction action
 
 
--- | Clean up the given directory if the action fails,
--- depending on the Settings.
-cleanFinally :: ( MonadReader env m
-                  , HasDirs env
-                  , HasSettings env
-                  , MonadIO m
-                  , MonadMask m
-                  , HasLog env
-                  , MonadUnliftIO m
-                  , MonadFail m
-                  , MonadCatch m
-                  )
-               => GHCupPath        -- ^ build directory (cleaned up depending on Settings)
-               -> Excepts e m a
-               -> Excepts e m a
-cleanFinally bdir action = do
-  Settings {..} <- lift getSettings
-  let exAction = when (keepDirs == Never) $ rmBDir bdir
-  flip finally (lift exAction) $ onE_ exAction action
-
-
 -- | Remove a build directory, ignoring if it doesn't exist and gracefully
 -- printing other errors without crashing.
 rmBDir :: (MonadReader env m, HasLog env, MonadUnliftIO m, MonadIO m) => GHCupPath -> m ()
@@ -1155,7 +1135,7 @@ ensureShimGen
 
 -- | Ensure ghcup directory structure exists.
 ensureDirectories :: Dirs -> IO ()
-ensureDirectories (Dirs baseDir binDir cacheDir logsDir confDir trashDir dbDir tmpDir) = do
+ensureDirectories (Dirs baseDir binDir cacheDir logsDir confDir trashDir dbDir tmpDir _) = do
   createDirRecursive' (fromGHCupPath baseDir)
   createDirRecursive' (fromGHCupPath baseDir </> "ghc")
   createDirRecursive' (fromGHCupPath baseDir </> "hls")
@@ -1275,3 +1255,33 @@ processBranches str' = let lines'   = lines (T.unpack str')
                            branches = catMaybes $ fmap (stripPrefix "refs/heads/") $ filter (isPrefixOf "refs/heads/") refs
                        in branches
 
+
+
+    ------------------
+    --[ Versioning ]--
+    ------------------
+
+
+-- | Expand a list of version patterns describing a string such as "%v-%h".
+--
+-- >>> expandVersionPattern (either (const Nothing) Just $ version "3.4.3") "a386748" "a3867484ccc391daad1a42002c3a2ba6a93c5221" "v0.1.20.0-119-ga386748" "issue-998" [CabalVer, S "-", GitHashShort, S "-", GitHashLong, S "-", GitBranchName, S "-", GitDescribe, S "-coco"]
+-- Version {_vEpoch = Nothing, _vChunks = Chunks (Numeric 3 :| [Numeric 4,Numeric 3]), _vRel = Just (Release (Alphanum "a386748-a3867484ccc391daad1a42002c3a2ba6a93c5221-issue-998-v0" :| [Numeric 1,Numeric 20,Alphanum "0-119-ga386748-coco"])), _vMeta = Nothing}
+expandVersionPattern :: MonadFail m
+                     => Maybe Version  -- ^ cabal ver
+                     -> String         -- ^ git hash (short), if any
+                     -> String         -- ^ git hash (long), if any
+                     -> String         -- ^ git describe output, if any
+                     -> String         -- ^ git branch name, if any
+                     -> [VersionPattern]
+                     -> m Version
+expandVersionPattern cabalVer gitHashS gitHashL gitDescribe gitBranch
+  = either (fail . displayException) pure . version . T.pack . go
+ where
+  go [] = ""
+  go (CabalVer:xs) = T.unpack (maybe "" prettyVer cabalVer) <> go xs
+  go (GitHashShort:xs) = gitHashS <> go xs
+  go (GitHashLong:xs) = gitHashL <> go xs
+  go (GitDescribe:xs) = gitDescribe <> go xs
+  go (GitBranchName:xs) = gitBranch <> go xs
+  go (S str:xs) = str <> go xs
+

lib/GHCup/Utils/Dirs.hs

@@ -32,6 +32,8 @@ module GHCup.Utils.Dirs
   , getConfigFilePath'
   , useXDG
   , cleanupTrash
+  , ghcupMsys2BinDirs
+  , ghcupMsys2BinDirs'
 
   , GHCupPath
   , appendGHCupPath
@@ -136,6 +138,7 @@ import           GHC.IO.Exception               ( IOErrorType(NoSuchThing) )
 import           Haskus.Utils.Variant.Excepts
 import           Optics hiding ( uncons )
 import           Safe
+import           System.Info
 import           System.Directory hiding ( removeDirectory
                                          , removeDirectoryRecursive
                                          , removePathForcibly
@@ -338,6 +341,48 @@ ghcupTMPDir
         else ghcupBaseDir <&> (\(GHCupPath gp) -> GHCupPath (gp </> "tmp"))
 
 
+ghcupMsys2Dir :: IO FilePath
+ghcupMsys2Dir =
+  lookupEnv "GHCUP_MSYS2" >>= \case
+    Just fp -> pure fp
+    Nothing -> do
+      baseDir <- liftIO ghcupBaseDir
+      pure (fromGHCupPath baseDir </> "msys64")
+
+ghcupMsys2BinDirs :: (MonadFail m, MonadIO m, MonadReader env m, HasDirs env) => m [FilePath]
+ghcupMsys2BinDirs = do
+  Dirs{..} <- getDirs
+  liftIO $ ghcupMsys2BinDirs_ msys2Dir
+
+ghcupMsys2BinDirs' :: IO [FilePath]
+ghcupMsys2BinDirs' = do
+  msys2Dir <- ghcupMsys2Dir
+  ghcupMsys2BinDirs_ msys2Dir
+
+ghcupMsys2BinDirs_ :: FilePath -> IO [FilePath]
+ghcupMsys2BinDirs_ msys2Dir' = do
+  env <- liftIO (lookupEnv "GHCUP_MSYS2_ENV") >>= \case
+    Just env -> maybe (fail parseFailMsg) pure $ readMay @MSYS2Env env
+    Nothing
+      | "x86_64"  <- arch -> pure MINGW64
+      | "i386"    <- arch -> pure MINGW32
+      | "aarch64" <- arch -> pure CLANGARM64
+      | otherwise -> fail "No compatible architecture for msys2"
+  pure [msys2Dir' </> toEnvDir env </> "bin", msys2Dir' </> toEnvDir MSYS </> "bin"]
+ where
+  -- https://www.msys2.org/docs/environments/
+  toEnvDir :: MSYS2Env -> FilePath
+  toEnvDir MSYS       = "usr"
+  toEnvDir UCRT64     = "ucrt64"
+  toEnvDir CLANG64    = "clang64"
+  toEnvDir CLANGARM64 = "clangarm64"
+  toEnvDir CLANG32    = "clang32"
+  toEnvDir MINGW64    = "mingw64"
+  toEnvDir MINGW32    = "mingw32"
+
+  parseFailMsg = "Invalid value for GHCUP_MSYS2_ENV. Valid values are: MSYS, UCRT64, CLANG64, CLANGARM64, CLANG32, MINGW64, MINGW32"
+
+
 getAllDirs :: IO Dirs
 getAllDirs = do
   baseDir    <- ghcupBaseDir
@@ -348,6 +393,7 @@ getAllDirs = do
   recycleDir <- ghcupRecycleDir
   tmpDir     <- ghcupTMPDir
   dbDir      <- ghcupDbDir
+  msys2Dir   <- ghcupMsys2Dir
   pure Dirs { .. }
 
 

scripts/bootstrap/bootstrap-haskell

@@ -20,6 +20,7 @@
 #   * BOOTSTRAP_HASKELL_ADJUST_CABAL_CONFIG - whether to adjust mingw paths in cabal.config on windows
 #   * BOOTSTRAP_HASKELL_DOWNLOADER - which downloader to use (default: curl)
 #   * GHCUP_BASE_URL - the base url for ghcup binary download (use this to overwrite https://downloads.haskell.org/~ghcup with a mirror)
+#   * GHCUP_MSYS2_ENV - the msys2 environment to use on windows, see https://www.msys2.org/docs/environments/ (defauts to MINGW64, MINGW32 or CLANGARM64, depending on the architecture)
 
 # License: LGPL-3.0
 
@@ -27,9 +28,18 @@
 # safety subshell to avoid executing anything in case this script is not downloaded properly
 (
 
+die() {
+    if [ -n "${NO_COLOR}" ] ; then
+        (>&2 printf "%s\\n" "$1")
+    else
+        (>&2 printf "\\033[0;31m%s\\033[0m\\n" "$1")
+    fi
+    exit 2
+}
+
 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
@@ -55,18 +65,40 @@ case "${plat}" in
 			;;
 esac
 
+case "${GHCUP_MSYS2_ENV}" in
+    "")
+        case "${arch}" in
+            x86_64|amd64)
+                GHCUP_MSYS2_ENV_DIR="mingw64" ;;
+            i*86)
+                GHCUP_MSYS2_ENV_DIR="mingw32" ;;
+            aarch64|arm64)
+                GHCUP_MSYS2_ENV_DIR="clangarm64" ;;
+            *) die "Unknown architecture: ${arch}" ;;
+        esac
+        ;;
+    MSYS)
+        GHCUP_MSYS2_ENV_DIR="usr" ;;
+    UCRT64)
+        GHCUP_MSYS2_ENV_DIR="ucrt64" ;;
+    CLANG64)
+        GHCUP_MSYS2_ENV_DIR="clang64" ;;
+    CLANGARM64)
+        GHCUP_MSYS2_ENV_DIR="clangarm64" ;;
+    CLANG32)
+        GHCUP_MSYS2_ENV_DIR="clang32" ;;
+    MINGW64)
+        GHCUP_MSYS2_ENV_DIR="mingw64" ;;
+    MINGW32)
+        GHCUP_MSYS2_ENV_DIR="mingw32" ;;
+    *)
+        die "Invalid value for GHCUP_MSYS2_ENV. Valid values are: MSYS, UCRT64, CLANG64, CLANGARM64, CLANG32, MINGW64, MINGW32" ;;
+esac
+
 : "${BOOTSTRAP_HASKELL_GHC_VERSION:=recommended}"
 : "${BOOTSTRAP_HASKELL_CABAL_VERSION:=recommended}"
 
 
-die() {
-    if [ -n "${NO_COLOR}" ] ; then
-        (>&2 printf "%s\\n" "$1")
-    else
-        (>&2 printf "\\033[0;31m%s\\033[0m\\n" "$1")
-    fi
-    exit 2
-}
 
 warn() {
     if [ -n "${NO_COLOR}" ] ; then
@@ -595,7 +627,7 @@ adjust_cabal_config() {
     else
         cabal_bin="$HOME/AppData/Roaming/cabal/bin"
     fi
-    ecabal user-config -a "extra-prog-path: $(cygpath -w "$GHCUP_BIN"), $(cygpath -w "$cabal_bin"), $(cygpath -w "$GHCUP_MSYS2"/mingw64/bin), $(cygpath -w "$GHCUP_MSYS2"/usr/bin)" -a "extra-include-dirs: $(cygpath -w "$GHCUP_MSYS2"/mingw64/include)" -a "extra-lib-dirs: $(cygpath -w "$GHCUP_MSYS2"/mingw64/lib)" -f init
+    ecabal user-config -a "extra-prog-path: $(cygpath -w "$GHCUP_BIN"), $(cygpath -w "$cabal_bin"), $(cygpath -w "$GHCUP_MSYS2"/${GHCUP_MSYS2_ENV_DIR}/bin), $(cygpath -w "$GHCUP_MSYS2"/usr/bin)" -a "extra-include-dirs: $(cygpath -w "$GHCUP_MSYS2"/${GHCUP_MSYS2_ENV_DIR}/include)" -a "extra-lib-dirs: $(cygpath -w "$GHCUP_MSYS2"/${GHCUP_MSYS2_ENV_DIR}/lib)" -f init
 }
 
 ask_cabal_config_init() {

scripts/bootstrap/bootstrap-haskell.ps1

@@ -46,7 +46,9 @@ param (
     # Whether to disable creation of several desktop shortcuts
     [switch]$DontWriteDesktopShortcuts,
     # Whether to disable adjusting bashrc (in msys2 env) with PATH
-    [switch]$DontAdjustBashRc
+    [switch]$DontAdjustBashRc,
+    # The msys2 environment to use, see https://www.msys2.org/docs/environments/ (defauts to MINGW64, MINGW32 or CLANGARM64, depending on the architecture)
+    [string]$Msys2Env
 )
 
 $DefaultMsys2Version = "20221216"
@@ -194,6 +196,36 @@ if (!$SupportedArchitectures.contains($env:PROCESSOR_ARCHITECTURE)) {
   Exit 1
 }
 
+# set default Msys2Env if not set
+if (!$Msys2Env) {
+  if ($env:PROCESSOR_ARCHITECTURE -eq 'x86') {
+	  $Msys2Env = 'MINGW32'
+  } elseif ($env:PROCESSOR_ARCHITECTURE -eq 'AMD64') {
+	  $Msys2Env = 'MINGW64'
+  }
+}
+
+# parse Msys2Env and set the corresponding variables
+if ($Msys2Env -eq 'MINGW32') {
+	$ShellType = '-mingw32'
+	$PkgConf = 'mingw-w64-i686-pkgconf'
+} elseif ($Msys2Env -eq 'MINGW64') {
+	$ShellType = '-mingw64'
+	$PkgConf = 'mingw-w64-x86_64-pkgconf'
+} elseif ($Msys2Env -eq 'MSYS') {
+	$ShellType = '-msys2'
+	$PkgConf = 'pkgconf'
+} elseif ($Msys2Env -eq 'UCRT64') {
+	$ShellType = '-ucrt64'
+	$PkgConf = 'mingw-w64-ucrt-x86_64-pkgconf'
+} elseif ($Msys2Env -eq 'CLANG64') {
+	$ShellType = '-clang64'
+	$PkgConf = 'mingw-w64-clang-x86_64-pkgconf'
+} else {
+  Print-Msg -color Red -msg ("Unsupported Msys2 environment: {0}. Supported environments are: MINGW64, MINGW32, MSYS, UCRT64, CLANG64" -f $Msys2Env)
+  Exit 1
+}
+
 $ErrorActionPreference = 'Stop'
 
 $GhcupBasePrefixEnv = [System.Environment]::GetEnvironmentVariable('GHCUP_INSTALL_BASE_PREFIX', 'user')
@@ -501,7 +533,7 @@ if (!(Test-Path -Path ('{0}' -f $MsysDir))) {
     Exec "$Bash" '-lc' 'pacman --noconfirm -Syuu'
 
     Print-Msg -msg 'Installing Dependencies...'
-    Exec "$Bash" '-lc' 'pacman --noconfirm -S --needed curl autoconf mingw-w64-x86_64-pkgconf'
+    Exec "$Bash" '-lc' ('pacman --noconfirm -S --needed curl autoconf {0}' -f $PkgConf)
 
     Print-Msg -msg 'Updating SSL root certificate authorities...'
     Exec "$Bash" '-lc' 'pacman --noconfirm -S ca-certificates'
@@ -609,9 +641,9 @@ if ($Host.Name -eq "ConsoleHost")
 }
 '@
 
-	$GhcInstArgs = '-mingw64 -mintty -c "pacman --noconfirm -S --needed base-devel gettext autoconf make libtool automake python p7zip patch unzip"'
+	$GhcInstArgs = ('{0} -mintty -c "pacman --noconfirm -S --needed base-devel gettext autoconf make libtool automake python p7zip patch unzip"' -f $ShellType)
 	Create-Shortcut -SourceExe ('{0}\msys2_shell.cmd' -f $MsysDir) -ArgumentsToSourceExe $GhcInstArgs -DestinationPath 'Install GHC dev dependencies.lnk' -TempPath $GhcupDir
-	Create-Shortcut -SourceExe ('{0}\msys2_shell.cmd' -f $MsysDir) -ArgumentsToSourceExe '-mingw64' -DestinationPath 'Mingw haskell shell.lnk' -TempPath $GhcupDir
+	Create-Shortcut -SourceExe ('{0}\msys2_shell.cmd' -f $MsysDir) -ArgumentsToSourceExe $ShellType -DestinationPath 'Mingw haskell shell.lnk' -TempPath $GhcupDir
 	Create-Shortcut -SourceExe 'https://www.msys2.org/docs/package-management' -ArgumentsToSourceExe '' -DestinationPath 'Mingw package management docs.url' -TempPath $GhcupDir
 	$DesktopDir = [Environment]::GetFolderPath("Desktop")
 	$null = New-Item -Path $DesktopDir -Name "Uninstall Haskell.ps1" -ItemType "file" -Force -Value $uninstallShortCut
@@ -660,10 +692,15 @@ if (!($DontAdjustBashRc)) {
   $AdjustBashRcExport = 'export BOOTSTRAP_HASKELL_ADJUST_BASHRC=1 ;'
 }
 
+# set msys2 env export for the shell bootstrap script
+$Msys2EnvExport = ('export GHCUP_MSYS2_ENV={0} ;' -f $Msys2Env)
+# export GHCUP_MSYS2_ENV
+$null = [Environment]::SetEnvironmentVariable("GHCUP_MSYS2_ENV", $Msys2Env, [System.EnvironmentVariableTarget]::User)
+
 if ((Get-Process -ID $PID).ProcessName.StartsWith("bootstrap-haskell") -Or $InBash) {
-  Exec "$Bash" '-lc' ('{4} {6} {7} {8} {9} {10} {12} [ -n ''{1}'' ] && export GHCUP_MSYS2=$(cygpath -m ''{1}'') ; [ -n ''{2}'' ] && export GHCUP_INSTALL_BASE_PREFIX=$(cygpath -m ''{2}/'') ; export PATH=$(cygpath -u ''{3}/bin''):$PATH ; export CABAL_DIR=''{5}'' ; [[ ''{0}'' = https* ]]  && {11} {0} | bash || cat $(cygpath -m ''{0}'') | bash' -f $BootstrapUrl, $MsysDir, $GhcupBasePrefix, $GhcupDir, $SilentExport, $CabalDirFull, $StackInstallExport, $HLSInstallExport, $AdjustCabalConfigExport, $MinimalExport, $BootstrapDownloader, $DownloadScript, $AdjustBashRcExport)
+  Exec "$Bash" '-lc' ('{4} {6} {7} {8} {9} {10} {12} {13} [ -n ''{1}'' ] && export GHCUP_MSYS2=$(cygpath -m ''{1}'') ; [ -n ''{2}'' ] && export GHCUP_INSTALL_BASE_PREFIX=$(cygpath -m ''{2}/'') ; export PATH=$(cygpath -u ''{3}/bin''):$PATH ; export CABAL_DIR=''{5}'' ; [[ ''{0}'' = https* ]]  && {11} {0} | bash || cat $(cygpath -m ''{0}'') | bash' -f $BootstrapUrl, $MsysDir, $GhcupBasePrefix, $GhcupDir, $SilentExport, $CabalDirFull, $StackInstallExport, $HLSInstallExport, $AdjustCabalConfigExport, $MinimalExport, $BootstrapDownloader, $DownloadScript, $AdjustBashRcExport, $Msys2EnvExport)
 } else {
-  Exec "$Msys2Shell" '-mingw64' '-mintty'  '-shell' 'bash' '-c' ('{4} {6} {7} {8} {9} {10} {12} [ -n ''{1}'' ] && export GHCUP_MSYS2=$(cygpath -m ''{1}'') ; [ -n ''{2}'' ] && export GHCUP_INSTALL_BASE_PREFIX=$(cygpath -m ''{2}/'') ; export PATH=$(cygpath -u ''{3}/bin''):$PATH ; export CABAL_DIR=''{5}'' ; trap ''echo Press any key to exit && read -n 1 && exit'' 2 ; [[ ''{0}'' = https* ]]  && {11} {0} | bash || cat $(cygpath -m ''{0}'') | bash ; echo ''Press any key to exit'' && read -n 1' -f $BootstrapUrl, $MsysDir, $GhcupBasePrefix, $GhcupDir, $SilentExport, $CabalDirFull, $StackInstallExport, $HLSInstallExport, $AdjustCabalConfigExport, $MinimalExport, $BootstrapDownloader, $DownloadScript, $AdjustBashRcExport)
+  Exec "$Msys2Shell" $ShellType '-mintty'  '-shell' 'bash' '-c' ('{4} {6} {7} {8} {9} {10} {12} {13} [ -n ''{1}'' ] && export GHCUP_MSYS2=$(cygpath -m ''{1}'') ; [ -n ''{2}'' ] && export GHCUP_INSTALL_BASE_PREFIX=$(cygpath -m ''{2}/'') ; export PATH=$(cygpath -u ''{3}/bin''):$PATH ; export CABAL_DIR=''{5}'' ; trap ''echo Press any key to exit && read -n 1 && exit'' 2 ; [[ ''{0}'' = https* ]]  && {11} {0} | bash || cat $(cygpath -m ''{0}'') | bash ; echo ''Press any key to exit'' && read -n 1' -f $BootstrapUrl, $MsysDir, $GhcupBasePrefix, $GhcupDir, $SilentExport, $CabalDirFull, $StackInstallExport, $HLSInstallExport, $AdjustCabalConfigExport, $MinimalExport, $BootstrapDownloader, $DownloadScript, $AdjustBashRcExport, $Msys2EnvExport)
 }
 
 

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
+

stack.yaml

@@ -1,38 +1,67 @@
-resolver: lts-20.26
+resolver: lts-21.25
 
 packages:
   - .
 
 extra-deps:
-  - Cabal-3.6.3.0
-  - Cabal-syntax-3.10.1.0
-  - aeson-2.1.2.1
-  - cabal-install-parsers-0.6.1
-  - chs-cabal-0.1.1.1
-  - chs-deps-0.1.0.0
+  - Cabal-3.8.1.0
+  - Cabal-syntax-3.8.1.0
+  - Win32-2.14.0.0@sha256:e34af84fec733b5c0c8f052ec39499785e719e2fbbe308983adf26c82ea3704d,5942
+  - brick-2.1.1@sha256:ff36d64f1027eac17a14a83de053067413accb58b79e5002dce2a79cb8a3dcb3,17385
+  - 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
+  - chs-deps-0.1.0.0@sha256:0cdada6d2c682c41b20331b8c63c2ecfc7e806928585195fd544c9d41f3074fd,2496
+  - directory-1.3.8.3
+  - file-uri-0.1.0.0@sha256:d6dcc12bde249362c93e413f87a41558b827333dfe3f97d953e47e1070c0da6f,1857
+  - filepath-1.4.101.0
   - generic-arbitrary-0.2.2@sha256:202ffbf2032672a51318f2e80d7e75b72f8950e690346b4314f38bc7e39215f7,1189
-  - generically-0.1.1
   - haskus-utils-data-1.4@sha256:bfa94363b94b14779edd6834fbd59dbb847c3d7b8f48e3844f456ffdc077da4a,1466
   - haskus-utils-types-1.5.1@sha256:991c472f4e751e2f0d7aab6ad4220ef151d6160876dcf0511bbf876bbd432020,1298
-  - haskus-utils-variant-3.2.1
-  - libarchive-3.0.3.2
-  - libyaml-streamly-0.2.1
-  - lzma-static-5.2.5.5
-  - os-release-1.0.2.1
-  - parsec-3.1.15.0
-  - streamly-0.8.2@sha256:ec521b7c1c4db068501c35804af77f40b7d34232f5e29d9b99e722229040eb80,23500
-  - strict-base-0.4.0.0
-  - text-2.0.2
-  - yaml-streamly-0.12.2
-  - github: fosskers/versions
-    commit: 7bc3355348aac3510771d4622aff09ac38c9924d
+  - haskus-utils-variant-3.3@sha256:3df3fa0a557d75c0e8f94fe9954f76a692eaf8d368c401e30ab028624d55386b,2198
+  - language-c-0.9.3
+  - libarchive-3.0.4.2
+  - libyaml-streamly-0.2.2@sha256:619b15826a4e221cae4f91cfc040f262cd19a4a81858b75e8270e4b009866969,2206
+  - lzma-static-5.2.5.5@sha256:55ed074cda2b82008e020a51e2f8c22f2487a58a4989ab359bf04dd6c903b894,7431
+  - megaparsec-9.2.2@sha256:c306a135ec25d91d252032c6128f03598a00e87ea12fcf5fc4878fdffc75c768,3219
+  - os-release-1.0.2.1@sha256:2c3e8f7a9a0e17d5042d14d2036d52b42c8d5606e8d004697af462a95c87a9e2,2718
+  - process-1.6.18.0@sha256:69fbbca4151e1a6d1a5da41a1e17c254871675a4f2aed5213bbdfb10b5e52742,3148
+  - streamly-0.8.3@sha256:c8f1eed7a99d02c902f0338d8c5f53579cf5cf421a5c886405f331bd948214d5,24141
+  - strict-base-0.4.0.0@sha256:2ff4e43cb95eedf2995558d7fc34d19362846413dd39e6aa6a5b3ea8228fef9f,1248
+  - time-1.11.1.2@sha256:a957467595420495c2dd440d9efa1f58c62277cf9438c7e7a515d7a4c65571ec,6287
+  - unicode-data-0.3.1@sha256:ae3a3aca89a32b912ddde7a644c0c04eaf23ee42014c74fe3d6b9aaf36ce7ec9,5481
+  - unix-2.8.5.0@sha256:633f15ef0bd50a16a7b5c5e86e6659fee6e4e211e098cc8bd0029f452bfcfddc,9808
+  - unix-bytestring-0.3.7.8@sha256:b8070935929a7654ce398fdecc9b5f90b02c455407db8ea7989256e821e33b1f,3053
+  - versions-6.0.5
+  - 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.2
+  - yaml-streamly-0.12.4@sha256:b5250c5dc71d668c43c42ed6f86f956d69125136ea960858527a4b2ff712d3d1,5165
+  - github: hasufell/uri-bytestring
+    commit: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001
+  - github: haskell/tar
+    commit: d94a988be4311b830149a9f8fc16739927e5fc1c
+
+allow-newer: true
+
+allow-newer-deps:
+  - Cabal
+  - Cabal-syntax
+  - ansi-terminal
+  - mintty
+  - process
+  - streamly
+  - cabal-install-parsers
 
 flags:
   http-io-streams:
     brotli: false
 
   libarchive:
-    system-libarchive: true
+    system-libarchive: false
 
   regex-posix:
     _regex-posix-clib: true

test/optparse-test/CompileTest.hs

@@ -47,7 +47,7 @@ mkDefaultHLSCompileOptions target ghcs =
     Nothing
     True
     False
-    (Left False)
+    Nothing
     Nothing
     Nothing
     Nothing
@@ -91,15 +91,15 @@ compileGhcCheckList = mapSecond CompileGHC
   , (baseCmd <> "--cross-target armv7-unknown-linux-gnueabihf", baseOptions{GHC.crossTarget = Just "armv7-unknown-linux-gnueabihf"})
   , (baseCmd <> "-- --enable-unregisterised", baseOptions{GHC.addConfArgs = ["--enable-unregisterised"]})
   , (baseCmd <> "--set", baseOptions{GHC.setCompile = True})
-  , (baseCmd <> "-o 9.4.5-p1", baseOptions{GHC.ovewrwiteVer = Just $(versionQ "9.4.5-p1")})
-  , (baseCmd <> "--overwrite-version 9.4.5-p1", baseOptions{GHC.ovewrwiteVer = Just $(versionQ "9.4.5-p1")})
+  , (baseCmd <> "-o 9.4.5-p1", baseOptions{GHC.overwriteVer = Just [S "9.4.5-p1"]})
+  , (baseCmd <> "--overwrite-version 9.4.5-p1", baseOptions{GHC.overwriteVer = Just [S "9.4.5-p1"]})
   , (baseCmd <> "-f make", baseOptions{GHC.buildFlavour = Just "make"})
   , (baseCmd <> "--flavour make", baseOptions{GHC.buildFlavour = Just "make"})
   , (baseCmd <> "--hadrian", baseOptions{GHC.buildSystem = Just Hadrian})
   , (baseCmd <> "--make", baseOptions{GHC.buildSystem = Just Make})
 #ifdef IS_WINDOWS
-  , (baseCmd <> "-i C:\\\\tmp\\out_dir", baseOptions{GHC.isolateDir = Just "C:\\\\tmp\\out_dir"})
-  , (baseCmd <> "--isolate C:\\\\tmp\\out_dir", baseOptions{GHC.isolateDir = Just "C:\\\\tmp\\out_dir"})
+  , (baseCmd <> "-i C:\\\\tmp\\out_dir", baseOptions{GHC.isolateDir = Just "C:\\tmp\\out_dir"})
+  , (baseCmd <> "--isolate C:\\\\tmp\\out_dir", baseOptions{GHC.isolateDir = Just "C:\\tmp\\out_dir"})
 #else
   , (baseCmd <> "-i /tmp/out_dir", baseOptions{GHC.isolateDir = Just "/tmp/out_dir"})
   , (baseCmd <> "--isolate /tmp/out_dir", baseOptions{GHC.isolateDir = Just "/tmp/out_dir"})
@@ -158,12 +158,14 @@ compileHlsCheckList = mapSecond CompileHLS
   , (baseCmd <> "--jobs 10", baseOptions{HLS.jobs = Just 10})
   , (baseCmd <> "--no-set", baseOptions{HLS.setCompile = False})
   , (baseCmd <> "--cabal-update", baseOptions{HLS.updateCabal = True})
-  , (baseCmd <> "-o 2.0.0.0-p1", baseOptions{HLS.ovewrwiteVer = Right $(versionQ "2.0.0.0-p1")})
-  , (baseCmd <> "--overwrite-version 2.0.0.0-p1", baseOptions{HLS.ovewrwiteVer = Right $(versionQ "2.0.0.0-p1")})
-  , (baseCmd <> "--git-describe-version", baseOptions{HLS.ovewrwiteVer = Left True})
+  , (baseCmd <> "-o 2.0.0.0-p1", baseOptions{HLS.overwriteVer = Just [S "2.0.0.0-p1"]})
+  , (baseCmd <> "--overwrite-version 2.0.0.0-p1", baseOptions{HLS.overwriteVer = Just [S "2.0.0.0-p1"]})
+  , (baseCmd <> "--overwrite-version %v-%h-%H-%b-%g-coco%l", baseOptions{HLS.overwriteVer
+    = Just [CabalVer, S "-", GitHashShort, S "-", GitHashLong, S "-", GitBranchName, S "-", GitDescribe, S "-coco", S "%", S "l"]})
+  , (baseCmd <> "--git-describe-version", baseOptions{HLS.overwriteVer = Just [GitDescribe]})
 #ifdef IS_WINDOWS
-  , (baseCmd <> "-i C:\\\\tmp\\out_dir", baseOptions{HLS.isolateDir = Just "C:\\\\tmp\\out_dir"})
-  , (baseCmd <> "--isolate C:\\\\tmp\\out_dir", baseOptions{HLS.isolateDir = Just "C:\\\\tmp\\out_dir"})
+  , (baseCmd <> "-i C:\\\\tmp\\out_dir", baseOptions{HLS.isolateDir = Just "C:\\tmp\\out_dir"})
+  , (baseCmd <> "--isolate C:\\\\tmp\\out_dir", baseOptions{HLS.isolateDir = Just "C:\\tmp\\out_dir"})
 #else
   , (baseCmd <> "-i /tmp/out_dir", baseOptions{HLS.isolateDir = Just "/tmp/out_dir"})
   , (baseCmd <> "--isolate /tmp/out_dir", baseOptions{HLS.isolateDir = Just "/tmp/out_dir"})

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

test/optparse-test/InstallTest.hs

@@ -48,7 +48,7 @@ oldStyleCheckList =
     : ("install --set", Right defaultOptions{instSet = True})
     : ("install --force", Right defaultOptions{forceInstall = True})
 #ifdef IS_WINDOWS
-    : ("install -i C:\\\\", Right defaultOptions{Install.isolateDir = Just "C:\\\\"})
+    : ("install -i C:\\\\", Right defaultOptions{Install.isolateDir = Just "C:\\"})
 #else
     : ("install -i /", Right defaultOptions{Install.isolateDir = Just "/"})
 #endif

test/optparse-test/RunTest.hs

@@ -43,8 +43,8 @@ runCheckList =
   , ("run --hls 2.0", defaultOptions{runHLSVer = Just $ ToolVersion $(versionQ "2.0")})
   , ("run --stack 2.9", defaultOptions{runStackVer = Just $ ToolVersion $(versionQ "2.9") })
 #ifdef IS_WINDOWS
-  , ("run -b C:\\\\tmp\\dir", defaultOptions{runBinDir = Just "C:\\\\tmp\\dir"})
-  , ("run --bindir C:\\\\tmp\\dir", defaultOptions{runBinDir = Just "C:\\\\tmp\\dir"})
+  , ("run -b C:\\\\tmp\\dir", defaultOptions{runBinDir = Just "C:\\tmp\\dir"})
+  , ("run --bindir C:\\\\tmp\\dir", defaultOptions{runBinDir = Just "C:\\tmp\\dir"})
 #else
   , ("run -b /tmp/dir", defaultOptions{runBinDir = Just "/tmp/dir"})
   , ("run --bindir /tmp/dir", defaultOptions{runBinDir = Just "/tmp/dir"})