diff --git a/cabal.project b/cabal.project index f4b8e64..19af8aa 100644 --- a/cabal.project +++ b/cabal.project @@ -7,7 +7,7 @@ package ghcup source-repository-package type: git location: https://github.com/haskell/ghcup-hs.git - tag: 91ef2c7666d118bc6bd7d2fc2eeb7754081a9f3d + tag: 0fd70d9797a655d64fa1c5531e5c3a2903518254 constraints: http-io-streams -brotli, any.aeson >= 2.0.1.0 @@ -24,5 +24,3 @@ package cabal-plan package aeson flags: +ordered-keymap -package streamly - flags: +use-unliftio diff --git a/ghcup-gen/Main.hs b/ghcup-gen/Main.hs index fb87ba5..5e33b89 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)) dirs defaultKeyBindings loggerConfig + let leanAppstate = LeanAppState (Settings True 0 Lax False Never Curl True GHCupURL False GPGNone True Nothing (DM mempty) []) 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)) dirs defaultKeyBindings (GHCupInfo mempty mempty Nothing) pfreq loggerConfig + let appstate = AppState (Settings True 0 Lax False Never Curl True GHCupURL False GPGNone True Nothing (DM mempty) []) 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 404372e..bae4af6 100644 --- a/ghcup-gen/ghcup-gen.cabal +++ b/ghcup-gen/ghcup-gen.cabal @@ -66,4 +66,4 @@ executable ghcup-gen , text ^>=2.0 , transformers ^>=0.5 , versions >=6.0.0 - , yaml-streamly ^>=0.12.0 + , yaml ^>=0.11.11.2