Skip to content

Commit a0f5ece

Browse files
author
Lennart Spitzner
committed
Fix backwards-compatibility
1 parent 36174a5 commit a0f5ece

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

cabal-install/Distribution/Client/Status.hs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ import System.FilePath ( splitFileName
8585
, joinPath
8686
, takeDirectory
8787
)
88+
import Data.Functor ( (<$) )
8889
import Control.Monad ( when
8990
, forM
9091
, guard
@@ -94,8 +95,10 @@ import Data.Version ( showVersion
9495
)
9596
import Data.Maybe ( isJust
9697
)
97-
import Data.List ( sortOn
98-
, groupBy
98+
import Data.List ( groupBy
99+
, sortBy
100+
)
101+
import Data.Ord ( comparing
99102
)
100103
import Text.PrettyPrint ( empty
101104
, ($$)
@@ -106,7 +109,9 @@ import Text.PrettyPrint ( empty
106109
, ($+$)
107110
, (<+>)
108111
)
109-
import Data.Monoid ( (<>) )
112+
import Data.Monoid ( (<>)
113+
, mappend
114+
)
110115
import Data.List ( inits )
111116
import Data.Foldable ( asum )
112117

@@ -307,7 +312,9 @@ status verbosity globalFlags statusFlags = do
307312
installedPackageIndex <- getInstalledPackages verbosity comp dbs conf
308313
let pkgs = allPackages installedPackageIndex
309314
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
311318
groups = [(fst (head x), map snd x) | x <- grouped]
312319
let packageDoc ps = if Cabal.fromFlag (statusPackages statusFlags)
313320
|| Cabal.fromFlag (statusAll statusFlags)

0 commit comments

Comments
 (0)