hasufell/ghcup-hs
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump to 0.1.16.1

Browse Source
This commit is contained in:
Julian Ospald 2021-07-28 22:36:59 +02:00
parent 810607e84f
commit b38a569124
Signed by: hasufell
GPG Key ID: 3786C5262ECB4A3F
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -1,6 +1,6 @@
# Revision history for ghcup # Revision history for ghcup
## 0.1.16 -- 2021-07-28 ## 0.1.16.1 -- 2021-07-29
* Add 'nuke' subcommand wrt [#135](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/135), implemented by Arjun Kathuria * Add 'nuke' subcommand wrt [#135](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/135), implemented by Arjun Kathuria
* Add uninstallation powershell script on windows wrt [#150](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/150) * Add uninstallation powershell script on windows wrt [#150](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/150)

2
ghcup.cabal
View File

@ -1,6 +1,6 @@
cabal-version: 3.0 cabal-version: 3.0
name: ghcup name: ghcup
version: 0.1.16 version: 0.1.16.1
license: LGPL-3.0-only license: LGPL-3.0-only
license-file: LICENSE license-file: LICENSE
copyright: Julian Ospald 2020 copyright: Julian Ospald 2020

29
lib/GHCup.hs
View File

@ -1019,8 +1019,8 @@ listVersions lt' criteria = do
slr <- strayStacks avTools sSet stacks slr <- strayStacks avTools sSet stacks
pure (sort (slr ++ lr)) pure (sort (slr ++ lr))
GHCup -> do GHCup -> do
let cg = currentGHCup avTools let cg = maybeToList $ currentGHCup avTools
pure (sort (cg : lr)) pure (sort (cg ++ lr))
Nothing -> do Nothing -> do
ghcvers <- go (Just GHC) cSet cabals hlsSet' hlses sSet stacks ghcvers <- go (Just GHC) cSet cabals hlsSet' hlses sSet stacks
cabalvers <- go (Just Cabal) cSet cabals hlsSet' hlses sSet stacks cabalvers <- go (Just Cabal) cSet cabals hlsSet' hlses sSet stacks
@ -1180,24 +1180,25 @@ listVersions lt' criteria = do
[i|Could not parse version of stray directory #{e}|] [i|Could not parse version of stray directory #{e}|]
pure Nothing pure Nothing
currentGHCup :: Map.Map Version VersionInfo -> ListResult currentGHCup :: Map.Map Version VersionInfo -> Maybe ListResult
currentGHCup av = currentGHCup av =
let currentVer = pvpToVersion ghcUpVer let currentVer = pvpToVersion ghcUpVer
listVer = Map.lookup currentVer av listVer = Map.lookup currentVer av
latestVer = fst <$> headOf (getTagged Latest) av latestVer = fst <$> headOf (getTagged Latest) av
recommendedVer = fst <$> headOf (getTagged Latest) av recommendedVer = fst <$> headOf (getTagged Latest) av
isOld = maybe True (> currentVer) latestVer && maybe True (> currentVer) recommendedVer isOld = maybe True (> currentVer) latestVer && maybe True (> currentVer) recommendedVer
in ListResult { lVer = currentVer in if | currentVer == listVer -> Nothing
, lTag = maybe (if isOld then [Old] else []) _viTags listVer | otherwise -> ListResult { lVer = currentVer
, lCross = Nothing , lTag = maybe (if isOld then [Old] else []) _viTags listVer
, lTool = GHCup , lCross = Nothing
, fromSrc = False , lTool = GHCup
, lStray = isNothing listVer , fromSrc = False
, lSet = True , lStray = isNothing listVer
, lInstalled = True , lSet = True
, lNoBindist = False , lInstalled = True
, hlsPowered = False , lNoBindist = False
} , hlsPowered = False
}
-- NOTE: this are not cross ones, because no bindists -- NOTE: this are not cross ones, because no bindists
toListResult :: ( MonadLogger m toListResult :: ( MonadLogger m