@@ -85,6 +85,7 @@ import System.FilePath ( splitFileName
85
85
, joinPath
86
86
, takeDirectory
87
87
)
88
+ import Data.Functor ( (<$) )
88
89
import Control.Monad ( when
89
90
, forM
90
91
, guard
@@ -94,8 +95,10 @@ import Data.Version ( showVersion
94
95
)
95
96
import Data.Maybe ( isJust
96
97
)
97
- import Data.List ( sortOn
98
- , groupBy
98
+ import Data.List ( groupBy
99
+ , sortBy
100
+ )
101
+ import Data.Ord ( comparing
99
102
)
100
103
import Text.PrettyPrint ( empty
101
104
, ($$)
@@ -106,7 +109,9 @@ import Text.PrettyPrint ( empty
106
109
, ($+$)
107
110
, (<+>)
108
111
)
109
- import Data.Monoid ( (<>) )
112
+ import Data.Monoid ( (<>)
113
+ , mappend
114
+ )
110
115
import Data.List ( inits )
111
116
import Data.Foldable ( asum )
112
117
@@ -307,7 +312,9 @@ status verbosity globalFlags statusFlags = do
307
312
installedPackageIndex <- getInstalledPackages verbosity comp dbs conf
308
313
let pkgs = allPackages installedPackageIndex
309
314
pkgTuples = [ (root, disp $ sourcePackageId pkg) | pkg <- pkgs, root <- [x | Just x <- [pkgRoot pkg]]]
310
- grouped = groupBy (\ a b -> fst a == fst b) $ sortOn fst pkgTuples
315
+ grouped = groupBy (\ a b -> fst a == fst b)
316
+ $ sortBy (comparing fst )
317
+ $ pkgTuples
311
318
groups = [(fst (head x), map snd x) | x <- grouped]
312
319
let packageDoc ps = if Cabal. fromFlag (statusPackages statusFlags)
313
320
|| Cabal. fromFlag (statusAll statusFlags)
0 commit comments