makeForest'

Author: andreabedini

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

@@ -169,7 +169,7 @@ import qualified Data.Map as Map
 import qualified Data.Set as Set
 import Text.PrettyPrint hiding ((<>))
 import GHC.Stack (HasCallStack)
-import Distribution.Client.InstallPlan (toForest, renderForest)
+import Distribution.Client.InstallPlan (renderForest')
 
 -- ------------------------------------------------------------
 
@@ -823,7 +823,7 @@ resolveDependencies toolchains pkgConfigDB installedPkgIndex params = do
     [ text "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
     , text "Dependency tree"
     , text "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-    , text (renderForest $ Graph.fromDistinctList pkgs')
+    , text (renderForest' (\p -> show (pretty (solverQPN p) <+> text "->" <+> pretty (Graph.nodeKey p))) $ Graph.fromDistinctList pkgs')
     ]
 
   validateSolverResult toolchains pkgs'

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

@@ -74,6 +74,7 @@ module Distribution.Client.InstallPlan
   , project
   , toForest
   , renderForest
+  , renderForest'
   , renderPlanForest
   ) where
 
@@ -553,6 +554,9 @@ toForest g = fmap (fmap graphVertexToNode) $ dfs graphForward (topSort graphForw
 renderForest :: (IsNode a, Pretty (Key a)) => Graph a -> String
 renderForest = drawForest . fmap (fmap (prettyShow . Graph.nodeKey)) . toForest
 
+renderForest' :: (a -> String) -> Graph a -> String
+renderForest' f = drawForest . fmap (fmap f) . toForest
+
 renderPlanForest :: (IsNode ipkg, IsNode srcpkg, Key ipkg ~ Key srcpkg, Pretty (Key srcpkg)) => GenericInstallPlan' key ipkg srcpkg -> String
 renderPlanForest = renderForest . planGraph