Merge pull request #10878 from haskell/wip/v2-outdated

Implement v2-outdated command for cabal-install

Author: mergify[bot]

Cabal-syntax/src/Distribution/Utils/Generic.hs

@@ -56,6 +56,7 @@ module Distribution.Utils.Generic
   , listUnion
   , listUnionRight
   , ordNub
+  , sortNub
   , ordNubBy
   , ordNubRight
   , safeHead
@@ -385,6 +386,10 @@ ordNubRight = fst . foldr go ([], Set.empty)
         then p
         else (x : l, Set.insert x s)
 
+-- | Sort and nub a list
+sortNub :: Ord a => [a] -> [a]
+sortNub = Set.toList . Set.fromList
+
 -- | A right-biased version of 'listUnion'.
 --
 -- Example:

Cabal/src/Distribution/Simple/Utils.hs

@@ -185,6 +185,7 @@ module Distribution.Simple.Utils
   , listUnion
   , listUnionRight
   , ordNub
+  , sortNub
   , ordNubBy
   , ordNubRight
   , safeHead

cabal-install-solver/src/Distribution/Solver/Types/ProjectConfigPath.hs

@@ -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)
@@ -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.

cabal-install/src/Distribution/Client/CmdBench.hs

@@ -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

cabal-install/src/Distribution/Client/CmdBuild.hs

@@ -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

cabal-install/src/Distribution/Client/CmdGenBounds.hs

@@ -109,7 +109,7 @@ genBoundsAction flags targetStrings globalFlags =
     -- Step 2: Resolve the targets for the gen-bounds command.
     targets <-
       either (reportGenBoundsTargetProblems verbosity) return $
-        resolveTargets
+        resolveTargetsFromSolver
           selectPackageTargets
           selectComponentTarget
           elaboratedPlan

cabal-install/src/Distribution/Client/CmdHaddock.hs

@@ -177,7 +177,7 @@ haddockAction relFlags targetStrings globalFlags = do
       -- haddock targets
       targets <-
         either (reportBuildDocumentationTargetProblems verbosity) return $
-          resolveTargets
+          resolveTargetsFromSolver
             (selectPackageTargets haddockFlags)
             selectComponentTarget
             elaboratedPlan

cabal-install/src/Distribution/Client/CmdHaddockProject.hs

@@ -28,7 +28,7 @@ import Distribution.Client.ProjectOrchestration
   , ProjectBuildContext (..)
   , TargetSelector (..)
   , pruneInstallPlanToTargets
-  , resolveTargets
+  , resolveTargetsFromSolver
   , runProjectPreBuildPhase
   , selectComponentTargetBasic
   )
@@ -146,7 +146,7 @@ haddockProjectAction flags _extraArgs globalFlags = do
           -- (as opposed to say repl or haddock targets).
           targets <-
             either reportTargetProblems return $
-              resolveTargets
+              resolveTargetsFromSolver
                 selectPackageTargets
                 selectComponentTargetBasic
                 elaboratedPlan

cabal-install/src/Distribution/Client/CmdInstall.hs

@@ -828,7 +828,7 @@ partitionToKnownTargetsAndHackagePackages
   -> IO (TargetsMap, [PackageName])
 partitionToKnownTargetsAndHackagePackages verbosity pkgDb elaboratedPlan targetSelectors = do
   let mTargets =
-        resolveTargets
+        resolveTargetsFromSolver
           selectPackageTargets
           selectComponentTarget
           elaboratedPlan
@@ -868,7 +868,7 @@ partitionToKnownTargetsAndHackagePackages verbosity pkgDb elaboratedPlan targetS
       -- removed (or we've given up).
       targets <-
         either (reportBuildTargetProblems verbosity) return $
-          resolveTargets
+          resolveTargetsFromSolver
             selectPackageTargets
             selectComponentTarget
             elaboratedPlan
@@ -888,7 +888,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

cabal-install/src/Distribution/Client/CmdListBin.hs

@@ -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