Skip to content

Adapt to changes in Distribution.Version. #3967

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Oct 9, 2016
Merged

Adapt to changes in Distribution.Version. #3967

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion cabal-install/Distribution/Solver/Modular/Solver.hs
View file
Open in desktop
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