Add cabal-install-3.4.0.0-rc1

CHANGELOG.md

@@ -1,9 +1,5 @@
 # Revision history for ghcup
 
-## 0.1.10 -- yyyy-mm-dd
-
-* Show stray Cabals (useful for pre-releases or compiled ones)
-
 ## 0.1.9 -- 2020-08-14
 
 * Fix bug when uninstalling all cabal versions

ghcup.cabal

@@ -1,6 +1,6 @@
 cabal-version:      3.0
 name:               ghcup
-version:            0.1.10
+version:            0.1.9
 synopsis:           ghc toolchain installer as an exe/library
 description:
   A rewrite of the shell script ghcup, for providing

lib/GHCup.hs

@@ -506,9 +506,6 @@ listVersions av lt criteria pfreq = do
         GHC -> do
           slr <- strayGHCs avTools
           pure $ (sort (slr ++ lr))
-        Cabal -> do
-          slr <- strayCabals avTools
-          pure $ (sort (slr ++ lr))
         _ -> pure lr
     Nothing -> do
       ghcvers   <- listVersions av (Just GHC) criteria pfreq
@@ -557,33 +554,6 @@ listVersions av lt criteria pfreq = do
           [i|Could not parse version of stray directory #{toFilePath e}|]
         pure Nothing
 
-  strayCabals :: (MonadReader Settings m, MonadCatch m, MonadThrow m, MonadLogger m, MonadIO m)
-            => Map.Map Version [Tag]
-            -> m [ListResult]
-  strayCabals avTools = do
-    cabals <- getInstalledCabals
-    fmap catMaybes $ forM cabals $ \case
-      Right ver ->
-        case Map.lookup ver avTools of
-          Just _  -> pure Nothing
-          Nothing -> do
-            lSet    <- fmap (maybe False (== ver)) $ cabalSet
-            pure $ Just $ ListResult
-              { lTool      = Cabal
-              , lVer       = ver
-              , lCross     = Nothing
-              , lTag       = []
-              , lInstalled = True
-              , lStray     = maybe True (const False) (Map.lookup ver avTools)
-              , lNoBindist = False
-              , fromSrc    = False -- actually, we don't know :>
-              , ..
-              }
-      Left e -> do
-        $(logWarn)
-          [i|Could not parse version of stray directory #{toFilePath e}|]
-        pure Nothing
-
   -- NOTE: this are not cross ones, because no bindists
   toListResult :: (MonadReader Settings m, MonadIO m, MonadCatch m) => Tool -> (Version, [Tag]) -> m ListResult
   toListResult t (v, tags) = case t of

lib/GHCup/Version.hs

@@ -26,7 +26,7 @@ ghcupURL = [uri|https://www.haskell.org/ghcup/data/ghcup-0.0.2.yaml|]
 
 -- | The current ghcup version.
 ghcUpVer :: PVP
-ghcUpVer = [pver|0.1.10|]
+ghcUpVer = [pver|0.1.9|]
 
 -- | ghcup version as numeric string.
 numericVer :: String