Update docs for ghc-wasm-meta

Bump ghcup to 0.1.22.0
Merge remote-tracking branch 'origin/issue-1004'
2024-03-02 13:01:28 +08:00 · 2024-03-01 22:33:58 +08:00 · 2024-03-01 22:15:13 +08:00 · 2024-02-21 16:50:24 +08:00 · 2024-02-21 16:27:36 +08:00 · 2024-02-21 15:32:35 +08:00
35 changed files with 552 additions and 286 deletions
--- a/.github/scripts/test.sh
+++ b/.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}")"
--- a/.github/workflows/bootstrap.yaml
+++ b/.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
+
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,37 @@
 # Revision history for ghcup

+## 0.1.22.0 -- ????-??-??
+
+### New features
+
+* 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)
+
+### Improvements and bug fixes
+
+* 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
--- a/app/ghcup/Main.hs
+++ b/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
@@ -341,12 +342,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 }))
--- a/cabal.ghc8107.project
+++ b/cabal.ghc8107.project
@@ -26,11 +26,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,7 +44,7 @@ package streamly
 package *
  test-show-details: direct

-allow-newer: cabal-install-parsers:tar
+allow-newer: cabal-install-parsers:tar, streamly:Win32


 with-compiler: ghc-8.10.7
--- a/cabal.ghc8107.project.freeze
+++ b/cabal.ghc8107.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,8 +10,8 @@ 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,
@@ -26,31 +25,30 @@ 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.bytestring ==0.11.5.3,
             any.bz2 ==1.0.1.0,
             bz2 -cross +with-bzlib,
             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 +76,7 @@ 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.1,
             any.disk-free-space ==0.1.0.1,
             any.distributive ==0.6.2.1,
             distributive +semigroups +tagged,
@@ -86,7 +84,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.300.1,
+             filepath -cpphs,
             any.foldable1-classes-compat ==0.1,
             foldable1-classes-compat +tagged,
             any.free ==5.2,
@@ -111,17 +110,18 @@ constraints: any.Cabal ==3.6.3.0,
             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,
@@ -159,11 +159,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 +205,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 +225,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 +241,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.5,
+             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 +255,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-02-18T14:07:35Z
--- a/cabal.ghc902.project
+++ b/cabal.ghc902.project
@@ -26,11 +26,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,7 +44,7 @@ package streamly
 package *
  test-show-details: direct

-allow-newer: cabal-install-parsers:tar
+allow-newer: cabal-install-parsers:tar, streamly:Win32


 with-compiler: ghc-9.0.2
--- a/cabal.ghc902.project.freeze
+++ b/cabal.ghc902.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,8 +10,8 @@ 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,
@@ -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,13 @@ 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.bytestring ==0.11.5.3,
             any.bz2 ==1.0.1.0,
             bz2 -cross +with-bzlib,
             any.bzlib-conduit ==0.3.0.2,
             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 +79,9 @@ 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.1,
             any.disk-free-space ==0.1.0.1,
             any.distributive ==0.6.2.1,
             distributive +semigroups +tagged,
@@ -91,7 +89,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.300.1,
+             filepath -cpphs,
             any.foldable1-classes-compat ==0.1,
             foldable1-classes-compat +tagged,
             any.free ==5.2,
@@ -117,16 +116,17 @@ constraints: any.Cabal ==3.6.3.0,
             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,
@@ -163,11 +163,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 +211,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 +232,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 +250,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.5,
+             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 +268,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-02-18T14:07:35Z
--- a/cabal.ghc928.project
+++ b/cabal.ghc928.project
@@ -26,11 +26,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,7 +44,7 @@ package streamly
 package *
  test-show-details: direct

-allow-newer: cabal-install-parsers:tar
+allow-newer: cabal-install-parsers:tar, streamly:Win32


 with-compiler: ghc-9.2.8
--- a/cabal.ghc928.project.freeze
+++ b/cabal.ghc928.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,8 +10,8 @@ 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,
@@ -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,
@@ -54,7 +52,7 @@ constraints: any.Cabal ==3.6.3.0,
             any.bzlib-conduit ==0.3.0.2,
             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 +79,9 @@ 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.7.1,
             any.disk-free-space ==0.1.0.1,
             any.distributive ==0.6.2.1,
             distributive +semigroups +tagged,
@@ -91,7 +89,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.300.1,
+             filepath -cpphs,
             any.foldable1-classes-compat ==0.1,
             foldable1-classes-compat +tagged,
             any.free ==5.2,
@@ -117,16 +116,17 @@ constraints: any.Cabal ==3.6.3.0,
             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,
@@ -163,11 +163,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 +211,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,
@@ -248,11 +249,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.5,
+             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 +267,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-02-18T14:07:35Z
--- a/cabal.ghc948.project
+++ b/cabal.ghc948.project
@@ -26,11 +26,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,7 +44,7 @@ package streamly
 package *
  test-show-details: direct

-allow-newer: cabal-install-parsers:tar
+allow-newer: cabal-install-parsers:tar, streamly:Win32


 with-compiler: ghc-9.4.8
--- a/cabal.ghc948.project.freeze
+++ b/cabal.ghc948.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,8 +10,8 @@ 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,
@@ -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,
@@ -54,7 +52,7 @@ constraints: any.Cabal ==3.6.3.0 || ==3.8.1.0,
             any.bzlib-conduit ==0.3.0.2,
             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 +78,9 @@ 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.1,
             any.disk-free-space ==0.1.0.1,
             any.distributive ==0.6.2.1,
             distributive +semigroups +tagged,
@@ -90,7 +88,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.300.1,
+             filepath -cpphs,
             any.foldable1-classes-compat ==0.1,
             foldable1-classes-compat +tagged,
             any.free ==5.2,
@@ -116,16 +115,17 @@ constraints: any.Cabal ==3.6.3.0 || ==3.8.1.0,
             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,
@@ -166,7 +166,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 +209,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 +230,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 +248,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.5,
+             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 +266,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-02-18T14:07:35Z
--- a/cabal.project
+++ b/cabal.project
@@ -26,11 +26,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 +44,5 @@ package streamly
 package *
  test-show-details: direct

-allow-newer: cabal-install-parsers:tar
+allow-newer: cabal-install-parsers:tar, streamly:Win32

--- a/cabal.project.freeze
+++ b/cabal.project.freeze
@@ -1,2 +0,0 @@
-- windows picks weird version
-constraints: any.hsc2hs ==0.68.8
--- a/cabal.project.release
+++ b/cabal.project.release
@@ -29,7 +29,9 @@ elif os(freebsd)

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

 package libarchive
  flags: -system-libarchive
@@ -56,10 +58,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

--- a/docs/guide.md
+++ b/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

@@ -508,7 +509,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:

@@ -560,6 +561,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
--- a/ghcup.cabal
+++ b/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,7 @@ 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
+    , 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 +184,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 +212,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
@@ -268,7 +268,7 @@ library

  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 +356,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 +397,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 +408,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
--- a/hie.yaml
+++ b/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"
--- a/lib-opt/GHCup/OptParse/Common.hs
+++ b/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 ]--
    ------------------
--- a/lib-opt/GHCup/OptParse/Compile.hs
+++ b/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
                      )
                    )
          )
@@ -529,7 +540,7 @@ compile compileCommand settings Dirs{..} runAppState runLogger = do
                    targetHLS
                    ghcs
                    jobs
-                    ovewrwiteVer
+                    overwriteVer
                    (maybe GHCupInternal IsolateDir isolateDir)
                    cabalProject
                    cabalProjectLocal
@@ -576,7 +587,7 @@ compile compileCommand settings Dirs{..} runAppState runLogger = do
        targetVer <- liftE $ compileGHC
                    targetGhc
                    crossTarget
-                    ovewrwiteVer
+                    overwriteVer
                    bootstrapGhc
                    jobs
                    buildConfig
--- a/lib/GHCup/Download.hs
+++ b/lib/GHCup/Download.hs
@@ -92,6 +92,8 @@ import qualified Data.Yaml.Aeson               as Y



+-- $setup
+-- >>> :set -XOverloadedStrings



--- a/lib/GHCup/GHC.hs
+++ b/lib/GHCup/GHC.hs
@@ -807,7 +807,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 +843,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 +870,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 +898,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 +940,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 +958,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 +1110,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 +1182,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
--- a/lib/GHCup/HLS.hs
+++ b/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


    -----------------
--- a/lib/GHCup/Prelude/Internal.hs
+++ b/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))
--- a/lib/GHCup/Prelude/Process/Posix.hs
+++ b/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`.
--- a/lib/GHCup/Prelude/Process/Windows.hs
+++ b/lib/GHCup/Prelude/Process/Windows.hs
@@ -263,12 +263,9 @@ 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
@@ -276,11 +273,4 @@ createProcessWithMingwPath cp = do
  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")

--- a/lib/GHCup/Types.hs
+++ b/lib/GHCup/Types.hs
@@ -544,11 +544,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 +789,13 @@ instance Pretty ToolVersion where
 data BuildSystem = Hadrian
                 | Make
  deriving (Show, Eq)
+
+
+data VersionPattern = CabalVer
+                    | GitHashShort
+                    | GitHashLong
+                    | GitDescribe
+                    | GitBranchName
+                    | S String
+  deriving (Eq, Show)
+
--- a/lib/GHCup/Utils.hs
+++ b/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
+
--- a/lib/GHCup/Utils/Dirs.hs
+++ b/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 { .. }


--- a/scripts/bootstrap/bootstrap-haskell
+++ b/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,6 +28,15 @@
 # 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"
@@ -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() {
--- a/scripts/bootstrap/bootstrap-haskell.ps1
+++ b/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)
 }


--- a/stack.yaml
+++ b/stack.yaml
@@ -1,38 +1,66 @@
-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
+  - bzlib-0.5.1.0@sha256:197ea0ba028dd1fe274f7601dae58d23607c4760119bf40bc2087720f6734e6c,2288
+  - 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.1@sha256:6c75230057a708168dbc420975572511ad3ec09956bf73c3b6f4be03324e8b13,2815
+  - 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
--- a/test/optparse-test/CompileTest.hs
+++ b/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"})
--- a/test/optparse-test/InstallTest.hs
+++ b/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
--- a/test/optparse-test/RunTest.hs
+++ b/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"})
Author	SHA1	Message	Date
Julian Ospald	b413ade4db	Update docs for ghc-wasm-meta	2024-03-02 13:01:28 +08:00
Julian Ospald	190d308ddf	Bump ghcup to 0.1.22.0	2024-03-01 22:33:58 +08:00
Julian Ospald	4314146247	Merge remote-tracking branch 'origin/issue-1004'	2024-03-01 22:15:13 +08:00
Julian Ospald	4831798c9e	Merge branch 'issue-982'	2024-02-21 16:50:24 +08:00
Julian Ospald	e999e6f5b8	Merge branch 'refreezeee'	2024-02-21 16:27:36 +08:00
Julian Ospald	3ad785c116	Refreeze, update stack.yaml, etc.	2024-02-21 15:32:35 +08:00
Julian Ospald	be3db87410	Clean up on error, fixes #1004	2024-02-18 20:07:12 +08:00
Julian Ospald	57d23c477d	Update hie.yaml	2024-02-18 19:53:46 +08:00
Julian Ospald	0ec07636fb	Merge branch 'issue-998'	2024-02-18 19:53:23 +08:00
Julian Ospald	bdd15ad6e7	Beef up --overwrite-version, fixes #998	2024-02-18 19:52:01 +08:00
Julian Ospald	96f7aa5c62	Allow to set ghcup msys2 environment Fixes #982	2024-02-18 16:22:20 +08:00