Also build 32bit release artifact

2020-04-19 22:03:20 +02:00
27 changed files with 336 additions and 3219 deletions
--- a/.bash-completion
+++ b/.bash-completion
@@ -1,14 +0,0 @@
-_ghcup()
-{
-    local CMDLINE
-    local IFS=$'\n'
-    CMDLINE=(--bash-completion-index $COMP_CWORD)
-
-    for arg in ${COMP_WORDS[@]}; do
-        CMDLINE=(${CMDLINE[@]} --bash-completion-word $arg)
-    done
-
-    COMPREPLY=( $(ghcup "${CMDLINE[@]}") )
-}
-
-complete -o filenames -F _ghcup ghcup
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -57,7 +57,7 @@ variables:
  script:
    - ./.gitlab/script/ghcup_version.sh
  variables:
-    JSON_VERSION: "0.0.2"
+    JSON_VERSION: "0.0.1"

 .test_ghcup_version:linux:
  extends:
@@ -161,7 +161,7 @@ release:linux:32bit:
  before_script:
    - ./.gitlab/before_script/linux/alpine/install_deps.sh
  variables:
-    ARTIFACT: "i386-linux-ghcup"
+    ARTIFACT: "x86_64-linux-ghcup"
    GHC_VERSION: "8.8.3"
    CABAL_VERSION: "3.2.0.0"

--- a/.gitlab/before_script/linux/alpine/install_deps.sh
+++ b/.gitlab/before_script/linux/alpine/install_deps.sh
@@ -42,8 +42,7 @@ chmod +x "${GHCUP_INSTALL_BASE_PREFIX}/.ghcup/bin/cabal"

 # utils
 apk add --no-cache \
-	bash \
-	git
+	bash

 ## Package specific
 apk add --no-cache \
--- a/.gitlab/before_script/linux/install_deps.sh
+++ b/.gitlab/before_script/linux/install_deps.sh
@@ -3,7 +3,7 @@
 set -eux

 sudo apt-get update -y
-sudo apt-get install -y libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev git
+sudo apt-get install -y libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev

 . "$( cd "$(dirname "$0")" ; pwd -P )/../../ghcup_env"

--- a/.gitlab/script/ghcup_release.sh
+++ b/.gitlab/script/ghcup_release.sh
@@ -15,8 +15,6 @@ ecabal update

 if [ "${OS}" = "LINUX" ] ; then
 	ecabal build -w ghc-${GHC_VERSION} -fcurl --ghc-options='-split-sections -optl-static'
-elif [ "${OS}" = "FREEBSD" ] ; then
-	ecabal build -w ghc-${GHC_VERSION} -fcurl --ghc-options='-split-sections'
 else
 	ecabal build -w ghc-${GHC_VERSION} -fcurl
 fi
--- a/README.md
+++ b/README.md
@@ -68,12 +68,6 @@ handles your haskell packages and can demand that [a specific version](https://c
 For man pages to work you need [man-db](http://man-db.nongnu.org/) as your `man` provider, then issue `man ghc`. Manpages only work for the currently set ghc.
 `MANPATH` may be required to be unset.

-### Bash-completion
-
-Depending on your distro and setup, install `.bash-completion` from this repo
-as e.g. `/etc/bash_completion.d/ghcup` and make sure your bashrc sources the
-startup script (`/usr/share/bash-completion/bash_completion` on some distros).
-
 ## Design goals

 1. simplicity
--- a/TODO.md
+++ b/TODO.md
@@ -2,39 +2,27 @@

 ## Now

-* try to run exe before upgrade (backup to ~/.ghcup/bin/ghcup.old)
-* allow to build 8.8
-* curl DL does not cache json
-* explain environment variables
-* add --keep=<always|error> option
-
-* allow to switch to curl/wget at runtime
-
-* cross support
-* installing multiple versions of the same
-
-* proper test suite
-* add more logging
-
+* move out GHCup.Version module, bc it's not library-ish

 ## Maybe

-* version ranges in json
+* maybe: changelog          Show the changelog of a GHC release (online)
 * sign the JSON? (Or check gpg keys?)
 * testing (especially distro detection -> unit tests)

 ## Later

+* i386 support
 * add support for RC/alpha/HEAD versions

 ## Cleanups

+* too many decodeutf8
 * avoid alternative for IO
 * use plucky or oops instead of Excepts

 ## Questions

-* move out GHCup.Version module, bc it's not library-ish?
 * mirror support
 * interactive handling when distro doesn't exist and we know the tarball is incompatible?
 * ghcup-with wrapper to execute a command with a given ghc in PATH?
--- a/lib/GHCup/Data/GHCupDownloads.hs
+++ b/lib/GHCup/Data/GHCupDownloads.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE QuasiQuotes       #-}


-module GHCup.Data.GHCupDownloads where
+module GHCupDownloads where

 import           GHCup.Types
 import           GHCup.Utils.Version.QQ
@@ -827,7 +827,7 @@ ghc_883_32_musl :: DownloadInfo
 ghc_883_32_musl = DownloadInfo
  [uri|https://github.com/redneb/ghc-alt-libc/releases/download/ghc-8.8.3-musl/ghc-8.8.3-i386-unknown-linux-musl.tar.xz|]
  (Just [rel|ghc-8.8.3|])
-  "7a5f41646d06777e75636291a1855d60a0984552bbdf33c3d107565d302f38a4"
+  "23779adb4cf4b314d0f8c66ee215ba6e74154c0768a573780475943544020bec"



@@ -951,24 +951,6 @@ cabal_3000_64_darwin = DownloadInfo
  Nothing
  "d4857e068560515e4cbb0e8ca124c370e07892f2a28804d87152834e5fe2b845"

-cabal_3000_64_freebsd :: DownloadInfo
-cabal_3000_64_freebsd = DownloadInfo
-  [uri|https://hasufell.de/d/d3e215db133e4fcaa61e/files/?p=/cabal-install-3.0.0.0-x86_64-portbld-freebsd.tar.xz&dl=1|]
-  Nothing
-  "d97b6469ed612a1367ad1032d0722469ee5277668879694d7d4336233b937516"
-
-cabal_3000_32_alpine :: DownloadInfo
-cabal_3000_32_alpine = DownloadInfo
-  [uri|https://hasufell.de/d/d3e215db133e4fcaa61e/files/?p=/cabal-install-3.0.0.0-i386-alpine-linux-musl.tar.xz&dl=1|]
-  Nothing
-  "a4191cd5a645b00e6a9c53abe6f3cb91fe700de7d7c520c9cb36ce8ec5c9919a"
-
-cabal_3000_64_alpine :: DownloadInfo
-cabal_3000_64_alpine = DownloadInfo
-  [uri|https://hasufell.de/d/d3e215db133e4fcaa61e/files/?p=/cabal-install-3.0.0.0-x86_64-alpine-linux-musl.tar.xz&dl=1|]
-  Nothing
-  "7b35e5986aba4a40fc37141cbde26612bfc916e95a2d2ff35a413612d8c7cd3a"
-


    ---------------------
@@ -994,24 +976,6 @@ cabal_3200_64_darwin = DownloadInfo
  Nothing
  "9197c17d2ece0f934f5b33e323cfcaf486e4681952687bc3d249488ce3cbe0e9"

-cabal_3200_64_freebsd :: DownloadInfo
-cabal_3200_64_freebsd = DownloadInfo
-  [uri|https://hasufell.de/d/d3e215db133e4fcaa61e/files/?p=/cabal-install-3.2.0.0-x86_64-portbld-freebsd.tar.xz&dl=1|]
-  Nothing
-  "e4dc00ab7fef51354e7624dd03e49c6bb684887fc95acb9b33bc52f357a5ef8c"
-
-cabal_3200_32_alpine :: DownloadInfo
-cabal_3200_32_alpine = DownloadInfo
-  [uri|https://hasufell.de/d/d3e215db133e4fcaa61e/files/?p=/cabal-install-3.2.0.0-i386-alpine-linux-musl.tar.xz&dl=1|]
-  Nothing
-  "4aaa52fbc337ae1ef855a2aa2808186580b21ec36883aafec7473e7d899bc5ec"
-
-cabal_3200_64_alpine :: DownloadInfo
-cabal_3200_64_alpine = DownloadInfo
-  [uri|https://hasufell.de/d/d3e215db133e4fcaa61e/files/?p=/cabal-install-3.2.0.0-x86_64-alpine-linux-musl.tar.xz&dl=1|]
-  Nothing
-  "c1f3c21a5307cea8d2a0bd9a2eab9f56f3dd90e947ae64e231f909024980992b"
-



@@ -1062,7 +1026,7 @@ ghcupDownloads = M.fromList
    , M.fromList
      [ ( [vver|7.10.3|]
        , VersionInfo
-            [Base [pver|4.8.2.0|]]
+            []
            (Just
              [uri|https://downloads.haskell.org/ghc/7.10.3/docs/html/users_guide/release-7-10-1.html|]
            )
@@ -1108,7 +1072,7 @@ ghcupDownloads = M.fromList
        )
      , ( [vver|8.0.2|]
        , VersionInfo
-            [Base [pver|4.9.1.0|]]
+            []
            (Just
              [uri|https://downloads.haskell.org/ghc/8.0.2/docs/html/users_guide/8.0.1-notes.html|]
            )
@@ -1154,7 +1118,7 @@ ghcupDownloads = M.fromList
        )
      , ( [vver|8.2.2|]
        , VersionInfo
-            [Base [pver|4.10.1.0|]]
+            []
            (Just
              [uri|https://downloads.haskell.org/ghc/8.2.2/docs/html/users_guide/8.2.2-notes.html|]
            )
@@ -1206,7 +1170,7 @@ ghcupDownloads = M.fromList
        )
      , ( [vver|8.4.1|]
        , VersionInfo
-            [Base [pver|4.11.0.0|]]
+            []
            (Just
              [uri|https://downloads.haskell.org/ghc/8.4.1/docs/html/users_guide/8.4.1-notes.html|]
            )
@@ -1245,7 +1209,7 @@ ghcupDownloads = M.fromList
        )
      , ( [vver|8.4.2|]
        , VersionInfo
-            [Base [pver|4.11.1.0|]]
+            []
            (Just
              [uri|https://downloads.haskell.org/ghc/8.4.2/docs/html/users_guide/8.4.2-notes.html|]
            )
@@ -1295,7 +1259,7 @@ ghcupDownloads = M.fromList
        )
      , ( [vver|8.4.3|]
        , VersionInfo
-            [Base [pver|4.11.1.0|]]
+            []
            (Just
              [uri|https://downloads.haskell.org/ghc/8.4.3/docs/html/users_guide/8.4.3-notes.html|]
            )
@@ -1344,7 +1308,7 @@ ghcupDownloads = M.fromList
        )
      , ( [vver|8.4.4|]
        , VersionInfo
-            [Base [pver|4.11.1.0|]]
+            []
            (Just
              [uri|https://downloads.haskell.org/ghc/8.4.4/docs/html/users_guide/8.4.4-notes.html|]
            )
@@ -1398,7 +1362,7 @@ ghcupDownloads = M.fromList
        )
      , ( [vver|8.6.1|]
        , VersionInfo
-            [Base [pver|4.12.0.0|]]
+            []
            (Just
              [uri|https://downloads.haskell.org/ghc/8.6.1/docs/html/users_guide/8.6.1-notes.html|]
            )
@@ -1448,7 +1412,7 @@ ghcupDownloads = M.fromList
        )
      , ( [vver|8.6.2|]
        , VersionInfo
-            [Base [pver|4.12.0.0|]]
+            []
            (Just
              [uri|https://downloads.haskell.org/ghc/8.6.2/docs/html/users_guide/8.6.2-notes.html|]
            )
@@ -1492,7 +1456,7 @@ ghcupDownloads = M.fromList
        )
      , ( [vver|8.6.3|]
        , VersionInfo
-            [Base [pver|4.12.0.0|]]
+            []
            (Just
              [uri|https://downloads.haskell.org/ghc/8.6.3/docs/html/users_guide/8.6.3-notes.html|]
            )
@@ -1546,7 +1510,7 @@ ghcupDownloads = M.fromList
        )
      , ( [vver|8.6.4|]
        , VersionInfo
-            [Base [pver|4.12.0.0|]]
+            []
            (Just
              [uri|https://downloads.haskell.org/ghc/8.6.4/docs/html/users_guide/8.6.4-notes.html|]
            )
@@ -1595,7 +1559,7 @@ ghcupDownloads = M.fromList
        )
      , ( [vver|8.6.5|]
        , VersionInfo
-            [Base [pver|4.12.0.0|]]
+            []
            (Just
              [uri|https://downloads.haskell.org/ghc/8.6.5/docs/html/users_guide/8.6.5-notes.html|]
            )
@@ -1648,7 +1612,7 @@ ghcupDownloads = M.fromList
        )
      , ( [vver|8.8.1|]
        , VersionInfo
-            [Base [pver|4.13.0.0|]]
+            []
            (Just
              [uri|https://downloads.haskell.org/ghc/8.8.1/docs/html/users_guide/8.8.1-notes.html|]
            )
@@ -1701,7 +1665,7 @@ ghcupDownloads = M.fromList
        )
      , ( [vver|8.8.2|]
        , VersionInfo
-            [Base [pver|4.13.0.0|]]
+            []
            (Just
              [uri|https://downloads.haskell.org/ghc/8.8.2/docs/html/users_guide/8.8.2-notes.html|]
            )
@@ -1754,7 +1718,7 @@ ghcupDownloads = M.fromList
        )
      , ( [vver|8.8.3|]
        , VersionInfo
-            [Recommended, Base [pver|4.13.0.0|]]
+            [Recommended]
            (Just
              [uri|https://downloads.haskell.org/ghc/8.8.3/docs/html/users_guide/8.8.3-notes.html|]
            )
@@ -1807,7 +1771,7 @@ ghcupDownloads = M.fromList
        )
      , ( [vver|8.10.1|]
        , VersionInfo
-            [Latest, Base [pver|4.14.0.0|]]
+            [Latest]
            (Just
              [uri|https://downloads.haskell.org/ghc/8.10.1/docs/html/users_guide/8.10.1-notes.html|]
            )
@@ -1925,9 +1889,7 @@ ghcupDownloads = M.fromList
                  [ ( Linux UnknownLinux
                    , M.fromList [(Nothing, cabal_3000_64_linux)]
                    )
-                  , (Linux Alpine, M.fromList [(Nothing, cabal_3000_64_alpine)])
-                  , (Darwin      , M.fromList [(Nothing, cabal_3000_64_darwin)])
-                  , (FreeBSD, M.fromList [(Nothing, cabal_3000_64_freebsd)])
+                  , (Darwin, M.fromList [(Nothing, cabal_3000_64_darwin)])
                  ]
                )
              , ( A_32
@@ -1935,7 +1897,6 @@ ghcupDownloads = M.fromList
                  [ ( Linux UnknownLinux
                    , M.fromList [(Nothing, cabal_3000_32_linux)]
                    )
-                  , (Linux Alpine, M.fromList [(Nothing, cabal_3000_32_alpine)])
                  ]
                )
              ]
@@ -1957,9 +1918,7 @@ ghcupDownloads = M.fromList
                  [ ( Linux UnknownLinux
                    , M.fromList [(Nothing, cabal_3200_64_linux)]
                    )
-                  , (Linux Alpine, M.fromList [(Nothing, cabal_3200_64_alpine)])
-                  , (Darwin      , M.fromList [(Nothing, cabal_3200_64_darwin)])
-                  , (FreeBSD, M.fromList [(Nothing, cabal_3200_64_freebsd)])
+                  , (Darwin, M.fromList [(Nothing, cabal_3200_64_darwin)])
                  ]
                )
              , ( A_32
@@ -1967,7 +1926,6 @@ ghcupDownloads = M.fromList
                  [ ( Linux UnknownLinux
                    , M.fromList [(Nothing, cabal_3200_32_linux)]
                    )
-                  , (Linux Alpine, M.fromList [(Nothing, cabal_3200_32_alpine)])
                  ]
                )
              ]
--- a/lib/GHCup/Data/GHCupInfo.hs
+++ b/lib/GHCup/Data/GHCupInfo.hs
@@ -1,7 +1,7 @@
-module GHCup.Data.GHCupInfo where
+module GHCupInfo where

-import           GHCup.Data.GHCupDownloads
-import           GHCup.Data.ToolRequirements
+import           GHCupDownloads
+import           ToolRequirements
 import           GHCup.Types


--- a/app/ghcup-gen/Main.hs
+++ b/app/ghcup-gen/Main.hs
@@ -10,10 +10,10 @@

 module Main where

-import           GHCup.Data.GHCupInfo
 import           GHCup.Types
 import           GHCup.Types.JSON               ( )
 import           GHCup.Utils.Logger
+import           GHCupInfo

 import           Data.Aeson                     ( eitherDecode, encode )
 import           Data.Aeson.Encode.Pretty
--- a/lib/GHCup/Data/ToolRequirements.hs
+++ b/lib/GHCup/Data/ToolRequirements.hs
@@ -1,11 +1,10 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE QuasiQuotes       #-}

-module GHCup.Data.ToolRequirements where
+module ToolRequirements where

 import           GHCup.Types
 import           GHCup.Utils.String.QQ
-import           GHCup.Utils.Version.QQ

 import qualified Data.Map                      as M

@@ -62,35 +61,6 @@ toolRequirements = M.fromList
                )
              ]
            )
-          , ( Linux CentOS
-            , M.fromList
-              [ ( Nothing
-                , Requirements
-                  [ "gcc"
-                  , "gcc-c++"
-                  , "gmp"
-                  , "make"
-                  , "ncurses"
-                  , "ncurses-compat-libs"
-                  , "xz"
-                  , "perl"
-                  ]
-                  ""
-                ),
-              ( Just [vers|7|]
-                , Requirements
-                  [ "gcc"
-                  , "gcc-c++"
-                  , "gmp"
-                  , "make"
-                  , "ncurses"
-                  , "xz"
-                  , "perl"
-                  ]
-                  ""
-                )
-              ]
-            )
          , ( Darwin
            , M.fromList
              [ ( Nothing
--- a/app/ghcup-gen/Validate.hs
+++ b/app/ghcup-gen/Validate.hs
@@ -27,12 +27,9 @@ import           Haskus.Utils.Variant.Excepts
 import           Optics
 import           System.Exit
 import           System.IO
-import           Text.ParserCombinators.ReadP

 import qualified Data.ByteString               as B
 import qualified Data.Map.Strict               as M
-import qualified Data.Text                     as T
-import qualified Data.Version                  as V


 data ValidationError = InternalError String
@@ -64,9 +61,8 @@ validate dls = do
        forM_ (M.toList $ _viArch vi) $ \(arch, pspecs) -> do
          checkHasRequiredPlatforms t v arch (M.keys pspecs)

-    checkGHCVerIsValid
+    checkGHCisSemver
    forM_ (M.toList dls) $ \(t, _) -> checkMandatoryTags t
-    _ <- checkGHCHasBaseVersion

    -- exit
    e <- liftIO $ readIORef ref
@@ -89,7 +85,7 @@ validate dls = do
      [i|FreeBSD missing for #{t} #{v'} #{arch}|]

  checkUniqueTags tool = do
-    let allTags = join $ M.elems $ availableToolVersions dls tool
+    let allTags = join $ fmap snd $ availableToolVersions dls tool
    let nonUnique =
          fmap fst
            .   filter (\(_, b) -> not b)
@@ -109,40 +105,26 @@ validate dls = do
        lift $ $(logError) [i|Tags not unique for #{tool}: #{xs}|]
        addError
   where
-    isUniqueTag Latest         = True
-    isUniqueTag Recommended    = True
-    isUniqueTag (Base       _) = False
-    isUniqueTag (UnknownTag _) = False
+    isUniqueTag Latest      = True
+    isUniqueTag Recommended = True

-  checkGHCVerIsValid = do
+  checkGHCisSemver = do
    let ghcVers = toListOf (ix GHC % to M.keys % folded) dls
-    forM_ ghcVers $ \v ->
-      case [ x | (x,"") <- readP_to_S V.parseVersion (T.unpack . prettyVer $ v) ] of
-        [_] -> pure ()
-        _   -> do
-          lift $ $(logError) [i|GHC version #{v} is not valid |]
-          addError
+    forM_ ghcVers $ \v -> case semver (prettyVer v) of
+      Left _ -> do
+        lift $ $(logError) [i|GHC version #{v} is not valid semver|]
+        addError
+      Right _ -> pure ()

  -- a tool must have at least one of each mandatory tags
  checkMandatoryTags tool = do
-    let allTags = join $ M.elems $ availableToolVersions dls tool
+    let allTags = join $ fmap snd $ availableToolVersions dls tool
    forM_ [Latest, Recommended] $ \t -> case elem t allTags of
      False -> do
        lift $ $(logError) [i|Tag #{t} missing from #{tool}|]
        addError
      True -> pure ()

-  -- all GHC versions must have a base tag
-  checkGHCHasBaseVersion = do
-    let allTags = M.toList $ availableToolVersions dls GHC
-    forM allTags $ \(ver, tags) -> case any isBase tags of
-      False -> do
-        lift $ $(logError) [i|Base tag missing from GHC ver #{ver}|]
-        addError
-      True -> pure ()
-
-  isBase (Base _) = True
-  isBase _        = False

 validateTarballs :: ( Monad m
                    , MonadLogger m
@@ -179,7 +161,7 @@ validateTarballs dls = do

 where
  downloadAll dli = do
-    let settings = Settings True False Never
+    let settings = Settings True False
    let runLogger = myLoggerT LoggerConfig { lcPrintDebug = True
                                           , colorOutter  = B.hPut stderr
                                           , rawOutter    = (\_ -> pure ())
--- a/app/ghcup/Main.hs
+++ b/app/ghcup/Main.hs
@@ -19,7 +19,6 @@ import           GHCup.Types
 import           GHCup.Utils
 import           GHCup.Utils.File
 import           GHCup.Utils.Logger
-import           GHCup.Utils.MegaParsec
 import           GHCup.Utils.Prelude
 import           GHCup.Version

@@ -33,12 +32,11 @@ import           Data.Bifunctor
 import           Data.Char
 import           Data.Either
 import           Data.Functor
-import           Data.List                      ( intercalate, sort )
-import           Data.List.NonEmpty             (NonEmpty ((:|)))
+import           Data.List                      ( intercalate )
 import           Data.Maybe
 import           Data.String.Interpolate
 import           Data.Text                      ( Text )
-import           Data.Versions           hiding ( str )
+import           Data.Versions
 import           Data.Void
 import           GHC.IO.Encoding
 import           Haskus.Utils.Variant.Excepts
@@ -75,7 +73,6 @@ data Options = Options
  , optCache     :: Bool
  , optUrlSource :: Maybe URI
  , optNoVerify  :: Bool
-  , optKeepDirs  :: KeepDirs
  -- commands
  , optCommand   :: Command
  }
@@ -92,13 +89,9 @@ data Command
  | ToolRequirements
  | ChangeLog ChangeLogOptions

-data ToolVersion = ToolVersion GHCTargetVersion -- target is ignored for cabal
+data ToolVersion = ToolVersion Version
                 | ToolTag Tag

-prettyToolVer :: ToolVersion -> String
-prettyToolVer (ToolVersion v') = T.unpack $ prettyTVer v'
-prettyToolVer (ToolTag t) = show t
-

 data InstallOptions = InstallOptions
  { instVer      :: Maybe ToolVersion
@@ -110,31 +103,20 @@ data SetGHCOptions = SetGHCOptions
  }

 data ListOptions = ListOptions
-  { lTool      :: Maybe Tool
-  , lCriteria  :: Maybe ListCriteria
-  , lRawFormat :: Bool
+  { lTool     :: Maybe Tool
+  , lCriteria :: Maybe ListCriteria
  }

 data RmOptions = RmOptions
-  { ghcVer :: GHCTargetVersion
+  { ghcVer :: Version
  }


-data CompileCommand = CompileGHC GHCCompileOptions
-                    | CompileCabal CabalCompileOptions
+data CompileCommand = CompileGHC CompileOptions
+                    | CompileCabal CompileOptions


-data GHCCompileOptions = GHCCompileOptions
-  { targetVer    :: Version
-  , bootstrapGhc :: Either Version (Path Abs)
-  , jobs         :: Maybe Int
-  , buildConfig  :: Maybe (Path Abs)
-  , patchDir     :: Maybe (Path Abs)
-  , crossTarget  :: Maybe Text
-  , addConfArgs  :: [Text]
-  }
-
-data CabalCompileOptions = CabalCompileOptions
+data CompileOptions = CompileOptions
  { targetVer    :: Version
  , bootstrapGhc :: Either Version (Path Abs)
  , jobs         :: Maybe Int
@@ -176,14 +158,6 @@ opts =
          (short 'n' <> long "no-verify" <> help
            "Skip tarball checksum verification"
          )
-    <*> option
-          (eitherReader keepOnParser)
-          (  long "keep"
-          <> metavar "<always|errors|never>"
-          <> help
-               "Keep build directories?"
-          <> value Never
-          )
    <*> com
 where
  parseUri s' =
@@ -335,9 +309,6 @@ listOpts =
            )
          )
        )
-    <*> switch
-          (short 'r' <> long "raw-format" <> help "More machine-parsable format"
-          )

 rmOpts :: Parser RmOptions
 rmOpts = RmOptions <$> versionArgument
@@ -370,7 +341,7 @@ compileP = subparser
      "ghc"
      (   CompileGHC
      <$> (info
-            (ghcCompileOpts <**> helper)
+            (compileOpts <**> helper)
            (  progDesc "Compile GHC from source"
            <> footerDoc (Just $ text compileFooter)
            )
@@ -380,7 +351,7 @@ compileP = subparser
       "cabal"
       (   CompileCabal
       <$> (info
-             (cabalCompileOpts <**> helper)
+             (compileOpts <**> helper)
             (  progDesc "Compile Cabal from source"
             <> footerDoc (Just $ text compileCabalFooter)
             )
@@ -393,19 +364,9 @@ compileP = subparser
  a self-contained "~/.ghcup/ghc/<ghcver>" directory
  and symlinks the ghc binaries to "~/.ghcup/bin/<binary>-<ghcver>".

-  This also allows building a cross-compiler. Consult the documentation
-  first: <https://gitlab.haskell.org/ghc/ghc/-/wikis/building/cross-compiling#configuring-the-build>
-
-ENV variables:
-  Various toolchain variables will be passed onto the ghc build system,
-  such as: CC, LD, OBJDUMP, NM, AR, RANLIB.
-
 Examples:
  ghcup compile ghc -j 4 -v 8.4.2 -b 8.2.2
-  # specify path to bootstrap ghc
-  ghcup compile ghc -j 4 -v 8.4.2 -b /usr/bin/ghc-8.2.2
-  # build cross compiler
-  ghcup compile ghc -j 4 -v 8.4.2 -b 8.2.2 -x armv7-unknown-linux-gnueabihf --config $(pwd)/build.mk -- --enable-unregisterised|]
+  ghcup compile ghc -j 4 -v 8.4.2 -b /usr/bin/ghc-8.2.2|]
  compileCabalFooter = [i|Discussion:
  Compiles and installs the specified Cabal version
  into "~/.ghcup/bin".
@@ -415,24 +376,10 @@ Examples:
  ghcup compile cabal -j 4 -v 3.2.0.0 -b /usr/bin/ghc-8.6.5|]


-ghcCompileOpts :: Parser GHCCompileOptions
-ghcCompileOpts =
-  (\CabalCompileOptions {..} crossTarget addConfArgs -> GHCCompileOptions { .. }
-    )
-    <$> cabalCompileOpts
-    <*> (optional
-          (option
-            str
-            (short 'x' <> long "cross-target" <> metavar "CROSS_TARGET" <> help
-              "Build cross-compiler for this platform"
-            )
-          )
-        )
-    <*> many (argument str (metavar "CONFIGURE_ARGS" <> help "Additional arguments to configure, prefix with '-- ' (longopts)"))

-cabalCompileOpts :: Parser CabalCompileOptions
-cabalCompileOpts =
-  CabalCompileOptions
+compileOpts :: Parser CompileOptions
+compileOpts =
+  CompileOptions
    <$> (option
          (eitherReader
            (bimap (const "Not a valid version") id . version . T.pack)
@@ -507,12 +454,12 @@ toolVersionArgument =
  argument (eitherReader toolVersionEither) (metavar "VERSION|TAG")


-versionArgument :: Parser GHCTargetVersion
-versionArgument = argument (eitherReader tVersionEither) (metavar "VERSION")
+versionArgument :: Parser Version
+versionArgument = argument (eitherReader versionEither) (metavar "VERSION")

-versionParser :: Parser GHCTargetVersion
+versionParser :: Parser Version
 versionParser = option
-  (eitherReader tVersionEither)
+  (eitherReader versionEither)
  (short 'v' <> long "version" <> metavar "VERSION" <> help "The target version"
  )

@@ -520,20 +467,18 @@ tagEither :: String -> Either String Tag
 tagEither s' = case fmap toLower s' of
  "recommended" -> Right Recommended
  "latest"      -> Right Latest
-  ('b':'a':'s':'e':'-':ver') -> case pvp (T.pack ver') of
-                                  Right x -> Right (Base x)
-                                  Left  _ -> Left [i|Invalid PVP version for base #{ver'}|]
  other         -> Left ([i|Unknown tag #{other}|])

-
-tVersionEither :: String -> Either String GHCTargetVersion
-tVersionEither =
-  bimap (const "Not a valid version") id . MP.parse ghcTargetVerP "" . T.pack
-
+versionEither :: String -> Either String Version
+versionEither s' =
+  -- 'version' is a bit too lax and will parse typoed tags
+                   case readMaybe ((: []) . head $ s') :: Maybe Int of
+  Just _  -> bimap (const "Not a valid version") id . version . T.pack $ s'
+  Nothing -> Left "Not a valid version"

 toolVersionEither :: String -> Either String ToolVersion
 toolVersionEither s' =
-  bimap id ToolTag (tagEither s') <|> bimap id ToolVersion (tVersionEither s')
+  bimap id ToolTag (tagEither s') <|> bimap id ToolVersion (versionEither s')


 toolParser :: String -> Either String Tool
@@ -550,14 +495,6 @@ criteriaParser s' | t == T.pack "installed" = Right ListInstalled
  where t = T.toLower (T.pack s')


-keepOnParser :: String -> Either String KeepDirs
-keepOnParser s' | t == T.pack "always" = Right Always
-                | t == T.pack "errors" = Right Errors
-                | t == T.pack "never"  = Right Never
-                | otherwise            = Left ("Unknown keep value: " <> s')
-  where t = T.toLower (T.pack s')
-
-
 platformParser :: String -> Either String PlatformRequest
 platformParser s' = case MP.parse (platformP <* MP.eof) "" (T.pack s') of
  Right r -> pure r
@@ -617,14 +554,24 @@ platformParser s' = case MP.parse (platformP <* MP.eof) "" (T.pack s') of
        MP.setInput rest
        pure v

+  choice' []       = fail "Empty list"
+  choice' [x     ] = x
+  choice' (x : xs) = MP.try x <|> choice' xs

+  parseUntil :: MP.Parsec Void Text Text -> MP.Parsec Void Text Text
+  parseUntil p = do
+    (MP.try (MP.lookAhead p) $> mempty)
+      <|> (do
+            c  <- T.singleton <$> MP.anySingle
+            c2 <- parseUntil p
+            pure (c `mappend` c2)
+          )


 toSettings :: Options -> Settings
 toSettings Options {..} =
  let cache    = optCache
      noVerify = optNoVerify
-      keepDirs = optKeepDirs
  in  Settings { .. }


@@ -677,31 +624,21 @@ main = do
        <> help "Show the numeric version (for use in scripts)"
        <> hidden
        )
-  let listCommands = infoOption
-        "install set rm install-cabal list upgrade compile debug-info tool-requirements changelog"
-        (  long "list-commands"
-        <> help "List available commands for shell completion"
-        <> internal
-        )

  let main_footer = [i|Discussion:
  ghcup installs the Glasgow Haskell Compiler from the official
  release channels, enabling you to easily switch between different
-  versions. It maintains a self-contained ~/.ghcup directory.
-
-ENV variables:
-  * TMPDIR: where ghcup does the work (unpacking, building, ...)
-  * GHCUP_INSTALL_BASE_PREFIX: the base of ghcup (default: $HOME)
+  versions.

 Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]

  customExecParser
      (prefs showHelpOnError)
-      (info (opts <**> helper <**> versionHelp <**> numericVersionHelp <**> listCommands)
+      (info (opts <**> helper <**> versionHelp <**> numericVersionHelp)
            (footerDoc (Just $ text main_footer))
      )
    >>= \opt@Options {..} -> do
-          let settings@Settings{..} = toSettings opt
+          let settings = toSettings opt

          -- create ~/.ghcup dir
          ghcdir <- ghcupBaseDir
@@ -747,7 +684,10 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                    , TagNotFound
                    ]

-          let runListGHC = runE @'[] . runLogger
+          let runListGHC =
+                runLogger
+                  . flip runReaderT settings
+                  . runE @'[FileDoesNotExistError]

          let runRmGHC =
                runLogger . flip runReaderT settings . runE @'[NotInstalled]
@@ -828,7 +768,7 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
            Install (InstallOptions {..}) ->
              (runInstTool $ do
                  v <- liftE $ fromVersion dls instVer GHC
-                  liftE $ installGHCBin dls (_tvVersion v) instPlatform -- FIXME: ugly sharing of tool version
+                  liftE $ installGHCBin dls v instPlatform
                )
                >>= \case
                      VRight _ -> do
@@ -839,18 +779,10 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                          [i|GHC ver #{prettyVer v} already installed|]
                        pure ExitSuccess
                      VLeft (V (BuildFailed tmpdir e)) -> do
-                        case keepDirs of
-                          Never -> runLogger ($(logError) [i|Build failed with #{e}|])
-                          _ -> runLogger ($(logError) [i|Build failed with #{e}
-Check the logs at ~/.ghcup/logs and the build directory #{tmpdir} for more clues.
-Make sure to clean up #{tmpdir} afterwards.|])
-                        pure $ ExitFailure 3
-                      VLeft (V NoDownload) -> do
-
-                        runLogger $ do
-                          case instVer of
-                            Just iver -> $(logError) [i|No available GHC version for #{prettyToolVer iver}|]
-                            Nothing -> $(logError) [i|No available recommended GHC version|]
+                        runLogger
+                          ($(logError) [i|Build failed with #{e}
+Check the logs at ~/.ghcup/logs and the build directory #{tmpdir} for more clues.|]
+                          )
                        pure $ ExitFailure 3
                      VLeft e -> do
                        runLogger $ do
@@ -860,7 +792,7 @@ Make sure to clean up #{tmpdir} afterwards.|])
            InstallCabal (InstallOptions {..}) ->
              (runInstTool $ do
                  v <- liftE $ fromVersion dls instVer Cabal
-                  liftE $ installCabalBin dls (_tvVersion v) instPlatform -- FIXME: ugly sharing of tool version
+                  liftE $ installCabalBin dls v instPlatform
                )
                >>= \case
                      VRight _ -> do
@@ -870,13 +802,6 @@ Make sure to clean up #{tmpdir} afterwards.|])
                        runLogger $ $(logWarn)
                          [i|Cabal ver #{prettyVer v} already installed|]
                        pure ExitSuccess
-                      VLeft (V NoDownload) -> do
-
-                        runLogger $ do
-                          case instVer of
-                            Just iver -> $(logError) [i|No available Cabal version for #{prettyToolVer iver}|]
-                            Nothing -> $(logError) [i|No available recommended Cabal version|]
-                        pure $ ExitFailure 4
                      VLeft e -> do
                        runLogger $ do
                          $(logError) [i|#{e}|]
@@ -889,10 +814,10 @@ Make sure to clean up #{tmpdir} afterwards.|])
                  liftE $ setGHC v SetGHCOnly
                )
                >>= \case
-                      VRight (GHCTargetVersion{..}) -> do
+                      VRight v -> do
                        runLogger
                          $ $(logInfo)
-                              [i|GHC #{prettyVer _tvVersion} successfully set as default version#{maybe "" (" for cross target " <>) _tvTarget}|]
+                              [i|GHC #{prettyVer v} successfully set as default version|]
                        pure ExitSuccess
                      VLeft e -> do
                        runLogger ($(logError) [i|#{e}|])
@@ -900,12 +825,11 @@ Make sure to clean up #{tmpdir} afterwards.|])

            List (ListOptions {..}) ->
              (runListGHC $ do
-                  l <- listVersions dls lTool lCriteria
-                  pure l
+                  liftIO $ listVersions dls lTool lCriteria
                )
                >>= \case
                      VRight r -> do
-                        liftIO $ printListResult lRawFormat r
+                        liftIO $ printListResult r
                        pure ExitSuccess
                      VLeft e -> do
                        runLogger ($(logError) [i|#{e}|])
@@ -932,14 +856,13 @@ Make sure to clean up #{tmpdir} afterwards.|])
                        runLogger ($(logError) [i|#{e}|])
                        pure $ ExitFailure 8

-            Compile (CompileGHC GHCCompileOptions {..}) ->
+            Compile (CompileGHC CompileOptions {..}) ->
              (runCompileGHC $ liftE $ compileGHC dls
-                                                  (GHCTargetVersion crossTarget targetVer)
+                                                  targetVer
                                                  bootstrapGhc
                                                  jobs
                                                  buildConfig
                                                  patchDir
-                                                  addConfArgs
                )
                >>= \case
                      VRight _ -> do
@@ -951,18 +874,17 @@ Make sure to clean up #{tmpdir} afterwards.|])
                          [i|GHC ver #{prettyVer v} already installed|]
                        pure ExitSuccess
                      VLeft (V (BuildFailed tmpdir e)) -> do
-                        case keepDirs of
-                          Never -> runLogger ($(logError) [i|Build failed with #{e}
-Check the logs at ~/.ghcup/logs|])
-                          _ -> runLogger ($(logError) [i|Build failed with #{e}
+                        runLogger
+                          ($(logError) [i|Build failed with #{e}
 Check the logs at ~/.ghcup/logs and the build directory #{tmpdir} for more clues.
-Make sure to clean up #{tmpdir} afterwards.|])
+Make sure to clean up #{tmpdir} afterwards.|]
+                          )
                        pure $ ExitFailure 9
                      VLeft e -> do
                        runLogger ($(logError) [i|#{e}|])
                        pure $ ExitFailure 9

-            Compile (CompileCabal CabalCompileOptions {..}) ->
+            Compile (CompileCabal CompileOptions {..}) ->
              (runCompileCabal $ do
                  liftE $ compileCabal dls targetVer bootstrapGhc jobs patchDir
                )
@@ -974,11 +896,10 @@ Make sure to clean up #{tmpdir} afterwards.|])
                          )
                        pure ExitSuccess
                      VLeft (V (BuildFailed tmpdir e)) -> do
-                        case keepDirs of
-                          Never -> runLogger ($(logError) [i|Build failed with #{e}|])
-                          _ -> runLogger ($(logError) [i|Build failed with #{e}
-Check the logs at ~/.ghcup/logs and the build directory #{tmpdir} for more clues.
-Make sure to clean up #{tmpdir} afterwards.|])
+                        runLogger
+                          ($(logError) [i|Build failed with #{e}
+Check the logs at ~/.ghcup/logs and the build directory #{tmpdir} for more clues.|]
+                          )
                        pure $ ExitFailure 10
                      VLeft e -> do
                        runLogger ($(logError) [i|#{e}|])
@@ -1033,7 +954,7 @@ Make sure to clean up #{tmpdir} afterwards.|])
                  ver' = maybe
                    (Right Latest)
                    (\case
-                      ToolVersion tv -> Left (_tvVersion tv) -- FIXME: ugly sharing of ToolVersion
+                      ToolVersion tv -> Left tv
                      ToolTag     t  -> Right t
                    )
                    clToolVer
@@ -1070,75 +991,47 @@ fromVersion :: Monad m
            => GHCupDownloads
            -> Maybe ToolVersion
            -> Tool
-            -> Excepts '[TagNotFound] m GHCTargetVersion
+            -> Excepts '[TagNotFound] m Version
 fromVersion av Nothing tool =
-  mkTVer <$> getRecommended av tool ?? TagNotFound Recommended tool
-fromVersion av (Just (ToolVersion v)) _ = do
-  case pvp $ prettyVer (_tvVersion v) of
-    Left _ -> pure v
-    Right (PVP (major' :|[minor'])) ->
-      case getLatestGHCFor (fromIntegral major') (fromIntegral minor') av of
-        Just v' -> pure $ GHCTargetVersion (_tvTarget v) v'
-        Nothing -> pure v
-    Right _ -> pure v
+  getRecommended av tool ?? TagNotFound Recommended tool
+fromVersion _ (Just (ToolVersion v)) _ = pure v
 fromVersion av (Just (ToolTag Latest)) tool =
-  mkTVer <$> getLatest av tool ?? TagNotFound Latest tool
+  getLatest av tool ?? TagNotFound Latest tool
 fromVersion av (Just (ToolTag Recommended)) tool =
-  mkTVer <$> getRecommended av tool ?? TagNotFound Recommended tool
-fromVersion av (Just (ToolTag (Base pvp''))) GHC =
-  mkTVer <$> getLatestBaseVersion av pvp'' ?? TagNotFound (Base pvp'') GHC
-fromVersion _ (Just (ToolTag t')) tool =
-  throwE $ TagNotFound t' tool
+  getRecommended av tool ?? TagNotFound Recommended tool


-printListResult :: Bool -> [ListResult] -> IO ()
-printListResult raw lr = do
+printListResult :: [ListResult] -> IO ()
+printListResult lr = do
  -- https://gitlab.haskell.org/ghc/ghc/issues/8118
  setLocaleEncoding utf8

  let
    formatted =
      gridString
-          (  (if raw then [] else [column expand left def def])
-          ++ [ column expand left def def
-             , column expand left def def
-             , column expand left def def
-             , column expand left def def
-             ]
-          )
-        . (\x -> if raw
-            then x
-            else [color Green "", "Tool", "Version", "Tags", "Notes"] : x
-          )
+          [ column expand left def def
+          , column expand left def def
+          , column expand left def def
+          , column expand left def def
+          , column expand left def def
+          ]
        $ fmap
            (\ListResult {..} ->
-              let marks = if
-                    | lSet       -> (color Green "✔✔")
-                    | lInstalled -> (color Green "✓")
-                    | otherwise  -> (color Red "✗")
-              in  (if raw then [] else [marks])
-                    ++ [ fmap toLower . show $ lTool
-                       , case lCross of
-                           Nothing -> T.unpack . prettyVer $ lVer
-                           Just c  -> T.unpack (c <> "-" <> prettyVer lVer)
-                       , intercalate "," $ (fmap printTag $ sort lTag)
-                       , intercalate ","
-                       $  (if fromSrc then [color' Blue "compiled"] else mempty)
-                       ++ (if lStray then [color' Blue "stray"] else mempty)
-                       ]
+              [ if
+                | lSet       -> (color Green "✔✔")
+                | lInstalled -> (color Green "✓")
+                | otherwise  -> (color Red "✗")
+              , fmap toLower . show $ lTool
+              , T.unpack . prettyVer $ lVer
+              , intercalate "," $ ((fmap . fmap) toLower . fmap show $ lTag)
+              , if fromSrc then (color Blue "compiled") else mempty
+              ]
            )
            lr
  putStrLn $ formatted
- where
-  printTag Recommended        = color' Green "recommended"
-  printTag Latest             = color' Yellow "latest"
-  printTag (Base pvp'') = "base-" ++ T.unpack (prettyPVP pvp'')
-  printTag (UnknownTag t    ) = t
-  color' = case raw of
-    True  -> flip const
-    False -> color

-checkForUpdates :: (MonadThrow m, MonadIO m, MonadFail m, MonadLogger m)
+
+checkForUpdates :: (MonadIO m, MonadFail m, MonadLogger m)
                => GHCupDownloads
                -> m ()
 checkForUpdates dls = do
@@ -1164,7 +1057,7 @@ checkForUpdates dls = do

 where
  latestInstalled tool = (fmap lVer . lastMay)
-    <$> (listVersions dls (Just tool) (Just ListInstalled))
+    <$> liftIO (listVersions dls (Just tool) (Just ListInstalled))


 prettyDebugInfo :: DebugInfo -> String
--- a/ghcup-0.0.1.json
+++ b/ghcup-0.0.1.json
@@ -1958,7 +1958,7 @@
          "A_32": {
            "Linux_Alpine": {
              "unknown_versioning": {
-                "dlHash": "7a5f41646d06777e75636291a1855d60a0984552bbdf33c3d107565d302f38a4",
+                "dlHash": "23779adb4cf4b314d0f8c66ee215ba6e74154c0768a573780475943544020bec",
                "dlSubdir": "ghc-8.8.3",
                "dlUri": "https://github.com/redneb/ghc-alt-libc/releases/download/ghc-8.8.3-musl/ghc-8.8.3-i386-unknown-linux-musl.tar.xz"
              }
--- a/ghcup-0.0.2.json
+++ b/ghcup-0.0.2.json
--- a/ghcup.cabal
+++ b/ghcup.cabal
@@ -41,6 +41,9 @@ common ascii-string
 common async
  build-depends: async >=0.8

+common attoparsec
+  build-depends: attoparsec >=0.13
+
 common base
  build-depends: base >=4.12 && <5

@@ -227,6 +230,7 @@ library
    , aeson
    , ascii-string
    , async
+    , attoparsec
    , binary
    , bytestring
    , bz2
@@ -244,7 +248,6 @@ library
    , hpath-posix
    , language-bash
    , lzma
-    , megaparsec
    , monad-logger
    , mtl
    , optics
@@ -276,9 +279,6 @@ library

  exposed-modules:
    GHCup
-    GHCup.Data.GHCupDownloads
-    GHCup.Data.GHCupInfo
-    GHCup.Data.ToolRequirements
    GHCup.Download
    GHCup.Download.Utils
    GHCup.Errors
@@ -292,7 +292,6 @@ library
    GHCup.Utils.Dirs
    GHCup.Utils.File
    GHCup.Utils.Logger
-    GHCup.Utils.MegaParsec
    GHCup.Utils.Prelude
    GHCup.Utils.String.QQ
    GHCup.Utils.Version.QQ
@@ -373,6 +372,9 @@ executable ghcup-gen
  --
  main-is:          Main.hs
  other-modules:
+    GHCupDownloads
+    GHCupInfo
+    ToolRequirements
    Validate

  -- other-extensions:
--- a/lib/GHCup.hs
+++ b/lib/GHCup.hs
@@ -9,7 +9,6 @@
 {-# LANGUAGE TemplateHaskell       #-}
 {-# LANGUAGE TypeApplications      #-}
 {-# LANGUAGE TypeFamilies          #-}
-{-# LANGUAGE ViewPatterns          #-}

 module GHCup where

@@ -41,7 +40,6 @@ import           Data.ByteString                ( ByteString )
 import           Data.List
 import           Data.Maybe
 import           Data.String.Interpolate
-import           Data.Text                      ( Text )
 import           Data.Versions
 import           Data.Word8
 import           GHC.IO.Exception
@@ -54,14 +52,11 @@ import           Prelude                 hiding ( abs
                                                , writeFile
                                                )
 import           System.IO.Error
-import           System.Posix.Env.ByteString    ( getEnvironment )
 import           System.Posix.FilePath          ( getSearchPath )
 import           System.Posix.Files.ByteString

 import qualified Data.ByteString               as B
-import qualified Data.ByteString.Lazy          as BL
 import qualified Data.Map.Strict               as Map
-import qualified Data.Text                     as T
 import qualified Data.Text.Encoding            as E


@@ -98,34 +93,45 @@ installGHCBin :: ( MonadFail m
                   m
                   ()
 installGHCBin bDls ver mpfReq = do
-  let tver = (mkTVer ver)
  lift $ $(logDebug) [i|Requested to install GHC with #{ver}|]
-  whenM (liftIO $ ghcInstalled tver)
+  whenM (liftIO $ toolAlreadyInstalled GHC ver)
    $ (throwE $ AlreadyInstalled GHC ver)
-  Settings {..}                <- lift ask
+  Settings {..} <- lift ask
  pfreq@(PlatformRequest {..}) <- maybe (liftE $ platformRequest) pure mpfReq

  -- download (or use cached version)
-  dlinfo                       <- lE $ getDownloadInfo GHC ver pfreq bDls
-  dl                           <- liftE $ downloadCached dlinfo Nothing
+  dlinfo        <- lE $ getDownloadInfo GHC ver pfreq bDls
+  dl            <- liftE $ downloadCached dlinfo Nothing

  -- unpack
-  tmpUnpack                    <- lift mkGhcupTmpDir
+  tmpUnpack     <- lift mkGhcupTmpDir
  liftE $ unpackToDir tmpUnpack dl
  void $ liftIO $ darwinNotarization _rPlatform tmpUnpack

  -- prepare paths
-  ghcdir <- liftIO $ ghcupGHCDir tver
+  ghcdir <- liftIO $ ghcupGHCDir ver

  -- the subdir of the archive where we do the work
  let workdir = maybe tmpUnpack (tmpUnpack </>) (view dlSubdir dlinfo)

-  liftE $ runBuildAction tmpUnpack (Just ghcdir) (installGHC' workdir ghcdir)
+  -- Be careful about cleanup. We must catch both pure exceptions
+  -- as well as async ones.
+  flip onException
+       (liftIO $ hideError doesNotExistErrorType $ deleteDirRecursive ghcdir)
+    $ catchAllE
+        (\es -> do
+          liftIO (hideError doesNotExistErrorType $ deleteDirRecursive ghcdir)
+            >> throwE (BuildFailed workdir es)
+        )
+    $ installGHC' workdir ghcdir

-  liftE $ postGHCInstall tver
+  -- only clean up dir if the build succeeded
+  liftIO $ deleteDirRecursive tmpUnpack
+
+  liftE $ postGHCInstall ver

 where
-  -- | Install an unpacked GHC distribution. This only deals with the GHC build system and nothing else.
+    -- | Install an unpacked GHC distribution. This only deals with the GHC build system and nothing else.
  installGHC' :: (MonadLogger m, MonadIO m)
              => Path Abs      -- ^ Path to the unpacked GHC bindist (where the configure script resides)
              -> Path Abs      -- ^ Path to install to
@@ -166,15 +172,15 @@ installCabalBin :: ( MonadMask m
                     ()
 installCabalBin bDls ver mpfReq = do
  lift $ $(logDebug) [i|Requested to install cabal version #{ver}|]
-  Settings {..}                <- lift ask
+  Settings {..} <- lift ask
  pfreq@(PlatformRequest {..}) <- maybe (liftE $ platformRequest) pure mpfReq

  -- download (or use cached version)
-  dlinfo                       <- lE $ getDownloadInfo Cabal ver pfreq bDls
-  dl                           <- liftE $ downloadCached dlinfo Nothing
+  dlinfo        <- lE $ getDownloadInfo Cabal ver pfreq bDls
+  dl            <- liftE $ downloadCached dlinfo Nothing

  -- unpack
-  tmpUnpack                    <- lift withGHCupTmpDir
+  tmpUnpack     <- lift withGHCupTmpDir
  liftE $ unpackToDir tmpUnpack dl
  void $ liftIO $ darwinNotarization _rPlatform tmpUnpack

@@ -188,7 +194,7 @@ installCabalBin bDls ver mpfReq = do
  pure ()

 where
-  -- | Install an unpacked cabal distribution.
+    -- | Install an unpacked cabal distribution.
  installCabal' :: (MonadLogger m, MonadCatch m, MonadIO m)
                => Path Abs      -- ^ Path to the unpacked cabal bindist (where the executable resides)
                -> Path Abs      -- ^ Path to install to
@@ -220,11 +226,11 @@ installCabalBin bDls ver mpfReq = do
 -- Additionally creates a ~/.ghcup/share -> ~/.ghcup/ghc/<ver>/share symlink
 -- for `SetGHCOnly` constructor.
 setGHC :: (MonadLogger m, MonadThrow m, MonadFail m, MonadIO m)
-       => GHCTargetVersion
+       => Version
       -> SetGHC
-       -> Excepts '[NotInstalled] m GHCTargetVersion
+       -> Excepts '[NotInstalled] m Version
 setGHC ver sghc = do
-  let verBS = verToBS (_tvVersion ver)
+  let verBS = verToBS ver
  ghcdir <- liftIO $ ghcupGHCDir ver

  -- symlink destination
@@ -234,7 +240,7 @@ setGHC ver sghc = do
  -- first delete the old symlinks (this fixes compatibility issues
  -- with old ghcup)
  case sghc of
-    SetGHCOnly -> liftE $ rmPlain (_tvTarget ver)
+    SetGHCOnly -> liftE $ rmPlain ver
    SetGHC_XY  -> lift $ rmMajorSymlinks ver
    SetGHC_XYZ -> lift $ rmMinorSymlinks ver

@@ -244,8 +250,9 @@ setGHC ver sghc = do
    targetFile <- case sghc of
      SetGHCOnly -> pure file
      SetGHC_XY  -> do
-        major' <- (\(mj, mi) -> E.encodeUtf8 $ intToText mj <> "." <> intToText mi)
-                     <$> getMajorMinorV (_tvVersion ver)
+        major' <-
+          (\(mj, mi) -> E.encodeUtf8 $ intToText mj <> "." <> intToText mi)
+            <$> getGHCMajor ver
        parseRel (toFilePath file <> B.singleton _hyphen <> major')
      SetGHC_XYZ -> parseRel (toFilePath file <> B.singleton _hyphen <> verBS)

@@ -256,7 +263,7 @@ setGHC ver sghc = do
    liftIO $ createSymlink fullF destL

  -- create symlink for share dir
-  when (isNothing . _tvTarget $ ver) $ lift $ symlinkShareDir ghcdir verBS
+  lift $ symlinkShareDir ghcdir verBS

  pure ver

@@ -296,41 +303,27 @@ data ListCriteria = ListInstalled
 data ListResult = ListResult
  { lTool      :: Tool
  , lVer       :: Version
-  , lCross     :: Maybe Text -- ^ currently only for GHC
  , lTag       :: [Tag]
  , lInstalled :: Bool
-  , lSet       :: Bool -- ^ currently active version
-  , fromSrc    :: Bool -- ^ compiled from source
-  , lStray     :: Bool -- ^ not in download info
+  , lSet       :: Bool
+  , fromSrc    :: Bool
  }
-  deriving (Eq, Ord, Show)
+  deriving Show


-availableToolVersions :: GHCupDownloads -> Tool -> Map.Map Version [Tag]
-availableToolVersions av tool = view
-  (at tool % non Map.empty % to (fmap (_viTags)))
+availableToolVersions :: GHCupDownloads -> Tool -> [(Version, [Tag])]
+availableToolVersions av tool = toListOf
+  (ix tool % to (fmap (\(v, vi) -> (v, (_viTags vi))) . Map.toList) % folded)
  av


-- | List all versions from the download info, as well as stray
-- versions.
-listVersions :: (MonadThrow m, MonadLogger m, MonadIO m)
-             => GHCupDownloads
+listVersions :: GHCupDownloads
             -> Maybe Tool
             -> Maybe ListCriteria
-             -> m [ListResult]
+             -> IO [ListResult]
 listVersions av lt criteria = case lt of
  Just t -> do
-    -- get versions from GHCupDownloads
-    let avTools = availableToolVersions av t
-    lr <- filter' <$> forM (Map.toList avTools) (liftIO . toListResult t)
-
-    case t of
-      -- append stray GHCs
-      GHC -> do
-        slr <- strayGHCs avTools
-        pure $ (sort (slr ++ lr))
-      _ -> pure lr
+    filter' <$> forM (availableToolVersions av t) (toListResult t)
  Nothing -> do
    ghcvers   <- listVersions av (Just GHC) criteria
    cabalvers <- listVersions av (Just Cabal) criteria
@@ -338,75 +331,21 @@ listVersions av lt criteria = case lt of
    pure (ghcvers <> cabalvers <> ghcupvers)

 where
-  strayGHCs :: (MonadThrow m, MonadLogger m, MonadIO m)
-            => Map.Map Version [Tag]
-            -> m [ListResult]
-  strayGHCs avTools = do
-    ghcs <- getInstalledGHCs
-    fmap catMaybes $ forM ghcs $ \case
-      Right tver@GHCTargetVersion{ _tvTarget = Nothing, .. } -> do
-        case Map.lookup _tvVersion avTools of
-          Just _  -> pure Nothing
-          Nothing -> do
-            lSet    <- fmap (maybe False (\(GHCTargetVersion _ v ) -> v == _tvVersion)) $ ghcSet Nothing
-            fromSrc <- liftIO $ ghcSrcInstalled tver
-            pure $ Just $ ListResult
-              { lTool      = GHC
-              , lVer       = _tvVersion
-              , lCross     = Nothing
-              , lTag       = []
-              , lInstalled = True
-              , lStray     = maybe True (const False) (Map.lookup _tvVersion avTools)
-              , ..
-              }
-      Right tver@GHCTargetVersion{ .. } -> do
-        lSet    <- fmap (maybe False (\(GHCTargetVersion _ v ) -> v == _tvVersion)) $ ghcSet _tvTarget
-        fromSrc <- liftIO $ ghcSrcInstalled tver
-        pure $ Just $ ListResult
-          { lTool      = GHC
-          , lVer       = _tvVersion
-          , lCross     = _tvTarget
-          , lTag       = []
-          , lInstalled = True
-          , lStray     = True -- NOTE: cross currently cannot be installed via bindist
-          , ..
-          }
-      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 :: Tool -> (Version, [Tag]) -> IO ListResult
  toListResult t (v, tags) = case t of
    GHC -> do
-      let tver = mkTVer v
-      lSet       <- fmap (maybe False (\(GHCTargetVersion _ v') -> v' == v)) $ ghcSet Nothing
-      lInstalled <- ghcInstalled tver
-      fromSrc    <- ghcSrcInstalled tver
-      pure ListResult { lVer = v, lCross = Nothing , lTag = tags, lTool = t, lStray = False, .. }
+      lSet       <- fmap (maybe False (== v)) $ ghcSet
+      lInstalled <- ghcInstalled v
+      fromSrc    <- ghcSrcInstalled v
+      pure ListResult { lVer = v, lTag = tags, lTool = t, .. }
    Cabal -> do
      lSet <- fmap (== v) $ cabalSet
      let lInstalled = lSet
-      pure ListResult { lVer    = v
-                      , lCross  = Nothing
-                      , lTag    = tags
-                      , lTool   = t
-                      , fromSrc = False
-                      , lStray  = False
-                      , ..
-                      }
+      pure ListResult { lVer = v, lTag = tags, lTool = t, fromSrc = False, .. }
    GHCup -> do
      let lSet       = prettyPVP ghcUpVer == prettyVer v
      let lInstalled = lSet
-      pure ListResult { lVer    = v
-                      , lTag    = tags
-                      , lCross  = Nothing
-                      , lTool   = t
-                      , fromSrc = False
-                      , lStray  = False
-                      , ..
-                      }
+      pure ListResult { lVer = v, lTag = tags, lTool = t, fromSrc = False, .. }


  filter' :: [ListResult] -> [ListResult]
@@ -424,10 +363,10 @@ listVersions av lt criteria = case lt of

 -- | This function may throw and crash in various ways.
 rmGHCVer :: (MonadThrow m, MonadLogger m, MonadIO m, MonadFail m)
-         => GHCTargetVersion
+         => Version
         -> Excepts '[NotInstalled] m ()
 rmGHCVer ver = do
-  isSetGHC <- fmap (maybe False (== ver)) $ ghcSet (_tvTarget ver)
+  isSetGHC <- fmap (maybe False (== ver)) $ ghcSet
  dir      <- liftIO $ ghcupGHCDir ver
  let d' = toFilePath dir
  exists <- liftIO $ doesDirectoryExist dir
@@ -438,7 +377,7 @@ rmGHCVer ver = do
      -- this isn't atomic, order matters
      when isSetGHC $ do
        lift $ $(logInfo) [i|Removing ghc symlinks|]
-        liftE $ rmPlain (_tvTarget ver)
+        liftE $ rmPlain ver

      lift $ $(logInfo) [i|Removing directory recursively: #{d'}|]
      liftIO $ deleteDirRecursive dir
@@ -450,15 +389,15 @@ rmGHCVer ver = do
      -- first remove
      lift $ rmMajorSymlinks ver
      -- then fix them (e.g. with an earlier version)
-      (mj, mi) <- getMajorMinorV (_tvVersion ver)
-      getGHCForMajor mj mi (_tvTarget ver) >>= mapM_ (\v -> liftE $ setGHC v SetGHC_XY)
+      (mj, mi) <- getGHCMajor ver
+      getGHCForMajor mj mi >>= mapM_ (\v -> liftE $ setGHC v SetGHC_XY)

      liftIO
        $   ghcupBaseDir
        >>= hideError doesNotExistErrorType
        .   deleteFile
        .   (</> [rel|share|])
-    else throwE (NotInstalled GHC (ver ^. tvVersion % to prettyVer))
+    else throwE (NotInstalled GHC ver)



@@ -499,12 +438,11 @@ compileGHC :: ( MonadMask m
              , MonadFail m
              )
           => GHCupDownloads
-           -> GHCTargetVersion           -- ^ version to install
+           -> Version                    -- ^ version to install
           -> Either Version (Path Abs)  -- ^ version to bootstrap with
           -> Maybe Int                  -- ^ jobs
           -> Maybe (Path Abs)           -- ^ build config
-           -> Maybe (Path Abs)           -- ^ patch directory
-           -> [Text]                     -- ^ additional args to ./configure
+           -> Maybe (Path Abs)
           -> Excepts
                '[ AlreadyInstalled
                 , BuildFailed
@@ -521,15 +459,13 @@ compileGHC :: ( MonadMask m
                 ]
                m
                ()
-compileGHC dls tver bstrap jobs mbuildConfig patchdir aargs = do
+compileGHC dls tver bstrap jobs mbuildConfig patchdir = do
  lift $ $(logDebug) [i|Requested to compile: #{tver} with #{bstrap}|]
-  whenM (liftIO $ ghcInstalled tver)
-        (throwE $ AlreadyInstalled GHC (tver ^. tvVersion))
+  whenM (liftIO $ toolAlreadyInstalled GHC tver)
+        (throwE $ AlreadyInstalled GHC tver)

  -- download source tarball
-  dlInfo <-
-    preview (ix GHC % ix (tver ^. tvVersion) % viSourceDL % _Just) dls
-      ?? NoDownload
+  dlInfo    <- preview (ix GHC % ix tver % viSourceDL % _Just) dls ?? NoDownload
  dl        <- liftE $ downloadCached dlInfo Nothing

  -- unpack
@@ -544,29 +480,32 @@ compileGHC dls tver bstrap jobs mbuildConfig patchdir aargs = do
  let workdir = maybe id (flip (</>)) (view dlSubdir dlInfo) $ tmpUnpack
  ghcdir <- liftIO $ ghcupGHCDir tver

-  liftE $ runBuildAction
-    tmpUnpack
-    (Just ghcdir)
-    (compile bghc ghcdir workdir >> markSrcBuilt ghcdir workdir)
+  -- Be careful about cleanup. We must catch both pure exceptions
+  -- as well as async ones.
+  flip onException
+       (liftIO $ hideError doesNotExistErrorType $ deleteDirRecursive ghcdir)
+    $ catchAllE
+        (\es ->
+          liftIO (hideError doesNotExistErrorType $ deleteDirRecursive ghcdir)
+            >> throwE (BuildFailed workdir es)
+        )
+    $ compile bghc ghcdir workdir
+  markSrcBuilt ghcdir workdir
+
+  -- only clean up dir if the build succeeded
+  liftIO $ deleteDirRecursive tmpUnpack

  reThrowAll GHCupSetError $ postGHCInstall tver
  pure ()

 where
-  defaultConf = case _tvTarget tver of
-                  Nothing -> [s|
+  defaultConf = [s|
 V=0
 BUILD_MAN = NO
 BUILD_SPHINX_HTML = NO
 BUILD_SPHINX_PDF = NO
-HADDOCK_DOCS = YES|]
-                  Just _ -> [s|
-V=0
-BUILD_MAN = NO
-BUILD_SPHINX_HTML = NO
-BUILD_SPHINX_PDF = NO
-HADDOCK_DOCS = NO
-Stage1Only = YES|]
+HADDOCK_DOCS = YES
+GhcWithLlvmCodeGen = YES|]

  compile :: (MonadCatch m, MonadLogger m, MonadIO m)
          => Either (Path Rel) (Path Abs)
@@ -574,7 +513,6 @@ Stage1Only = YES|]
          -> Path Abs
          -> Excepts
               '[ FileDoesNotExistError
-                , InvalidBuildConfig
                , PatchFailed
                , ProcessError
                , NotFoundInPATH
@@ -583,14 +521,14 @@ Stage1Only = YES|]
               ()
  compile bghc ghcdir workdir = do
    lift $ $(logInfo) [i|configuring build|]
-    liftE $ checkBuildConfig

    forM_ patchdir $ \dir -> liftE $ applyPatches dir workdir

-    cEnv <- liftIO $ getEnvironment
+    -- force ld.bfd for build (others seem to misbehave, like lld from FreeBSD)
+    newEnv <- addToCurrentEnv [("LD", "ld.bfd")]

    if
-      | (_tvVersion tver) >= [vver|8.8.0|] -> do
+      | tver >= [vver|8.8.0|] -> do
        bghcPath <- case bghc of
          Right ghc' -> pure ghc'
          Left  bver -> do
@@ -599,32 +537,20 @@ Stage1Only = YES|]
        lEM $ liftIO $ execLogged
          "./configure"
          False
-          (  ["--prefix=" <> toFilePath ghcdir]
-          ++ (maybe mempty
-                    (\x -> ["--target=" <> E.encodeUtf8 x])
-                    (_tvTarget tver)
-             )
-          ++ fmap E.encodeUtf8 aargs
-          )
+          ["--prefix=" <> toFilePath ghcdir]
          [rel|ghc-conf|]
          (Just workdir)
-          (Just (("GHC", toFilePath bghcPath) : cEnv))
+          (Just (("GHC", toFilePath bghcPath) : newEnv))
      | otherwise -> do
        lEM $ liftIO $ execLogged
          "./configure"
          False
-          (  [ "--prefix=" <> toFilePath ghcdir
-             , "--with-ghc=" <> either toFilePath toFilePath bghc
-             ]
-          ++ (maybe mempty
-                    (\x -> ["--target=" <> E.encodeUtf8 x])
-                    (_tvTarget tver)
-             )
-          ++ fmap E.encodeUtf8 aargs
-          )
+          [ "--prefix=" <> toFilePath ghcdir
+          , "--with-ghc=" <> either toFilePath toFilePath bghc
+          ]
          [rel|ghc-conf|]
          (Just workdir)
-          (Just cEnv)
+          (Just newEnv)

    case mbuildConfig of
      Just bc -> liftIOException
@@ -647,30 +573,6 @@ Stage1Only = YES|]

  build_mk workdir = workdir </> [rel|mk/build.mk|]

-  checkBuildConfig :: (MonadCatch m, MonadIO m)
-                   => Excepts
-                        '[FileDoesNotExistError , InvalidBuildConfig]
-                        m
-                        ()
-  checkBuildConfig = do
-    c <- case mbuildConfig of
-      Just bc -> do
-        BL.toStrict <$> liftIOException doesNotExistErrorType
-                                        (FileDoesNotExistError $ toFilePath bc)
-                                        (liftIO $ readFile bc)
-      Nothing -> pure defaultConf
-    let lines' = fmap T.strip . T.lines $ decUTF8Safe c
-
-   -- for cross, we need Stage1Only
-    case _tvTarget tver of
-      Just _ -> when (not $ elem "Stage1Only = YES" lines') $ throwE
-        (InvalidBuildConfig
-          [s|Cross compiling needs to be a Stage1 build, add "Stage1Only = YES" to your config!|]
-        )
-      Nothing -> pure ()
-
-
-

 compileCabal :: ( MonadReader Settings m
                , MonadResource m
@@ -711,11 +613,7 @@ compileCabal dls tver bghc jobs patchdir = do

  let workdir = maybe id (flip (</>)) (view dlSubdir dlInfo) $ tmpUnpack

-
-  liftE $ runBuildAction
-    tmpUnpack
-    Nothing
-    (compile workdir)
+  reThrowAll (BuildFailed workdir) $ compile workdir

  -- only clean up dir if the build succeeded
  liftIO $ deleteDirRecursive tmpUnpack
@@ -830,12 +728,12 @@ upgradeGHCup dls mtarget force = do
 -- | Creates ghc-x.y.z and ghc-x.y symlinks. This is used for
 -- both installing from source and bindist.
 postGHCInstall :: (MonadLogger m, MonadThrow m, MonadFail m, MonadIO m)
-               => GHCTargetVersion
+               => Version
               -> Excepts '[NotInstalled] m ()
-postGHCInstall ver@GHCTargetVersion{..} = do
+postGHCInstall ver = do
  void $ liftE $ setGHC ver SetGHC_XYZ

  -- Create ghc-x.y symlinks. This may not be the current
  -- version, create it regardless.
-  (mj, mi) <- getMajorMinorV _tvVersion
-  getGHCForMajor mj mi _tvTarget >>= mapM_ (\v -> liftE $ setGHC v SetGHC_XY)
+  (mj, mi) <- liftIO $ getGHCMajor ver
+  getGHCForMajor mj mi >>= mapM_ (\v -> liftE $ setGHC v SetGHC_XY)
--- a/lib/GHCup/Errors.hs
+++ b/lib/GHCup/Errors.hs
@@ -64,7 +64,7 @@ data AlreadyInstalled = AlreadyInstalled Tool Version

 -- | The tool is not installed. Some operations rely on a tool
 -- to be installed (such as setting the current GHC version).
-data NotInstalled = NotInstalled Tool Text
+data NotInstalled = NotInstalled Tool Version
  deriving Show

 -- | An executable was expected to be in PATH, but was not found.
@@ -104,9 +104,6 @@ data PatchFailed = PatchFailed
 data NoToolRequirements = NoToolRequirements
  deriving Show

-data InvalidBuildConfig = InvalidBuildConfig Text
-  deriving Show
-

    -------------------------
    --[ High-level errors ]--
--- a/lib/GHCup/Types.hs
+++ b/lib/GHCup/Types.hs
@@ -1,5 +1,4 @@
-{-# LANGUAGE DeriveGeneric     #-}
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE DeriveGeneric #-}

 module GHCup.Types where

@@ -82,9 +81,7 @@ data VersionInfo = VersionInfo
 -- | A tag. These are currently attached to a version of a tool.
 data Tag = Latest
         | Recommended
-         | Base PVP
-         | UnknownTag String  -- ^ used for upwardscompat
-         deriving (Ord, Eq, Show) -- FIXME: manual JSON instance
+         deriving (Ord, Eq, Show)


 data Architecture = A_64
@@ -143,17 +140,10 @@ data URLSource = GHCupURL
 data Settings = Settings
  { cache    :: Bool
  , noVerify :: Bool
-  , keepDirs :: KeepDirs
  }
  deriving Show


-data KeepDirs = Always
-              | Errors
-              | Never
-  deriving (Eq, Show, Ord)
-
-
 data DebugInfo = DebugInfo
  { diBaseDir  :: Path Abs
  , diBinDir   :: Path Abs
@@ -183,23 +173,3 @@ data PlatformRequest = PlatformRequest
  , _rVersion  :: Maybe Versioning
  }
  deriving (Eq, Show)
-
-
-- | A GHC identified by the target platform triple
-- and the version.
-data GHCTargetVersion = GHCTargetVersion
-  { _tvTarget  :: Maybe Text
-  , _tvVersion :: Version
-  }
-  deriving (Ord, Eq, Show)
-
-
-mkTVer :: Version -> GHCTargetVersion
-mkTVer = GHCTargetVersion Nothing
-
-
-- | Assembles a path of the form: <target-triple>-<version>
-prettyTVer :: GHCTargetVersion -> Text
-prettyTVer (GHCTargetVersion (Just t) v') = t <> "-" <> prettyVer v'
-prettyTVer (GHCTargetVersion Nothing  v') = prettyVer v'
-
--- a/lib/GHCup/Types/JSON.hs
+++ b/lib/GHCup/Types/JSON.hs
@@ -37,24 +37,11 @@ deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''Tool
 deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''VSep
 deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''VUnit
 deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''VersionInfo
+deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''Tag
 deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''DownloadInfo
 deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''GHCupInfo
 deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''Requirements

-instance ToJSON Tag where
-  toJSON Latest             = String "Latest"
-  toJSON Recommended        = String "Recommended"
-  toJSON (Base       pvp'') = String ("base-" <> prettyPVP pvp'')
-  toJSON (UnknownTag x    ) = String (T.pack x)
-
-instance FromJSON Tag where
-  parseJSON = withText "Tag" $ \t -> case T.unpack t of
-    "Latest"                             -> pure Latest
-    "Recommended"                        -> pure Recommended
-    ('b' : 'a' : 's' : 'e' : '-' : ver') -> case pvp (T.pack ver') of
-      Right x -> pure $ Base x
-      Left  e -> fail . show $ e
-    x -> pure (UnknownTag x)

 instance ToJSON URI where
  toJSON = toJSON . decUTF8Safe . serializeURIRef'
@@ -156,14 +143,6 @@ instance FromJSONKey Version where
    Right x -> pure x
    Left  e -> fail $ "Failure in Version (FromJSONKey)" <> show e

-instance ToJSON PVP where
-  toJSON = toJSON . prettyPVP
-
-instance FromJSON PVP where
-  parseJSON = withText "PVP" $ \t -> case pvp t of
-    Right x -> pure x
-    Left  e -> fail $ "Failure in PVP (FromJSON)" <> show e
-
 instance ToJSONKey Tool where
  toJSONKey = genericToJSONKey defaultJSONKeyOptions

--- a/lib/GHCup/Types/Optics.hs
+++ b/lib/GHCup/Types/Optics.hs
@@ -19,8 +19,6 @@ makeLenses ''DownloadInfo
 makeLenses ''Tag
 makeLenses ''VersionInfo

-makeLenses ''GHCTargetVersion
-
 makeLenses ''GHCupInfo

 uriSchemeL' :: Lens' (URIRef Absolute) Scheme
--- a/lib/GHCup/Utils.hs
+++ b/lib/GHCup/Utils.hs
@@ -4,7 +4,6 @@
 {-# LANGUAGE OverloadedStrings     #-}
 {-# LANGUAGE QuasiQuotes           #-}
 {-# LANGUAGE TemplateHaskell       #-}
-{-# LANGUAGE ViewPatterns          #-}


 module GHCup.Utils
@@ -20,9 +19,7 @@ import           GHCup.Types.Optics
 import           GHCup.Types.JSON               ( )
 import           GHCup.Utils.Dirs
 import           GHCup.Utils.File
-import           GHCup.Utils.MegaParsec
 import           GHCup.Utils.Prelude
-import           GHCup.Utils.String.QQ

 import           Control.Applicative
 import           Control.Exception.Safe
@@ -32,12 +29,11 @@ import           Control.Monad.Fail             ( MonadFail )
 #endif
 import           Control.Monad.Logger
 import           Control.Monad.Reader
+import           Data.Attoparsec.ByteString
 import           Data.ByteString                ( ByteString )
-import           Data.Either
 import           Data.List
 import           Data.Maybe
 import           Data.String.Interpolate
-import           Data.Text                      ( Text )
 import           Data.Versions
 import           Data.Word8
 import           GHC.IO.Exception
@@ -55,7 +51,6 @@ import           System.Posix.FilePath          ( getSearchPath
                                                , takeFileName
                                                )
 import           System.Posix.Files.ByteString  ( readSymbolicLink )
-import           Text.Regex.Posix
 import           URI.ByteString

 import qualified Codec.Archive.Tar             as Tar
@@ -65,7 +60,7 @@ import qualified Codec.Compression.Lzma        as Lzma
 import qualified Data.ByteString               as B
 import qualified Data.Map.Strict               as Map
 import qualified Data.Text.Encoding            as E
-import qualified Text.Megaparsec               as MP
+



@@ -78,69 +73,64 @@ import qualified Text.Megaparsec               as MP

 -- | The symlink destination of a ghc tool.
 ghcLinkDestination :: ByteString -- ^ the tool, such as 'ghc', 'haddock' etc.
-                   -> GHCTargetVersion
+                   -> Version
                   -> ByteString
-ghcLinkDestination tool ver =
-  "../ghc/" <> E.encodeUtf8 (prettyTVer ver) <> "/bin/" <> tool
+ghcLinkDestination tool ver = "../ghc/" <> verToBS ver <> "/bin/" <> tool
+
+
+-- | Extract the version part of the result of `ghcLinkDestination`.
+ghcLinkVersion :: MonadThrow m => ByteString -> m Version
+ghcLinkVersion = either (throwM . ParseError) pure . parseOnly parser
+ where
+  parser    = string "../ghc/" *> verParser <* string "/bin/ghc"
+  verParser = many1' (notWord8 _slash) >>= \t ->
+    case
+        version (decUTF8Safe $ B.pack t)
+      of
+        Left  e -> fail $ show e
+        Right r -> pure r


 -- e.g. ghc-8.6.5
-rmMinorSymlinks :: (MonadIO m, MonadLogger m) => GHCTargetVersion -> m ()
-rmMinorSymlinks GHCTargetVersion {..} = do
+rmMinorSymlinks :: (MonadIO m, MonadLogger m) => Version -> m ()
+rmMinorSymlinks ver = do
  bindir <- liftIO $ ghcupBinDir
-
-  files  <- liftIO $ findFiles'
-    bindir
-    (  maybe mempty (\x -> MP.chunk (x <> "-")) _tvTarget
-    *> parseUntil1 (MP.chunk $ prettyVer _tvVersion)
-    *> (MP.chunk $ prettyVer _tvVersion)
-    *> MP.eof
-    )
-
-  forM_ files $ \f -> do
+  files  <- liftIO $ getDirsFiles' bindir
+  let myfiles =
+        filter (\x -> ("-" <> verToBS ver) `B.isSuffixOf` toFilePath x) files
+  forM_ myfiles $ \f -> do
    let fullF = (bindir </> f)
    $(logDebug) [i|rm -f #{toFilePath fullF}|]
    liftIO $ hideError doesNotExistErrorType $ deleteFile fullF

-
-- Removes the set ghc version for the given target, if any.
+-- E.g. ghc, if this version is the set one.
+-- This reads `ghcupGHCDir`.
 rmPlain :: (MonadLogger m, MonadThrow m, MonadFail m, MonadIO m)
-  => Maybe Text -- ^ target
+        => Version
        -> Excepts '[NotInstalled] m ()
-rmPlain target = do
-  mtv <- ghcSet target
-  forM_ mtv $ \tv -> do
-    files  <- liftE $ ghcToolFiles tv
-    bindir <- liftIO $ ghcupBinDir
-    forM_ files $ \f -> do
-      let fullF = (bindir </> f)
-      lift $ $(logDebug) [i|rm -f #{toFilePath fullF}|]
-      liftIO $ hideError doesNotExistErrorType $ deleteFile fullF
-    -- old ghcup
-    let hdc_file = (bindir </> [rel|haddock-ghc|])
-    lift $ $(logDebug) [i|rm -f #{toFilePath hdc_file}|]
-    liftIO $ hideError doesNotExistErrorType $ deleteFile hdc_file
-
+rmPlain ver = do
+  files  <- liftE $ ghcToolFiles ver
+  bindir <- liftIO $ ghcupBinDir
+  forM_ files $ \f -> do
+    let fullF = (bindir </> f)
+    lift $ $(logDebug) [i|rm -f #{toFilePath fullF}|]
+    liftIO $ hideError doesNotExistErrorType $ deleteFile fullF
+  -- old ghcup
+  let hdc_file = (bindir </> [rel|haddock-ghc|])
+  lift $ $(logDebug) [i|rm -f #{toFilePath hdc_file}|]
+  liftIO $ hideError doesNotExistErrorType $ deleteFile hdc_file

 -- e.g. ghc-8.6
-rmMajorSymlinks :: (MonadThrow m, MonadLogger m, MonadIO m)
-                => GHCTargetVersion
-                -> m ()
-rmMajorSymlinks GHCTargetVersion {..} = do
-  (mj, mi) <- getMajorMinorV _tvVersion
-  let v' = intToText mj <> "." <> intToText mi
+rmMajorSymlinks :: (MonadLogger m, MonadIO m) => Version -> m ()
+rmMajorSymlinks ver = do
+  (mj, mi) <- liftIO $ getGHCMajor ver
+  let v' = E.encodeUtf8 $ intToText mj <> "." <> intToText mi

  bindir <- liftIO ghcupBinDir

-  files  <- liftIO $ findFiles'
-    bindir
-    (  maybe mempty (\x -> MP.chunk (x <> "-")) _tvTarget
-    *> parseUntil1 (MP.chunk v')
-    *> MP.chunk v'
-    *> MP.eof
-    )
-
-  forM_ files $ \f -> do
+  files  <- liftIO $ getDirsFiles' bindir
+  let myfiles = filter (\x -> ("-" <> v') `B.isSuffixOf` toFilePath x) files
+  forM_ myfiles $ \f -> do
    let fullF = (bindir </> f)
    $(logDebug) [i|rm -f #{toFilePath fullF}|]
    liftIO $ hideError doesNotExistErrorType $ deleteFile fullF
@@ -153,61 +143,33 @@ rmMajorSymlinks GHCTargetVersion {..} = do
    -----------------------------------


-ghcInstalled :: GHCTargetVersion -> IO Bool
+toolAlreadyInstalled :: Tool -> Version -> IO Bool
+toolAlreadyInstalled tool ver = case tool of
+  GHC   -> ghcInstalled ver
+  Cabal -> cabalInstalled ver
+  GHCup -> pure True
+
+
+ghcInstalled :: Version -> IO Bool
 ghcInstalled ver = do
  ghcdir <- ghcupGHCDir ver
  doesDirectoryExist ghcdir


-ghcSrcInstalled :: GHCTargetVersion -> IO Bool
+ghcSrcInstalled :: Version -> IO Bool
 ghcSrcInstalled ver = do
  ghcdir <- ghcupGHCDir ver
  doesFileExist (ghcdir </> ghcUpSrcBuiltFile)


-ghcSet :: (MonadThrow m, MonadIO m)
-       => Maybe Text   -- ^ the target of the GHC version, if any
-                       --  (e.g. armv7-unknown-linux-gnueabihf)
-       -> m (Maybe GHCTargetVersion)
-ghcSet mtarget = do
-  ghc    <- parseRel $ E.encodeUtf8 (maybe "ghc" (<> "-ghc") mtarget)
-  ghcBin <- (</> ghc) <$> liftIO ghcupBinDir
+ghcSet :: (MonadIO m, MonadThrow m) => m (Maybe Version)
+ghcSet = do
+  ghcBin <- (</> [rel|ghc|]) <$> liftIO ghcupBinDir

  -- link destination is of the form ../ghc/<ver>/bin/ghc
-  -- for old ghcup, it is ../ghc/<ver>/bin/ghc-<ver>
  liftIO $ handleIO' NoSuchThing (\_ -> pure $ Nothing) $ do
    link <- readSymbolicLink $ toFilePath ghcBin
    Just <$> ghcLinkVersion link
- where
-  ghcLinkVersion :: MonadThrow m => ByteString -> m GHCTargetVersion
-  ghcLinkVersion bs = do
-    t <- throwEither $ E.decodeUtf8' bs
-    throwEither $ MP.parse parser "" t
-   where
-    parser =
-      MP.chunk "../ghc/"
-        *> (do
-             r    <- parseUntil1 (MP.chunk "/")
-             rest <- MP.getInput
-             MP.setInput r
-             x <- ghcTargetVerP
-             MP.setInput rest
-             pure x
-           )
-        <* MP.chunk "/"
-        <* MP.takeRest
-        <* MP.eof
-
-
-- | Get all installed GHCs by reading ~/.ghcup/ghc/<dir>.
-- If a dir cannot be parsed, returns left.
-getInstalledGHCs :: MonadIO m => m [Either (Path Rel) GHCTargetVersion]
-getInstalledGHCs = do
-  ghcdir <- liftIO $ ghcupGHCBaseDir
-  fs     <- liftIO $ hideErrorDef [NoSuchThing] [] $ getDirsFiles' ghcdir
-  forM fs $ \f -> case parseGHCupGHCDir f of
-    Right r -> pure $ Right r
-    Left  _ -> pure $ Left f


 cabalInstalled :: Version -> IO Bool
@@ -231,49 +193,33 @@ cabalSet = do
    -----------------------------------------


-getMajorMinorV :: MonadThrow m => Version -> m (Int, Int)
-getMajorMinorV Version {..} = case _vChunks of
-  ([Digits x] : [Digits y] : _) -> pure (fromIntegral x, fromIntegral y)
-  _ -> throwM $ ParseError "Could not parse X.Y from version"
-
-
-matchMajor :: Version -> Int -> Int -> Bool
-matchMajor v' major' minor' = case getMajorMinorV v' of
-  Just (x, y) -> x == major' && y == minor'
-  Nothing     -> False
+-- | We assume GHC is in semver format. I hope it is.
+getGHCMajor :: MonadThrow m => Version -> m (Int, Int)
+getGHCMajor ver = do
+  SemVer {..} <- throwEither (semver $ prettyVer ver)
+  pure (fromIntegral _svMajor, fromIntegral _svMinor)


 -- | Get the latest installed full GHC version that satisfies X.Y.
 -- This reads `ghcupGHCBaseDir`.
 getGHCForMajor :: (MonadIO m, MonadThrow m)
-               => Int        -- ^ major version component
-               -> Int        -- ^ minor version component
-               -> Maybe Text -- ^ the target triple
-               -> m (Maybe GHCTargetVersion)
-getGHCForMajor major' minor' mt = do
-  ghcs <- rights <$> getInstalledGHCs
-
-  pure
+               => Int -- ^ major version component
+               -> Int -- ^ minor version component
+               -> m (Maybe Version)
+getGHCForMajor major' minor' = do
+  p       <- liftIO $ ghcupGHCBaseDir
+  ghcs    <- liftIO $ getDirsFiles' p
+  semvers <- forM ghcs $ \ghc ->
+    throwEither . semver =<< (throwEither . E.decodeUtf8' . toFilePath $ ghc)
+  mapM (throwEither . version)
+    . fmap prettySemVer
    . lastMay
-    . sortBy (\x y -> compare (_tvVersion x) (_tvVersion y))
+    . sort
    . filter
-        (\GHCTargetVersion {..} ->
-          _tvTarget == mt && matchMajor _tvVersion major' minor'
+        (\SemVer {..} ->
+          fromIntegral _svMajor == major' && fromIntegral _svMinor == minor'
        )
-    $ ghcs
-
-
-- | Get the latest available ghc for X.Y major version.
-getLatestGHCFor :: Int -- ^ major version component
-                -> Int -- ^ minor version component
-                -> GHCupDownloads
-                -> Maybe Version
-getLatestGHCFor major' minor' dls = do
-  join
-    . fmap (lastMay . filter (\v -> matchMajor v major' minor'))
-    . preview (ix GHC % to Map.keys)
-    $ dls
-
+    $ semvers



@@ -319,8 +265,7 @@ unpackToDir dest av = do

 -- | Get the tool version that has this tag. If multiple have it,
 -- picks the greatest version.
-getTagged :: Tag
-          -> AffineFold (Map.Map Version VersionInfo) (Version, VersionInfo)
+getTagged :: Tag -> AffineFold (Map.Map Version VersionInfo) (Version, VersionInfo)
 getTagged tag =
  ( to (Map.filter (\VersionInfo {..} -> elem tag _viTags))
  % to Map.toDescList
@@ -334,12 +279,6 @@ getRecommended :: GHCupDownloads -> Tool -> Maybe Version
 getRecommended av tool = headOf (ix tool % getTagged Recommended % to fst) $ av


-- | Gets the latest GHC with a given base version.
-getLatestBaseVersion :: GHCupDownloads -> PVP -> Maybe Version
-getLatestBaseVersion av pvpVer =
-  headOf (ix GHC % getTagged (Base pvpVer) % to fst) av
-
-

    -----------------------
    --[ Settings Getter ]--
@@ -363,12 +302,12 @@ urlBaseName = parseRel . snd . B.breakEnd (== _slash) . urlDecode False


 -- Get tool files from '~/.ghcup/bin/ghc/<ver>/bin/*'
-- while ignoring *-<ver> symlinks and accounting for cross triple prefix.
+-- while ignoring *-<ver> symlinks.
 --
 -- Returns unversioned relative files, e.g.:
 --   ["hsc2hs","haddock","hpc","runhaskell","ghc","ghc-pkg","ghci","runghc","hp2ps"]
 ghcToolFiles :: (MonadThrow m, MonadFail m, MonadIO m)
-             => GHCTargetVersion
+             => Version
             -> Excepts '[NotInstalled] m [Path Rel]
 ghcToolFiles ver = do
  ghcdir <- liftIO $ ghcupGHCDir ver
@@ -376,28 +315,18 @@ ghcToolFiles ver = do

  -- fail if ghc is not installed
  whenM (fmap not $ liftIO $ doesDirectoryExist ghcdir)
-        (throwE (NotInstalled GHC (prettyTVer ver)))
+        (throwE (NotInstalled GHC ver))

-  files    <- liftIO $ getDirsFiles' bindir
+  files         <- liftIO $ getDirsFiles' bindir
  -- figure out the <ver> suffix, because this might not be `Version` for
  -- alpha/rc releases, but x.y.a.somedate.
-
-  -- for cross, this won't be "ghc", but e.g.
-  -- "armv7-unknown-linux-gnueabihf-ghc"
-  [ghcbin] <- liftIO $ findFiles
-    bindir
-    (makeRegexOpts compExtended
-                   execBlank
-                   ([s|^([a-zA-Z0-9_-]*[a-zA-Z0-9_]-)?ghc$|] :: ByteString)
-    )
-
  (Just symver) <-
-    (B.stripPrefix (toFilePath ghcbin <> "-") . takeFileName)
-      <$> (liftIO $ readSymbolicLink $ toFilePath (bindir </> ghcbin))
+    (B.stripPrefix "ghc-" . takeFileName)
+      <$> (liftIO $ readSymbolicLink $ toFilePath (bindir </> [rel|ghc|]))
  when (B.null symver)
       (throwIO $ userError $ "Fatal: ghc symlink target is broken")

-  pure . filter (\x -> not $ symver `B.isSuffixOf` toFilePath x) $ files
+  pure $ filter (\x -> not $ symver `B.isSuffixOf` toFilePath x) files


 -- | This file, when residing in ~/.ghcup/ghc/<ver>/ signals that
@@ -448,42 +377,10 @@ darwinNotarization _ _ = pure $ Right ()
 getChangeLog :: GHCupDownloads -> Tool -> Either Version Tag -> Maybe URI
 getChangeLog dls tool (Left v') =
  preview (ix tool % ix v' % viChangeLog % _Just) dls
-getChangeLog dls tool (Right tag) =
-  preview (ix tool % getTagged tag % to snd % viChangeLog % _Just) dls
-
-
-- | Execute a build action while potentially cleaning up:
--
--   1. the build directory, depending on the KeepDirs setting
--   2. the install destination, depending on whether the build failed
-runBuildAction :: (Show (V e), MonadReader Settings m, MonadIO m, MonadMask m)
-               => Path Abs          -- ^ build directory
-               -> Maybe (Path Abs)  -- ^ install location (e.g. for GHC)
-               -> Excepts e m ()
-               -> Excepts '[BuildFailed] m ()
-runBuildAction bdir instdir action = do
-  Settings {..} <- lift ask
-  flip
-      onException
-      (do
-        forM_ instdir $ \dir ->
-          liftIO $ hideError doesNotExistErrorType $ deleteDirRecursive dir
-        when (keepDirs == Never)
-          $ liftIO
-          $ hideError doesNotExistErrorType
-          $ deleteDirRecursive bdir
-      )
-    $ catchAllE
-        (\es -> do
-          forM_ instdir $ \dir ->
-            liftIO $ hideError doesNotExistErrorType $ deleteDirRecursive dir
-          when (keepDirs == Never)
-            $ liftIO
-            $ hideError doesNotExistErrorType
-            $ deleteDirRecursive bdir
-          throwE (BuildFailed bdir es)
-        )
-    $ action
-
-  when (keepDirs == Never || keepDirs == Errors) $ liftIO $ deleteDirRecursive
-    bdir
+getChangeLog dls tool (Right tag) = preview
+  ( ix tool
+  % getTagged tag
+  % to snd
+  % viChangeLog
+  % _Just
+  ) dls
--- a/lib/GHCup/Utils/Dirs.hs
+++ b/lib/GHCup/Utils/Dirs.hs
@@ -1,13 +1,10 @@
 {-# LANGUAGE OverloadedStrings     #-}
 {-# LANGUAGE QuasiQuotes           #-}
-{-# LANGUAGE ViewPatterns          #-}

 module GHCup.Utils.Dirs where


-import           GHCup.Types
 import           GHCup.Types.JSON               ( )
-import           GHCup.Utils.MegaParsec
 import           GHCup.Utils.Prelude

 import           Control.Applicative
@@ -16,6 +13,7 @@ import           Control.Monad
 import           Control.Monad.Reader
 import           Control.Monad.Trans.Resource
 import           Data.Maybe
+import           Data.Versions
 import           HPath
 import           HPath.IO
 import           Optics
@@ -29,10 +27,8 @@ import           System.Posix.Env.ByteString    ( getEnv
 import           System.Posix.Temp.ByteString   ( mkdtemp )

 import qualified Data.ByteString.UTF8          as UTF8
-import qualified Data.Text.Encoding            as E
 import qualified System.Posix.FilePath         as FP
 import qualified System.Posix.User             as PU
-import qualified Text.Megaparsec               as MP



@@ -41,7 +37,6 @@ import qualified Text.Megaparsec               as MP
    -------------------------


-- | ~/.ghcup by default
 ghcupBaseDir :: IO (Path Abs)
 ghcupBaseDir = do
  bdir <- getEnv "GHCUP_INSTALL_BASE_PREFIX" >>= \case
@@ -49,30 +44,16 @@ ghcupBaseDir = do
    Nothing -> liftIO getHomeDirectory
  pure (bdir </> [rel|.ghcup|])

-
-- | ~/.ghcup/ghc by default.
 ghcupGHCBaseDir :: IO (Path Abs)
 ghcupGHCBaseDir = ghcupBaseDir <&> (</> [rel|ghc|])

-
-- | Gets '~/.ghcup/ghc/<ghcupGHCDir>'.
-- The dir may be of the form
--   * armv7-unknown-linux-gnueabihf-8.8.3
--   * 8.8.4
-ghcupGHCDir :: GHCTargetVersion -> IO (Path Abs)
+ghcupGHCDir :: Version -> IO (Path Abs)
 ghcupGHCDir ver = do
  ghcbasedir <- ghcupGHCBaseDir
-  verdir     <- parseRel $ E.encodeUtf8 (prettyTVer ver)
+  verdir     <- parseRel (verToBS ver)
  pure (ghcbasedir </> verdir)


-- | See 'ghcupToolParser'.
-parseGHCupGHCDir :: MonadThrow m => Path Rel -> m GHCTargetVersion
-parseGHCupGHCDir (toFilePath -> f) = do
-  fp <- throwEither $ E.decodeUtf8' f
-  throwEither $ MP.parse ghcTargetVerP "" fp
-
-
 ghcupBinDir :: IO (Path Abs)
 ghcupBinDir = ghcupBaseDir <&> (</> [rel|bin|])

--- a/lib/GHCup/Utils/File.hs
+++ b/lib/GHCup/Utils/File.hs
@@ -18,8 +18,6 @@ import           Data.Foldable
 import           Data.Functor
 import           Data.IORef
 import           Data.Maybe
-import           Data.Text                      ( Text )
-import           Data.Void
 import           GHC.Foreign                    ( peekCStringLen )
 import           GHC.IO.Encoding                ( getLocaleEncoding )
 import           GHC.IO.Exception
@@ -41,12 +39,10 @@ import "unix"    System.Posix.IO.ByteString
                                         hiding ( openFd )
 import           System.Posix.Process           ( ProcessStatus(..) )
 import           System.Posix.Types
-import           Text.Regex.Posix


 import qualified Control.Exception             as EX
 import qualified Data.Text                     as T
-import qualified Data.Text.Encoding            as E
 import qualified System.Posix.Process.ByteString
                                               as SPPB
 import           Streamly.External.Posix.DirStream
@@ -55,14 +51,12 @@ import qualified Streamly.Internal.Memory.ArrayStream
 import qualified Streamly.FileSystem.Handle    as FH
 import qualified Streamly.Internal.Data.Unfold as SU
 import qualified Streamly.Prelude              as S
-import qualified Text.Megaparsec               as MP
 import qualified Data.ByteString               as BS
 import qualified Data.ByteString.Lazy          as L
 import qualified "unix-bytestring" System.Posix.IO.ByteString
                                               as SPIB


-
 -- | Bool signals whether the regions should be cleaned.
 data StopThread = StopThread Bool
  deriving Show
@@ -205,7 +199,6 @@ execLogged exe spath args lfile chdir env = do
    lineAction ref rs bs' = do
      modifyIORef' ref (swapRegs bs')
      regs <- readIORef ref
-      void $ SPIB.fdWrite fileFd (bs' <> "\n")
      forM (zip regs rs) $ \(bs, r) -> do
        setConsoleRegion r $ do
          w <- consoleWidth
@@ -217,6 +210,8 @@ execLogged exe spath args lfile chdir env = do
            . trim w
            . (\b -> "[ " <> toFilePath lfile <> " ] " <> b)
            $ bs
+        SPIB.fdWrite fileFd (bs <> "\n")
+

    swapRegs bs regs | length regs < size = regs ++ [bs]
                     | otherwise          = tail regs ++ [bs]
@@ -385,27 +380,3 @@ searchPath paths needle = go paths
    if p == toFilePath needle
      then isExecutable (basedir </> needle)
      else pure False
-
-
-findFiles :: Path Abs -> Regex -> IO [Path Rel]
-findFiles path regex = do
-  dirStream <- openDirStream (toFilePath path)
-  f         <-
-    (fmap . fmap) snd
-    . S.toList
-    . S.filter (\(_, p) -> match regex p)
-    $ dirContentsStream dirStream
-  pure $ join $ fmap parseRel f
-
-
-findFiles' :: Path Abs -> MP.Parsec Void Text () -> IO [Path Rel]
-findFiles' path parser = do
-  dirStream <- openDirStream (toFilePath path)
-  f         <-
-    (fmap . fmap) snd
-    . S.toList
-    . S.filter (\(_, p) -> case E.decodeUtf8' p of
-                             Left _ -> False
-                             Right p' -> isJust $ MP.parseMaybe parser p')
-    $ dirContentsStream dirStream
-  pure $ join $ fmap parseRel f
--- a/lib/GHCup/Utils/MegaParsec.hs
+++ b/lib/GHCup/Utils/MegaParsec.hs
@@ -1,87 +0,0 @@
-{-# LANGUAGE CPP                  #-}
-{-# LANGUAGE OverloadedStrings    #-}
-
-module GHCup.Utils.MegaParsec where
-
-import           GHCup.Types
-
-import           Control.Applicative
-import           Control.Monad
-#if !MIN_VERSION_base(4,13,0)
-import           Control.Monad.Fail             ( MonadFail )
-#endif
-import           Data.Functor
-import           Data.Maybe
-import           Data.Text                      ( Text )
-import           Data.Versions
-import           Data.Void
-
-import qualified Data.Text                     as T
-import qualified Text.Megaparsec               as MP
-
-
-choice' :: (MonadFail f, MP.MonadParsec e s f) => [f a] -> f a
-choice' []       = fail "Empty list"
-choice' [x     ] = x
-choice' (x : xs) = MP.try x <|> choice' xs
-
-
-parseUntil :: MP.Parsec Void Text a -> MP.Parsec Void Text Text
-parseUntil p = do
-  (MP.try (MP.lookAhead p) $> mempty)
-    <|> (do
-          c  <- T.singleton <$> MP.anySingle
-          c2 <- parseUntil p
-          pure (c `mappend` c2)
-        )
-
-parseUntil1 :: MP.Parsec Void Text a -> MP.Parsec Void Text Text
-parseUntil1 p = do
-  i1 <- MP.getOffset
-  t <- parseUntil p
-  i2 <- MP.getOffset
-  if i1 == i2 then fail "empty parse" else pure t
-
-
-
-- | Parses e.g.
--   * armv7-unknown-linux-gnueabihf-ghc
--   * armv7-unknown-linux-gnueabihf-ghci
-ghcTargetBinP :: Text -> MP.Parsec Void Text (Maybe Text, Text)
-ghcTargetBinP t =
-  (,)
-    <$> (   MP.try
-            (Just <$> (parseUntil1 (MP.chunk "-" *> MP.chunk t)) <* MP.chunk "-"
-            )
-        <|> (flip const Nothing <$> mempty)
-        )
-    <*> (MP.chunk t <* MP.eof)
-
-
-- | Extracts target triple and version from e.g.
--   * armv7-unknown-linux-gnueabihf-8.8.3
--   * armv7-unknown-linux-gnueabihf-8.8.3
-ghcTargetVerP :: MP.Parsec Void Text GHCTargetVersion
-ghcTargetVerP =
-  (\x y -> GHCTargetVersion x y)
-    <$> (MP.try (Just <$> (parseUntil1 (MP.chunk "-" *> verP)) <* MP.chunk "-")
-        <|> (flip const Nothing <$> mempty)
-        )
-    <*> (version' <* MP.eof)
- where
-  verP :: MP.Parsec Void Text Text
-  verP = do
-    v <- version'
-    let startsWithDigists =
-          and
-            . take 3
-            . join
-            . (fmap . fmap)
-                (\case
-                  (Digits _) -> True
-                  (Str    _) -> False
-                )
-            $ (_vChunks v)
-    if startsWithDigists && not (isJust (_vEpoch v))
-      then pure $ prettyVer v
-      else fail "Oh"
--- a/lib/GHCup/Utils/Prelude.hs
+++ b/lib/GHCup/Utils/Prelude.hs
@@ -218,12 +218,6 @@ throwEither a = case a of
  Right r -> pure r


-throwEither' :: (Exception a, MonadThrow m) => a -> Either x b -> m b
-throwEither' e eth = case eth of
-  Left  _ -> throwM e
-  Right r -> pure r
-
-
 verToBS :: Version -> ByteString
 verToBS = E.encodeUtf8 . prettyVer

--- a/lib/GHCup/Version.hs
+++ b/lib/GHCup/Version.hs
@@ -13,7 +13,7 @@ import qualified Data.Text                     as T

 -- | This reflects the API version of the JSON.
 ghcupURL :: URI
-ghcupURL = [uri|https://www.haskell.org/ghcup/data/ghcup-0.0.2.json|]
+ghcupURL = [uri|https://www.haskell.org/ghcup/data/ghcup-0.0.1.json|]

 ghcUpVer :: PVP
 ghcUpVer = [pver|0.1.4|]