File tree 4 files changed +7
-4
lines changed
4 files changed +7
-4
lines changed Original file line number Diff line number Diff line change @@ -38,6 +38,7 @@ import Control.Monad.Trans.Resource
38
38
hiding ( throwM )
39
39
import Data.Either
40
40
import Data.List
41
+ import Data.Ord
41
42
import Data.Maybe
42
43
import Data.Versions hiding ( patch )
43
44
import Haskus.Utils.Variant.Excepts
@@ -280,6 +281,6 @@ rmCabalVer ver = do
280
281
281
282
when (Just ver == cSet) $ do
282
283
cVers <- lift $ fmap rights getInstalledCabals
283
- case headMay . reverse . sort $ cVers of
284
+ case headMay . sortBy (comparing Down ) $ cVers of
284
285
Just latestver -> setCabal latestver
285
286
Nothing -> lift $ rmLink (binDir </> " cabal" <> exeExt)
Original file line number Diff line number Diff line change @@ -43,6 +43,7 @@ import Control.Monad.Trans.Resource
43
43
import Data.ByteString ( ByteString )
44
44
import Data.Either
45
45
import Data.List
46
+ import Data.Ord
46
47
import Data.Maybe
47
48
import Data.String ( fromString )
48
49
import Data.Text ( Text )
@@ -704,7 +705,7 @@ rmHLSVer ver = do
704
705
when (Just ver == isHlsSet) $ do
705
706
-- set latest hls
706
707
hlsVers <- lift $ fmap rights getInstalledHLSs
707
- case headMay . reverse . sort $ hlsVers of
708
+ case headMay . sortBy (comparing Down ) $ hlsVers of
708
709
Just latestver -> liftE $ setHLS latestver SetHLSOnly Nothing
709
710
Nothing -> pure ()
710
711
Original file line number Diff line number Diff line change @@ -38,6 +38,7 @@ import Control.Monad.Trans.Resource
38
38
hiding ( throwM )
39
39
import Data.Either
40
40
import Data.List
41
+ import Data.Ord
41
42
import Data.Maybe
42
43
import Data.Versions hiding ( patch )
43
44
import Haskus.Utils.Variant.Excepts
@@ -279,6 +280,6 @@ rmStackVer ver = do
279
280
280
281
when (Just ver == sSet) $ do
281
282
sVers <- lift $ fmap rights getInstalledStacks
282
- case headMay . reverse . sort $ sVers of
283
+ case headMay . sortBy (comparing Down ) $ sVers of
283
284
Just latestver -> setStack latestver
284
285
Nothing -> lift $ rmLink (binDir </> " stack" <> exeExt)
Original file line number Diff line number Diff line change @@ -52,7 +52,7 @@ versionCmp ver1 (VR_lteq ver2) = ver1 <= ver2
52
52
versionCmp ver1 (VR_eq ver2) = ver1 == ver2
53
53
54
54
versionRange :: V. Versioning -> VersionRange -> Bool
55
- versionRange ver' (SimpleRange cmps) = and $ fmap (versionCmp ver') cmps
55
+ versionRange ver' (SimpleRange cmps) = all (versionCmp ver') cmps
56
56
versionRange ver' (OrRange cmps range) =
57
57
versionRange ver' (SimpleRange cmps) || versionRange ver' range
58
58
You can’t perform that action at this time.
0 commit comments