Fix crash in 'ghcup tui' on windows

* https://github.com/haskell/ghcup-hs/issues/1013 * https://github.com/jtdaugherty/brick/issues/502#issuecomment-1974980299 * 4c395182cb
Bump ghcup to 0.1.22.0
2024-03-03 14:44:20 +08:00 · 2024-03-01 22:33:58 +08:00 · 2024-03-01 22:15:13 +08:00 · 2024-02-18 20:07:12 +08:00
12 changed files with 53 additions and 27 deletions
--- 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/cabal.ghc8107.project
+++ b/cabal.ghc8107.project
@@ -13,9 +13,12 @@ constraints: http-io-streams -brotli,
             any.aeson >= 2.0.1.0

 if os(mingw32)
+  constraints: vty-windows >=0.2.0.2
+
  if impl(ghc >= 9.4)
    constraints: language-c >= 0.9.3

+
 source-repository-package
  type: git
  location: https://github.com/haskell/tar.git
--- a/cabal.ghc902.project
+++ b/cabal.ghc902.project
@@ -13,9 +13,12 @@ constraints: http-io-streams -brotli,
             any.aeson >= 2.0.1.0

 if os(mingw32)
+  constraints: vty-windows >=0.2.0.2
+
  if impl(ghc >= 9.4)
    constraints: language-c >= 0.9.3

+
 source-repository-package
  type: git
  location: https://github.com/haskell/tar.git
--- a/cabal.ghc928.project
+++ b/cabal.ghc928.project
@@ -13,9 +13,12 @@ constraints: http-io-streams -brotli,
             any.aeson >= 2.0.1.0

 if os(mingw32)
+  constraints: vty-windows >=0.2.0.2
+
  if impl(ghc >= 9.4)
    constraints: language-c >= 0.9.3

+
 source-repository-package
  type: git
  location: https://github.com/haskell/tar.git
--- a/cabal.ghc948.project
+++ b/cabal.ghc948.project
@@ -13,9 +13,12 @@ constraints: http-io-streams -brotli,
             any.aeson >= 2.0.1.0

 if os(mingw32)
+  constraints: vty-windows >=0.2.0.2
+
  if impl(ghc >= 9.4)
    constraints: language-c >= 0.9.3

+
 source-repository-package
  type: git
  location: https://github.com/haskell/tar.git
--- a/cabal.project
+++ b/cabal.project
@@ -13,9 +13,12 @@ constraints: http-io-streams -brotli,
             any.aeson >= 2.0.1.0

 if os(mingw32)
+  constraints: vty-windows >=0.2.0.2
+
  if impl(ghc >= 9.4)
    constraints: language-c >= 0.9.3

+
 source-repository-package
  type: git
  location: https://github.com/haskell/tar.git
--- a/cabal.project.release
+++ b/cabal.project.release
@@ -18,7 +18,7 @@ elif os(mingw32)
  constraints: zlib +bundled-c-zlib,
               lzma +static,
               text -simdutf,
-               vty-windows >=0.1.0.3
+               vty-windows >=0.2.0.2
  if impl(ghc >= 9.4)
    constraints: language-c >= 0.9.3
 elif os(freebsd)
--- 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
--- a/lib/GHCup/GHC.hs
+++ b/lib/GHCup/GHC.hs
@@ -908,7 +908,7 @@ compileGHC targetGhc crossTarget vps bstrap jobs mbuildConfig patches aargs buil
      GitDist GitBranch{..} -> do
        tmpUnpack <- lift mkGhcupTmpDir
        let git args = execLogged "git" ("--no-pager":args) (Just $ fromGHCupPath tmpUnpack) "git" Nothing
-        (tver, ov) <- 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" ]
--- a/lib/GHCup/HLS.hs
+++ b/lib/GHCup/HLS.hs
@@ -437,7 +437,7 @@ compileHLS targetHLS ghcs jobs vps installDir cabalProject cabalProjectLocal upd
    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" ]
--- a/lib/GHCup/Utils.hs
+++ b/lib/GHCup/Utils.hs
@@ -1084,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 ()
--- a/stack.yaml
+++ b/stack.yaml
@@ -37,7 +37,7 @@ extra-deps:
  - vty-6.2@sha256:3536dc83a3fee17d9a114baf58fe47b6f080c24987266f0cd0b7b4b1fcd9cf19,3520
  - vty-crossplatform-0.4.0.0@sha256:50593f91ad16777d921138475a8d2784d538fd206addd30664c620278d6c8544,3172
  - vty-unix-0.2.0.0@sha256:2af3d0bdae3c4b7b7e567ee374efe32c7439fabdf9096465ce011a6c6736e9ae,2932
-  - vty-windows-0.2.0.1@sha256:6c75230057a708168dbc420975572511ad3ec09956bf73c3b6f4be03324e8b13,2815
+  - vty-windows-0.2.0.2
  - yaml-streamly-0.12.4@sha256:b5250c5dc71d668c43c42ed6f86f956d69125136ea960858527a4b2ff712d3d1,5165
  - github: hasufell/uri-bytestring
    commit: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001
Author	SHA1	Message	Date
Julian Ospald	d9d13dda5f	Fix crash in 'ghcup tui' on windows * https://github.com/haskell/ghcup-hs/issues/1013 * https://github.com/jtdaugherty/brick/issues/502#issuecomment-1974980299 * `4c395182cb`	2024-03-03 14:44:20 +08:00
Julian Ospald	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	be3db87410	Clean up on error, fixes #1004	2024-02-18 20:07:12 +08:00