Skip to content

Commit

Permalink
ConstraintSourceCommandlineFlag -> ConstraintSourceUserTarget
Browse files Browse the repository at this point in the history
  • Loading branch information
9999years committed Dec 6, 2024
1 parent df3c90f commit 7375dfb
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion cabal-install/src/Distribution/Client/CmdBench.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cabal-install/src/Distribution/Client/CmdBuild.hs
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ buildAction flags@NixStyleFlags{extraFlags = buildFlags, ..} targetStrings globa
( \target ->
WithConstraintSource
{ constraintInner = target
, constraintSource = ConstraintSourceCommandlineFlag
, constraintSource = ConstraintSourceUserTarget
}
)
targetStrings
Expand Down
2 changes: 1 addition & 1 deletion cabal-install/src/Distribution/Client/CmdHaddock.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cabal-install/src/Distribution/Client/CmdInstall.hs
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ installAction flags@NixStyleFlags{extraFlags, configFlags, installFlags, project
( \target ->
WithConstraintSource
{ constraintInner = target
, constraintSource = ConstraintSourceCommandlineFlag
, constraintSource = ConstraintSourceUserTarget
}
)
targetStrings
Expand Down
2 changes: 1 addition & 1 deletion cabal-install/src/Distribution/Client/CmdListBin.hs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ listbinAction flags@NixStyleFlags{..} args globalFlags = do
let targetProvenance =
WithConstraintSource
{ constraintInner = target
, constraintSource = ConstraintSourceCommandlineFlag
, constraintSource = ConstraintSourceUserTarget
}

-- configure and elaborate target selectors
Expand Down
2 changes: 1 addition & 1 deletion cabal-install/src/Distribution/Client/CmdRepl.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cabal-install/src/Distribution/Client/CmdRun.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cabal-install/src/Distribution/Client/CmdSdist.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
4 changes: 2 additions & 2 deletions cabal-install/src/Distribution/Client/CmdTest.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -132,7 +132,7 @@ testAction flags@NixStyleFlags{..} targetStrings globalFlags = do
( \target ->
WithConstraintSource
{ constraintInner = target
, constraintSource = ConstraintSourceCommandlineFlag
, constraintSource = ConstraintSourceUserTarget
}
)
targetStrings
Expand Down

0 comments on commit 7375dfb

Please sign in to comment.