From d5f98df610d00a9bfd45ee6b55fdd11421bc5e24 Mon Sep 17 00:00:00 2001 From: Yvan Sraka Date: Mon, 10 Jul 2023 19:45:42 +0200 Subject: [PATCH] Remove legacy command v1-freeze --- cabal-install/src/Distribution/Client/Main.hs | 24 ------------------- .../src/Distribution/Client/Setup.hs | 1 - 2 files changed, 25 deletions(-) diff --git a/cabal-install/src/Distribution/Client/Main.hs b/cabal-install/src/Distribution/Client/Main.hs index 1a3cc94d49f..eeb084f62ef 100644 --- a/cabal-install/src/Distribution/Client/Main.hs +++ b/cabal-install/src/Distribution/Client/Main.hs @@ -49,7 +49,6 @@ import Distribution.Client.Setup , defaultInstallFlags , fetchCommand , formatCommand - , freezeCommand , genBoundsCommand , getCommand , globalCommand @@ -137,7 +136,6 @@ import qualified Distribution.Client.CmdUpdate as CmdUpdate import Distribution.Client.Check as Check (check) import Distribution.Client.Configure (configure, writeConfigFlags) import Distribution.Client.Fetch (fetch) -import Distribution.Client.Freeze (freeze) import Distribution.Client.GenBounds (genBounds) import Distribution.Client.Install (install) @@ -395,7 +393,6 @@ mainWorker args = do , legacyCmd configureExCommand configureAction , legacyCmd buildCommand buildAction , legacyCmd replCommand replAction - , legacyCmd freezeCommand freezeAction , legacyCmd haddockCommand haddockAction , legacyCmd installCommand installAction , legacyCmd runCommand runAction @@ -1048,27 +1045,6 @@ fetchAction fetchFlags extraArgs globalFlags = do fetchFlags targets -freezeAction :: FreezeFlags -> [String] -> Action -freezeAction freezeFlags _extraArgs globalFlags = do - let verbosity = fromFlag (freezeVerbosity freezeFlags) - config <- loadConfigOrSandboxConfig verbosity globalFlags - distPref <- findSavedDistPref config NoFlag - nixShell verbosity distPref globalFlags config $ do - let configFlags = savedConfigureFlags config - globalFlags' = savedGlobalFlags config `mappend` globalFlags - (comp, platform, progdb) <- configCompilerAux' configFlags - - withRepoContext verbosity globalFlags' $ \repoContext -> - freeze - verbosity - (configPackageDB' configFlags) - repoContext - comp - platform - progdb - globalFlags' - freezeFlags - genBoundsAction :: FreezeFlags -> [String] -> GlobalFlags -> IO () genBoundsAction freezeFlags _extraArgs globalFlags = do let verbosity = fromFlag (freezeVerbosity freezeFlags) diff --git a/cabal-install/src/Distribution/Client/Setup.hs b/cabal-install/src/Distribution/Client/Setup.hs index 460decd55cd..b935420d7ae 100644 --- a/cabal-install/src/Distribution/Client/Setup.hs +++ b/cabal-install/src/Distribution/Client/Setup.hs @@ -409,7 +409,6 @@ globalCommand commands = , addCmd "v1-run" , addCmd "v1-test" , addCmd "v1-bench" - , addCmd "v1-freeze" , addCmd "v1-haddock" , addCmd "v1-install" , addCmd "v1-clean"