From ce6d0ae652c4cea62b78371030c771cbc48aff00 Mon Sep 17 00:00:00 2001 From: Divam Date: Fri, 3 Jan 2025 11:53:17 +0900 Subject: [PATCH] Fix build with ghcup 0.1.40.0; bump bounds --- ghcup-gen/Main.hs | 4 ++-- ghcup-gen/ghcup-gen.cabal | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ghcup-gen/Main.hs b/ghcup-gen/Main.hs index 27600c4..83e9a06 100644 --- a/ghcup-gen/Main.hs +++ b/ghcup-gen/Main.hs @@ -194,7 +194,7 @@ main = do , fancyColors = not no_color } dirs <- liftIO getAllDirs - let leanAppstate = LeanAppState (Settings True 0 Lax False Never Curl True GHCupURL False GPGNone True Nothing (DM mempty) [] defaultPagerConfig) dirs defaultKeyBindings loggerConfig + let leanAppstate = LeanAppState (Settings True 0 Lax False Never Curl True [NewGHCupURL] False GPGNone True Nothing (DM mempty) [] defaultPagerConfig) dirs defaultKeyBindings loggerConfig pfreq <- ( flip runReaderT leanAppstate . runE @'[NoCompatiblePlatform, NoCompatibleArch, DistroNotFound] $ platformRequest @@ -204,7 +204,7 @@ main = do flip runReaderT leanAppstate $ logError $ T.pack $ prettyShow e liftIO $ exitWith (ExitFailure 2) - let appstate = AppState (Settings True 0 Lax False Never Curl True GHCupURL False GPGNone True Nothing (DM mempty) [] defaultPagerConfig) dirs defaultKeyBindings (GHCupInfo mempty mempty Nothing) pfreq loggerConfig + let appstate = AppState (Settings True 0 Lax False Never Curl True [NewGHCupURL] False GPGNone True Nothing (DM mempty) [] defaultPagerConfig) dirs defaultKeyBindings (GHCupInfo mempty mempty Nothing) pfreq loggerConfig let withValidateYamlOpts vopts f = case vopts of ValidateYAMLOpts { vInput = Nothing } -> diff --git a/ghcup-gen/ghcup-gen.cabal b/ghcup-gen/ghcup-gen.cabal index 2550412..b197e6f 100644 --- a/ghcup-gen/ghcup-gen.cabal +++ b/ghcup-gen/ghcup-gen.cabal @@ -51,7 +51,7 @@ executable ghcup-gen , containers ^>=0.6 , deepseq ^>=1.4 || ^>=1.5 , filepath >=1.4.101.0 - , ghcup ^>=0.1.19.0 + , ghcup >=0.1.40.0 , variant ^>=1.0 , libarchive ^>=3.0.3.0 , megaparsec >=8.0.0 && <9.8