summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorNiklas Hambüchen <mail@nh2.me>2013-09-06 23:23:24 +0900
committerAustin Seipp <aseipp@pobox.com>2013-09-06 19:54:32 -0500
commit021b1f8991850a20c2c8ace1c9282251e10fda03 (patch)
treee005c1c2525cf3d1dd005346bc1d5608b957d2d0 /utils
parentb372e8eadcbb6abe00d7a7b1198b656a29dcb1ce (diff)
downloadhaskell-021b1f8991850a20c2c8ace1c9282251e10fda03.tar.gz
Fix ghc-pkg list --simple-output not being alphabetical (#8245).
It was sorted by version number so far. I also added a sort to the normal output (without --simple-output) since the source it comes from does not guarantee sortedness. Signed-off-by: Austin Seipp <aseipp@pobox.com>
Diffstat (limited to 'utils')
-rw-r--r--utils/ghc-pkg/Main.hs17
1 files changed, 9 insertions, 8 deletions
diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs
index e2f497f36c..41ed265f4b 100644
--- a/utils/ghc-pkg/Main.hs
+++ b/utils/ghc-pkg/Main.hs
@@ -33,6 +33,7 @@ import qualified Control.Exception as Exception
import Data.Maybe
import Data.Char ( isSpace, toLower )
+import Data.Ord (comparing)
import Control.Monad
import System.Directory ( doesDirectoryExist, getDirectoryContents,
doesFileExist, renameFile, removeFile,
@@ -1012,7 +1013,8 @@ listPackages verbosity my_flags mPackageName mModuleName = do
then hPutStrLn stdout " (no packages)"
else hPutStrLn stdout $ unlines (map (" " ++) pp_pkgs)
where
- pp_pkgs = map pp_pkg pkg_confs
+ -- Sort using instance Ord PackageId
+ pp_pkgs = map pp_pkg . sortBy (comparing installedPackageId) $ pkg_confs
pp_pkg p
| sourcePackageId p `elem` broken = printf "{%s}" doc
| exposed p = doc
@@ -1066,7 +1068,8 @@ simplePackageList :: [Flag] -> [InstalledPackageInfo] -> IO ()
simplePackageList my_flags pkgs = do
let showPkg = if FlagNamesOnly `elem` my_flags then display . pkgName
else display
- strs = map showPkg $ sortBy compPkgIdVer $ map sourcePackageId pkgs
+ -- Sort using instance Ord PackageId
+ strs = map showPkg $ sort $ map sourcePackageId pkgs
when (not (null pkgs)) $
hPutStrLn stdout $ concat $ intersperse " " strs
@@ -1098,10 +1101,11 @@ latestPackage verbosity my_flags pkgid = do
getPkgDatabases verbosity False True{-use cache-} False{-expand vars-} my_flags
ps <- findPackages flag_db_stack (Id pkgid)
- show_pkg (sortBy compPkgIdVer (map sourcePackageId ps))
+ case ps of
+ [] -> die "no matches"
+ _ -> show_pkg . maximum . map sourcePackageId $ ps
where
- show_pkg [] = die "no matches"
- show_pkg pids = hPutStrLn stdout (display (last pids))
+ show_pkg pid = hPutStrLn stdout (display pid)
-- -----------------------------------------------------------------------------
-- Describe
@@ -1165,9 +1169,6 @@ matchesPkg :: PackageArg -> InstalledPackageInfo -> Bool
(Id pid) `matchesPkg` pkg = pid `matches` sourcePackageId pkg
(Substring _ m) `matchesPkg` pkg = m (display (sourcePackageId pkg))
-compPkgIdVer :: PackageIdentifier -> PackageIdentifier -> Ordering
-compPkgIdVer p1 p2 = pkgVersion p1 `compare` pkgVersion p2
-
-- -----------------------------------------------------------------------------
-- Field