Merge remote-tracking branch 'origin/merge-requests/92'

This commit is contained in:
Julian Ospald 2021-06-06 12:10:35 +02:00
commit 97029e8102
Signed by: hasufell
GPG Key ID: 3786C5262ECB4A3F

View File

@ -292,7 +292,7 @@ com =
( Install ( Install
<$> info <$> info
(installParser <**> helper) (installParser <**> helper)
( progDesc "Install or update GHC/cabal" ( progDesc "Install or update GHC/cabal/HLS"
<> footerDoc (Just $ text installToolFooter) <> footerDoc (Just $ text installToolFooter)
) )
) )
@ -308,7 +308,7 @@ com =
"rm" "rm"
(info (info
(Rm <$> rmParser <**> helper) (Rm <$> rmParser <**> helper)
( progDesc "Remove a GHC/cabal version" ( progDesc "Remove a GHC/cabal/HLS version"
<> footerDoc (Just $ text rmFooter) <> footerDoc (Just $ text rmFooter)
) )
) )
@ -1124,7 +1124,7 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
---------------------------------------- ----------------------------------------
-- Getting download and platform info -- -- Getting download and platform info --
---------------------------------------- ----------------------------------------
ghcupInfo <- ghcupInfo <-
( runLogger ( runLogger
. runE @'[JSONError , DownloadFailed, FileDoesNotExistError] . runE @'[JSONError , DownloadFailed, FileDoesNotExistError]