Merge branch 'compile-overwrite' into master

app/ghcup/Main.hs

@@ -992,6 +992,7 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                       , PatchFailed
                       , UnknownArchive
                       , TarDirDoesNotExist
+                      , NotInstalled
 #if !defined(TAR)
                       , ArchiveResult
 #endif

cabal.project

@@ -20,6 +20,12 @@ source-repository-package
     tag: bf6d28cf989b70286e12fecc183d5bbf5454a1a2
     subdir: hpath-directory
 
+-- https://github.com/cjdev/text-conversions/pull/10
+source-repository-package
+    type: git
+    location: https://github.com/hasufell/text-conversions.git
+    tag: 9abf0e5e5664a3178367597c32db19880477a53c
+
 optimization: 2
 
 package streamly

lib/GHCup.hs

@@ -807,6 +807,7 @@ compileGHC :: ( MonadMask m
                  , PatchFailed
                  , UnknownArchive
                  , TarDirDoesNotExist
+                 , NotInstalled
 #if !defined(TAR)
                  , ArchiveResult
 #endif
@@ -816,8 +817,9 @@ compileGHC :: ( MonadMask m
 compileGHC dls tver bstrap jobs mbuildConfig patchdir aargs pfreq@(PlatformRequest {..})
   = do
     lift $ $(logDebug) [i|Requested to compile: #{tver} with #{bstrap}|]
-    whenM (lift $ ghcInstalled tver)
+
-          (throwE $ AlreadyInstalled GHC (tver ^. tvVersion))
+    alreadyInstalled <- lift $ ghcInstalled tver
+    alreadySet <- fmap (maybe False (==tver)) $ lift $ ghcSet (_tvTarget tver)
 
     -- download source tarball
     dlInfo <-
@@ -840,13 +842,16 @@ compileGHC dls tver bstrap jobs mbuildConfig patchdir aargs pfreq@(PlatformReque
 
     (bindist, bmk) <- liftE $ runBuildAction
       tmpUnpack
-      (Just ghcdir)
+      Nothing
       (do
         b   <- compileBindist bghc ghcdir workdir
         bmk <- liftIO $ readFileStrict (build_mk workdir)
         pure (b, bmk)
       )
 
+    when alreadyInstalled $ do
+      lift $ $(logInfo) [i|Deleting existing installation|]
+      liftE $ rmGHCVer tver
     liftE $ installPackedGHC bindist
                              (view dlSubdir dlInfo)
                              ghcdir
@@ -856,6 +861,9 @@ compileGHC dls tver bstrap jobs mbuildConfig patchdir aargs pfreq@(PlatformReque
     liftIO $ writeFile (ghcdir </> ghcUpSrcBuiltFile) (Just newFilePerms) bmk
 
     reThrowAll GHCupSetError $ postGHCInstall tver
+
+    -- restore
+    when alreadySet $ liftE $ void $ setGHC tver SetGHCOnly
     pure ()
 
  where

lib/GHCup/Utils.hs

@@ -596,8 +596,8 @@ getChangeLog dls tool (Right tag) =
 --   1. the build directory, depending on the KeepDirs setting
 --   2. the install destination, depending on whether the build failed
 runBuildAction :: (Show (V e), MonadReader Settings m, MonadIO m, MonadMask m)
-               => Path Abs          -- ^ build directory
+               => Path Abs          -- ^ build directory (cleaned up depending on Settings)
-               -> Maybe (Path Abs)  -- ^ install location (e.g. for GHC)
+               -> Maybe (Path Abs)  -- ^ dir to *always* clean up on exception
                -> Excepts e m a
                -> Excepts '[BuildFailed] m a
 runBuildAction bdir instdir action = do