Skip to content

Commit

Permalink
Merge pull request haskell#3967 from kosmikus/debug-tracetree-fix
Browse files Browse the repository at this point in the history
Adapt to changes in Distribution.Version.
  • Loading branch information
23Skidoo authored Oct 9, 2016
2 parents e30ffcb + 9bf8210 commit af422f7
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion cabal-install/Distribution/Solver/Modular/Solver.hs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import Data.Set as S
import Distribution.Version

import Distribution.Compiler (CompilerInfo)
import Distribution.Text (display)

import Distribution.Solver.Types.PackagePath
import Distribution.Solver.Types.PackagePreferences
Expand Down Expand Up @@ -201,7 +202,7 @@ instance GSimpleTree (Tree d QGoalReason) where

-- Show package choice
goP :: QPN -> POption -> Tree d QGoalReason -> (String, SimpleTree)
goP _ (POption (I ver _loc) Nothing) subtree = (showVersion ver, go subtree)
goP _ (POption (I ver _loc) Nothing) subtree = (display ver, go subtree)
goP (Q _ pn) (POption _ (Just pp)) subtree = (showQPN (Q pp pn), go subtree)

-- Show flag or stanza choice
Expand Down

0 comments on commit af422f7

Please sign in to comment.