From 7375dfb41ef43e6be3435c0e1f92aa931ea8302b Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Fri, 6 Dec 2024 13:35:56 -0800 Subject: [PATCH] ConstraintSourceCommandlineFlag -> ConstraintSourceUserTarget --- cabal-install/src/Distribution/Client/CmdBench.hs | 2 +- cabal-install/src/Distribution/Client/CmdBuild.hs | 2 +- cabal-install/src/Distribution/Client/CmdHaddock.hs | 2 +- cabal-install/src/Distribution/Client/CmdInstall.hs | 2 +- cabal-install/src/Distribution/Client/CmdListBin.hs | 2 +- cabal-install/src/Distribution/Client/CmdRepl.hs | 2 +- cabal-install/src/Distribution/Client/CmdRun.hs | 2 +- cabal-install/src/Distribution/Client/CmdSdist.hs | 2 +- cabal-install/src/Distribution/Client/CmdTest.hs | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cabal-install/src/Distribution/Client/CmdBench.hs b/cabal-install/src/Distribution/Client/CmdBench.hs index 79e8e146774..3126e17da17 100644 --- a/cabal-install/src/Distribution/Client/CmdBench.hs +++ b/cabal-install/src/Distribution/Client/CmdBench.hs @@ -125,7 +125,7 @@ benchAction flags@NixStyleFlags{..} targetStrings globalFlags = do =<< readTargetSelectors (localPackages baseCtx) (Just BenchKind) - (map (\target -> WithConstraintSource{constraintInner = target, constraintSource = ConstraintSourceCommandlineFlag}) targetStrings) + (map (\target -> WithConstraintSource{constraintInner = target, constraintSource = ConstraintSourceUserTarget}) targetStrings) buildCtx <- runProjectPreBuildPhase verbosity baseCtx $ \elaboratedPlan -> do diff --git a/cabal-install/src/Distribution/Client/CmdBuild.hs b/cabal-install/src/Distribution/Client/CmdBuild.hs index 7790c53a999..1e79514d6eb 100644 --- a/cabal-install/src/Distribution/Client/CmdBuild.hs +++ b/cabal-install/src/Distribution/Client/CmdBuild.hs @@ -197,7 +197,7 @@ buildAction flags@NixStyleFlags{extraFlags = buildFlags, ..} targetStrings globa ( \target -> WithConstraintSource { constraintInner = target - , constraintSource = ConstraintSourceCommandlineFlag + , constraintSource = ConstraintSourceUserTarget } ) targetStrings diff --git a/cabal-install/src/Distribution/Client/CmdHaddock.hs b/cabal-install/src/Distribution/Client/CmdHaddock.hs index cd2f61e5398..d713748f3a5 100644 --- a/cabal-install/src/Distribution/Client/CmdHaddock.hs +++ b/cabal-install/src/Distribution/Client/CmdHaddock.hs @@ -173,7 +173,7 @@ haddockAction relFlags targetStrings globalFlags = do =<< readTargetSelectors (localPackages baseCtx) Nothing - (map (\target -> WithConstraintSource{constraintInner = target, constraintSource = ConstraintSourceCommandlineFlag}) targetStrings) + (map (\target -> WithConstraintSource{constraintInner = target, constraintSource = ConstraintSourceUserTarget}) targetStrings) buildCtx <- runProjectPreBuildPhase verbosity baseCtx $ \elaboratedPlan -> do diff --git a/cabal-install/src/Distribution/Client/CmdInstall.hs b/cabal-install/src/Distribution/Client/CmdInstall.hs index ca288c76bbd..13d156b752f 100644 --- a/cabal-install/src/Distribution/Client/CmdInstall.hs +++ b/cabal-install/src/Distribution/Client/CmdInstall.hs @@ -382,7 +382,7 @@ installAction flags@NixStyleFlags{extraFlags, configFlags, installFlags, project ( \target -> WithConstraintSource { constraintInner = target - , constraintSource = ConstraintSourceCommandlineFlag + , constraintSource = ConstraintSourceUserTarget } ) targetStrings diff --git a/cabal-install/src/Distribution/Client/CmdListBin.hs b/cabal-install/src/Distribution/Client/CmdListBin.hs index 7187b86a265..bc8401c33aa 100644 --- a/cabal-install/src/Distribution/Client/CmdListBin.hs +++ b/cabal-install/src/Distribution/Client/CmdListBin.hs @@ -101,7 +101,7 @@ listbinAction flags@NixStyleFlags{..} args globalFlags = do let targetProvenance = WithConstraintSource { constraintInner = target - , constraintSource = ConstraintSourceCommandlineFlag + , constraintSource = ConstraintSourceUserTarget } -- configure and elaborate target selectors diff --git a/cabal-install/src/Distribution/Client/CmdRepl.hs b/cabal-install/src/Distribution/Client/CmdRepl.hs index 05401df30eb..372468c2453 100644 --- a/cabal-install/src/Distribution/Client/CmdRepl.hs +++ b/cabal-install/src/Distribution/Client/CmdRepl.hs @@ -293,7 +293,7 @@ replAction flags@NixStyleFlags{extraFlags = r@ReplFlags{..}, ..} targetStrings g (Just LibKind) flags ( map - (\target -> WithConstraintSource{constraintInner = target, constraintSource = ConstraintSourceCommandlineFlag}) + (\target -> WithConstraintSource{constraintInner = target, constraintSource = ConstraintSourceUserTarget}) targetStrings ) globalFlags diff --git a/cabal-install/src/Distribution/Client/CmdRun.hs b/cabal-install/src/Distribution/Client/CmdRun.hs index 5eaf6b3e307..baa2b9be740 100644 --- a/cabal-install/src/Distribution/Client/CmdRun.hs +++ b/cabal-install/src/Distribution/Client/CmdRun.hs @@ -215,7 +215,7 @@ runAction flags@NixStyleFlags{..} targetAndArgs globalFlags = (Just ExeKind) flags ( map - (\target -> WithConstraintSource{constraintInner = target, constraintSource = ConstraintSourceCommandlineFlag}) + (\target -> WithConstraintSource{constraintInner = target, constraintSource = ConstraintSourceUserTarget}) targetStr ) globalFlags diff --git a/cabal-install/src/Distribution/Client/CmdSdist.hs b/cabal-install/src/Distribution/Client/CmdSdist.hs index 3f210167aba..32be0080020 100644 --- a/cabal-install/src/Distribution/Client/CmdSdist.hs +++ b/cabal-install/src/Distribution/Client/CmdSdist.hs @@ -246,7 +246,7 @@ sdistAction (pf@ProjectFlags{..}, SdistFlags{..}) targetStrings globalFlags = do localPkgs Nothing ( map - (\target -> WithConstraintSource{constraintInner = target, constraintSource = ConstraintSourceCommandlineFlag}) + (\target -> WithConstraintSource{constraintInner = target, constraintSource = ConstraintSourceUserTarget}) targetStrings ) diff --git a/cabal-install/src/Distribution/Client/CmdTest.hs b/cabal-install/src/Distribution/Client/CmdTest.hs index d59f78168f3..1948de8a7a6 100644 --- a/cabal-install/src/Distribution/Client/CmdTest.hs +++ b/cabal-install/src/Distribution/Client/CmdTest.hs @@ -67,7 +67,7 @@ import qualified System.Exit (exitSuccess) import Distribution.Client.Errors import Distribution.Client.Setup (CommonSetupFlags (..)) -import Distribution.Solver.Types.ConstraintSource (ConstraintSource (ConstraintSourceCommandlineFlag)) +import Distribution.Solver.Types.ConstraintSource (ConstraintSource (ConstraintSourceUserTarget)) import Distribution.Solver.Types.WithConstraintSource (WithConstraintSource (..)) import GHC.Environment ( getFullArgs @@ -132,7 +132,7 @@ testAction flags@NixStyleFlags{..} targetStrings globalFlags = do ( \target -> WithConstraintSource { constraintInner = target - , constraintSource = ConstraintSourceCommandlineFlag + , constraintSource = ConstraintSourceUserTarget } ) targetStrings