Skip to content

Draft:Implement v2-outdated command for cabal-install #10878

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import qualified System.FilePath.Posix as Posix
import qualified System.FilePath.Windows as Windows
import qualified Data.List.NonEmpty as NE
import Distribution.Solver.Modular.Version (VR)
import Distribution.Pretty (prettyShow)
import Distribution.Pretty (prettyShow, Pretty(..))
import Distribution.Utils.String (trim)
import Text.PrettyPrint
import Distribution.Simple.Utils (ordNub)
Expand All @@ -58,6 +58,9 @@ import Distribution.System (OS(Windows), buildOS)
newtype ProjectConfigPath = ProjectConfigPath (NonEmpty FilePath)
deriving (Eq, Show, Generic)

instance Pretty ProjectConfigPath where
pretty = docProjectConfigPath

-- | Sorts URIs after local file paths and longer file paths after shorter ones
-- as measured by the number of path segments. If still equal, then sorting is
-- lexical.
Expand Down
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 @@ -132,7 +132,7 @@ benchAction flags@NixStyleFlags{..} targetStrings globalFlags = do
-- (as opposed to say build or haddock targets).
targets <-
either (reportTargetProblems verbosity) return $
resolveTargets
resolveTargetsFromSolver
selectPackageTargets
selectComponentTarget
elaboratedPlan
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 @@ -157,7 +157,7 @@ buildAction flags@NixStyleFlags{extraFlags = buildFlags, ..} targetStrings globa
-- (as opposed to say repl or haddock targets).
targets <-
either (reportBuildTargetProblems verbosity) return $
resolveTargets
resolveTargetsFromSolver
selectPackageTargets
selectComponentTarget
elaboratedPlan
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 @@ -176,7 +176,7 @@ haddockAction relFlags targetStrings globalFlags = do
-- haddock targets
targets <-
either (reportBuildDocumentationTargetProblems verbosity) return $
resolveTargets
resolveTargetsFromSolver
(selectPackageTargets haddockFlags)
selectComponentTarget
elaboratedPlan
Expand Down
4 changes: 2 additions & 2 deletions cabal-install/src/Distribution/Client/CmdHaddockProject.hs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import Distribution.Client.ProjectOrchestration
, ProjectBuildContext (..)
, TargetSelector (..)
, pruneInstallPlanToTargets
, resolveTargets
, resolveTargetsFromSolver
, runProjectPreBuildPhase
, selectComponentTargetBasic
)
Expand Down Expand Up @@ -143,7 +143,7 @@ haddockProjectAction flags _extraArgs globalFlags = do
-- (as opposed to say repl or haddock targets).
targets <-
either reportTargetProblems return $
resolveTargets
resolveTargetsFromSolver
selectPackageTargets
selectComponentTargetBasic
elaboratedPlan
Expand Down
6 changes: 3 additions & 3 deletions cabal-install/src/Distribution/Client/CmdInstall.hs
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,7 @@ partitionToKnownTargetsAndHackagePackages
-> IO (TargetsMap, [PackageName])
partitionToKnownTargetsAndHackagePackages verbosity pkgDb elaboratedPlan targetSelectors = do
let mTargets =
resolveTargets
resolveTargetsFromSolver
selectPackageTargets
selectComponentTarget
elaboratedPlan
Expand Down Expand Up @@ -865,7 +865,7 @@ partitionToKnownTargetsAndHackagePackages verbosity pkgDb elaboratedPlan targetS
-- removed (or we've given up).
targets <-
either (reportBuildTargetProblems verbosity) return $
resolveTargets
resolveTargetsFromSolver
selectPackageTargets
selectComponentTarget
elaboratedPlan
Expand All @@ -885,7 +885,7 @@ constructProjectBuildContext verbosity baseCtx targetSelectors = do
-- Interpret the targets on the command line as build targets
targets <-
either (reportBuildTargetProblems verbosity) return $
resolveTargets
resolveTargetsFromSolver
selectPackageTargets
selectComponentTarget
elaboratedPlan
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 @@ -106,7 +106,7 @@ listbinAction flags@NixStyleFlags{..} args globalFlags = do
-- (as opposed to say repl or haddock targets).
targets <-
either (reportTargetProblems verbosity) return $
resolveTargets
resolveTargetsFromSolver
selectPackageTargets
selectComponentTarget
elaboratedPlan
Expand Down
Loading
Loading