diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Revision history for ghcup +## 0.1.50.2 -- 2025-05-17 + +* Respect system `ld` on all platforms and disable GHCs aggressive selection of `ld.gold`, fixes [#1032](https://github.com/haskell/ghcup-hs/issues/1032) +* TUI: allow responding to prompts with Return (defaulting to Yes response) by Jan Hrček wrt [#1253](https://github.com/haskell/ghcup-hs/pull/1253) + ## 0.1.50.1 -- 2025-03-25 * fix unwanted dynamic linking to libyaml on macOS, fixes [#1246](https://github.com/haskell/ghcup-hs/issues/1246) diff --git a/ghcup.cabal b/ghcup.cabal --- a/ghcup.cabal +++ b/ghcup.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: ghcup -version: 0.1.50.1 +version: 0.1.50.2 license: LGPL-3.0-only license-file: LICENSE copyright: Julian Ospald 2024 diff --git a/lib-tui/GHCup/Brick/Actions.hs b/lib-tui/GHCup/Brick/Actions.hs --- a/lib-tui/GHCup/Brick/Actions.hs +++ b/lib-tui/GHCup/Brick/Actions.hs @@ -411,7 +411,9 @@ HLS -> liftE $ setHLS lVer SetHLSOnly Nothing $> () Stack -> liftE $ setStack lVer $> () GHCup -> do - promptAnswer <- getUserPromptResponse "Switching GHCup versions is not supported.\nDo you want to install the latest version? [Y/N]: " + promptAnswer <- getUserPromptResponse + "Switching GHCup versions is not supported.\nDo you want to install the latest version? [Y/n]: " + PromptYes case promptAnswer of PromptYes -> do void $ liftE $ upgradeGHCup Nothing False False @@ -421,7 +423,7 @@ VRight _ -> pure $ Right () VLeft e -> case e of (V (NotInstalled tool _)) -> do - promptAnswer <- getUserPromptResponse userPrompt + promptAnswer <- getUserPromptResponse userPrompt PromptYes case promptAnswer of PromptYes -> do res <- install' input @@ -437,7 +439,7 @@ "This Version of " <> show tool <> " you are trying to set is not installed.\n" - <> "Would you like to install it first? [Y/N]: " + <> "Would you like to install it first? [Y/n]: " _ -> pure $ Left (prettyHFError e) diff --git a/lib/GHCup/GHC.hs b/lib/GHCup/GHC.hs --- a/lib/GHCup/GHC.hs +++ b/lib/GHCup/GHC.hs @@ -463,13 +463,24 @@ "ghc-configure" Nothing tmpInstallDest <- lift withGHCupTmpDir - lEM $ make (["DESTDIR=" <> fromGHCupPath tmpInstallDest] <> (words . T.unpack $ installTargets)) (Just $ fromGHCupPath path) + lEM $ make (["DESTDIR=" <> fromGHCupPath tmpInstallDest] <> (T.unpack <$> withStripTarget (_tvVersion tver) _rPlatform)) (Just $ fromGHCupPath path) liftE $ catchWarn $ lEM @_ @'[ProcessError] $ darwinNotarization _rPlatform (fromGHCupPath tmpInstallDest) liftE $ mergeGHCFileTree (tmpInstallDest `appendGHCupPath` dropDrive (fromInstallDir inst)) inst tver forceInstall pure () + where + installTargets' = T.words installTargets + -- https://github.com/haskell/ghcup-hs/issues/319 + withStripTarget ver plat + | ver >= [vver|7.10.0|] + , ver < [vver|8.3.0|] + , Linux _ <- plat + = "STRIP_CMD=true":installTargets' + | otherwise + = installTargets' + mergeGHCFileTree :: ( MonadReader env m , HasPlatformReq env , HasDirs env @@ -1404,7 +1415,6 @@ ldOverride :: Version -> Platform -> [String] ldOverride ver plat | ver >= [vver|8.2.2|] - , plat `elem` [Linux Alpine, Darwin] = ["--disable-ld-override"] | otherwise = [] diff --git a/lib/GHCup/Prompts.hs b/lib/GHCup/Prompts.hs --- a/lib/GHCup/Prompts.hs +++ b/lib/GHCup/Prompts.hs @@ -9,6 +9,7 @@ where import Control.Monad.Reader +import qualified Data.Text as T import qualified Data.Text.IO as TIO import GHCup.Prelude.Logger import GHCup.Types.Optics @@ -18,11 +19,14 @@ , MonadReader env m , MonadIO m) => PromptQuestion + -> PromptResponse -- ^ Default reponse to use if user doesn't type explicit response (e.g. just presses Return) -> m PromptResponse - -getUserPromptResponse prompt = do +getUserPromptResponse prompt defaultResponse = do logInfo prompt resp <- liftIO TIO.getLine - if resp `elem` ["YES", "yes", "y", "Y"] - then pure PromptYes - else pure PromptNo + pure $ + if T.null resp + then defaultResponse + else if resp `elem` ["YES", "yes", "y", "Y"] + then PromptYes + else PromptNo diff --git a/lib/GHCup/Types.hs b/lib/GHCup/Types.hs --- a/lib/GHCup/Types.hs +++ b/lib/GHCup/Types.hs @@ -263,43 +263,7 @@ | OpenSUSE -- not known | UnknownLinux - deriving (Eq, GHC.Generic, Ord, Show) - -instance Enum LinuxDistro where - toEnum 0 = Debian - toEnum 1 = Ubuntu - toEnum 2 = Mint - toEnum 3 = Fedora - toEnum 4 = CentOS - toEnum 5 = RedHat - toEnum 6 = Alpine - toEnum 7 = AmazonLinux - toEnum 8 = Rocky - toEnum 9 = Void - toEnum 10 = Gentoo - toEnum 11 = Exherbo - toEnum 12 = OpenSUSE - toEnum 13 = UnknownLinux - toEnum _ = error "toEnum: out of bounds" - - fromEnum Debian = 0 - fromEnum Ubuntu = 1 - fromEnum Mint = 2 - fromEnum Fedora = 3 - fromEnum CentOS = 4 - fromEnum RedHat = 5 - fromEnum Alpine = 6 - fromEnum AmazonLinux = 7 - fromEnum Rocky = 8 - fromEnum Void = 9 - fromEnum Gentoo = 10 - fromEnum Exherbo = 11 - fromEnum OpenSUSE = 12 - fromEnum UnknownLinux = 13 - -instance Bounded LinuxDistro where - minBound = Debian - maxBound = UnknownLinux + deriving (Bounded, Eq, Enum, GHC.Generic, Ord, Show) allDistros :: [LinuxDistro] allDistros = enumFromTo minBound maxBound diff --git a/scripts/bootstrap/bootstrap-haskell b/scripts/bootstrap/bootstrap-haskell --- a/scripts/bootstrap/bootstrap-haskell +++ b/scripts/bootstrap/bootstrap-haskell @@ -41,7 +41,7 @@ plat="$(uname -s)" arch=$(uname -m) -ghver="0.1.50.1" +ghver="0.1.50.2" : "${GHCUP_BASE_URL:=https://downloads.haskell.org/~ghcup}" export GHCUP_SKIP_UPDATE_CHECK=yes