Merge branch 'ghcup-run-improvements'

2022-07-12 00:10:17 +02:00
parent 2f299ee48d 7a2a5074fa
commit 823275363c
12 changed files with 238 additions and 162 deletions
--- a/lib/GHCup/Errors.hs
+++ b/lib/GHCup/Errors.hs
@@ -137,7 +137,7 @@ data AlreadyInstalled = AlreadyInstalled Tool Version

 instance Pretty AlreadyInstalled where
  pPrint (AlreadyInstalled tool ver') =
-    pPrint tool <+> text "-" <+> pPrint ver' <+> text "is already installed;"
+    (pPrint tool <> text "-" <> pPrint ver') <+> text "is already installed;"
    <+> text "if you really want to reinstall it, you may want to run 'ghcup install cabal --force" <+> (pPrint ver' <> text "'")


--- a/lib/GHCup/Types.hs
+++ b/lib/GHCup/Types.hs
@@ -407,6 +407,9 @@ data AppState = AppState

 instance NFData AppState

+fromAppState :: AppState -> LeanAppState
+fromAppState AppState {..} = LeanAppState {..}
+
 data LeanAppState = LeanAppState
  { settings :: Settings
  , dirs :: Dirs