Fix property tests

Add temp git ref to versions to fix CI
refactor: use upstream TH constructors
2023-10-13 18:08:16 +08:00 · 2023-10-13 17:52:39 +08:00 · 2023-10-13 17:35:39 +09:00 · 2023-10-13 17:31:17 +09:00 · 2023-10-13 17:09:35 +09:00
38 changed files with 1477 additions and 2290 deletions
--- a/.github/scripts/test.sh
+++ b/.github/scripts/test.sh
@@ -30,32 +30,32 @@ sha_sum "$(raw_eghcup --offline whereis ghcup)"

 ### Haskell test suite

-./"ghcup-test${ext}"
-./"ghcup-test-optparse${ext}"
-rm "ghcup-test${ext}" "ghcup-test-optparse${ext}"
+./ghcup-test${ext}
+./ghcup-test-optparse${ext}
+rm ghcup-test${ext} ghcup-test-optparse${ext}

 ### manual cli based testing

 eghcup --numeric-version

-eghcup install ghc "${GHC_VER}"
-eghcup unset ghc "${GHC_VER}"
-ls -lah "$(eghcup whereis -d ghc "${GHC_VER}")"
-[ "$($(eghcup whereis ghc "${GHC_VER}") --numeric-version)" = "${GHC_VER}" ]
-[ "$(eghcup run -q --ghc "${GHC_VER}" -- ghc --numeric-version)" = "${GHC_VER}" ]
-[ "$(ghcup run -q --ghc "${GHC_VER}" -- ghc -e 'Control.Monad.join (Control.Monad.fmap System.IO.putStr System.Environment.getExecutablePath)')" = "$($(ghcup whereis ghc "${GHC_VER}") -e 'Control.Monad.join (Control.Monad.fmap System.IO.putStr System.Environment.getExecutablePath)')" ]
-eghcup set ghc "${GHC_VER}"
-eghcup install cabal "${CABAL_VER}"
-[ "$($(eghcup whereis cabal "${CABAL_VER}") --numeric-version)" = "${CABAL_VER}" ]
+eghcup install ghc ${GHC_VER}
+eghcup unset ghc ${GHC_VER}
+ls -lah "$(eghcup whereis -d ghc ${GHC_VER})"
+[ "`$(eghcup whereis ghc ${GHC_VER}) --numeric-version`" = "${GHC_VER}" ]
+[ "`eghcup run --ghc ${GHC_VER} -- ghc --numeric-version`" = "${GHC_VER}" ]
+[ "`ghcup run --ghc ${GHC_VER} -- ghc -e 'Control.Monad.join (Control.Monad.fmap System.IO.putStr System.Environment.getExecutablePath)'`" = "`$(ghcup whereis ghc ${GHC_VER}) -e 'Control.Monad.join (Control.Monad.fmap System.IO.putStr System.Environment.getExecutablePath)'`" ]
+eghcup set ghc ${GHC_VER}
+eghcup install cabal ${CABAL_VER}
+[ "`$(eghcup whereis cabal ${CABAL_VER}) --numeric-version`" = "${CABAL_VER}" ]
 eghcup unset cabal
 "$GHCUP_BIN"/cabal --version && exit 1 || echo yes

 # make sure no cabal is set when running 'ghcup run' to check that PATH propagages properly
 # https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/375
-[ "$(eghcup run -q --cabal "${CABAL_VER}" -- cabal --numeric-version)" = "${CABAL_VER}" ]
-eghcup set cabal "${CABAL_VER}"
+[ "`eghcup run --cabal ${CABAL_VER} -- cabal --numeric-version`" = "${CABAL_VER}" ]
+eghcup set cabal ${CABAL_VER}

-[ "$($(eghcup whereis cabal "${CABAL_VER}") --numeric-version)" = "${CABAL_VER}" ]
+[ "`$(eghcup whereis cabal ${CABAL_VER}) --numeric-version`" = "${CABAL_VER}" ]

 if [ "${OS}" != "FreeBSD" ] ; then
 	if [ "${ARCH}" = "64" ] && [ "${DISTRO}" != "Alpine" ] ; then
@@ -85,10 +85,10 @@ eghcup list -t cabal

 ghc_ver=$(ghc --numeric-version)
 ghc --version
-"ghc-${ghc_ver}" --version
+ghc-${ghc_ver} --version
 if [ "${OS}" != "Windows" ] ; then
 		ghci --version
-		"ghci-${ghc_ver}" --version
+		ghci-${ghc_ver} --version
 fi


@@ -132,11 +132,11 @@ else
 	eghcup --offline set 8.10.3
 	eghcup set 8.10.3
 	[ "$(ghc --numeric-version)" = "8.10.3" ]
-	eghcup set "${GHC_VER}"
+	eghcup set ${GHC_VER}
 	[ "$(ghc --numeric-version)" = "${ghc_ver}" ]
 	eghcup unset ghc
    "$GHCUP_BIN"/ghc --numeric-version && exit 1 || echo yes
-	eghcup set "${GHC_VER}"
+	eghcup set ${GHC_VER}
 	eghcup --offline rm 8.10.3
 	[ "$(ghc --numeric-version)" = "${ghc_ver}" ]

@@ -169,10 +169,10 @@ fi
 # check that lazy loading works for 'whereis'
 cp "$CI_PROJECT_DIR/data/metadata/ghcup-${JSON_VERSION}.yaml" "$CI_PROJECT_DIR/data/metadata/ghcup-${JSON_VERSION}.yaml.bak"
 echo '**' > "$CI_PROJECT_DIR/data/metadata/ghcup-${JSON_VERSION}.yaml"
-eghcup whereis ghc "$(ghc --numeric-version)"
+eghcup whereis ghc $(ghc --numeric-version)
 mv -f "$CI_PROJECT_DIR/data/metadata/ghcup-${JSON_VERSION}.yaml.bak" "$CI_PROJECT_DIR/data/metadata/ghcup-${JSON_VERSION}.yaml"

-eghcup rm "$(ghc --numeric-version)"
+eghcup rm $(ghc --numeric-version)

 # https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/116
 if [ "${OS}" = "Linux" ] ; then
@@ -186,7 +186,7 @@ eghcup gc -c

 # test etags
 rm -f "${GHCUP_DIR}/cache/ghcup-${JSON_VERSION}.yaml"
-raw_eghcup -s "https://www.haskell.org/ghcup/data/ghcup-${JSON_VERSION}.yaml" list
+raw_eghcup -s https://www.haskell.org/ghcup/data/ghcup-${JSON_VERSION}.yaml list
 # snapshot yaml and etags file
 etag=$(cat "${GHCUP_DIR}/cache/ghcup-${JSON_VERSION}.yaml.etags")
 sha=$(sha_sum "${GHCUP_DIR}/cache/ghcup-${JSON_VERSION}.yaml")
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "data/metadata"]
 	path = data/metadata
 	url = https://github.com/haskell/ghcup-metadata.git
-	branch = develop
+	branch = master
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,20 +1,8 @@
 # Revision history for ghcup

-## 0.1.20.0 -- 2023-11-10
+## 0.1.19.5 -- ????-?-??

-### New features
-
-* support TUI on windows thanks to the work from vty and brick maintainers (Chris Hackett, Timofey Zakrevskiy, Jonathan Daugherty, ...), wrt [#912](https://github.com/haskell/ghcup-hs/pull/912)
-* support JS and wasm cross compilers wrt [#838](https://github.com/haskell/ghcup-hs/issues/838), thanks to Sylvain Henry and IOG
-* Support stacks installation strategy and metadata wrt [#892](https://github.com/haskell/ghcup-hs/issues/892)
-  - you can now enable stacks installation method via `ghcup config set url-source '["GHCupURL", "StackSetupURL"]'`... for more information, check the [documentation](https://www.haskell.org/ghcup/guide/#using-stacks-setup-info-metadata-to-install-ghc)
-
-### Improvements and bug fixes
-
-* fix segfault in TUI when hitting enter early wrt [#887](https://github.com/haskell/ghcup-hs/issues/887)
-* Improve key handling in TUI, fixes [#875](https://github.com/haskell/ghcup-hs/issues/875)
-* add explicit support for Void Linux and Rocky Linux (this requires a metadata version bump to `ghcup-0.0.8.yaml`)
-* optparse cli interface now has a test suite thanks to Lei Zhu, wrt [#862](https://github.com/haskell/ghcup-hs/pull/862)
+* support JS cross compilers wrt [#838](https://github.com/haskell/ghcup-hs/issues/838)

 ## 0.1.19.4 -- 2023-7-02

--- a/app/ghcup/BrickMain.hs
+++ b/app/ghcup/BrickMain.hs
@@ -5,19 +5,18 @@
 {-# LANGUAGE TypeApplications  #-}
 {-# LANGUAGE RankNTypes        #-}
 {-# LANGUAGE ViewPatterns      #-}
-{-# OPTIONS_GHC -Wno-unused-record-wildcards #-}
-{-# OPTIONS_GHC -Wno-unused-matches #-}

 module BrickMain where

 import           GHCup
 import           GHCup.Download
 import           GHCup.Errors
-import           GHCup.Types.Optics ( getDirs, getPlatformReq )
+import           GHCup.Types.Optics ( getDirs )
 import           GHCup.Types         hiding ( LeanAppState(..) )
 import           GHCup.Utils
 import           GHCup.OptParse.Common (logGHCPostRm)
 import           GHCup.Prelude ( decUTF8Safe )
+import           GHCup.Prelude.File
 import           GHCup.Prelude.Logger
 import           GHCup.Prelude.Process
 import           GHCup.Prompts
@@ -31,7 +30,6 @@ import           Brick.Widgets.List             ( listSelectedFocusedAttr
                                                , listAttr
                                                )
 import           Codec.Archive
-import           Control.Applicative
 import           Control.Exception.Safe
 #if !MIN_VERSION_base(4,13,0)
 import           Control.Monad.Fail             ( MonadFail )
@@ -50,6 +48,7 @@ import           Data.Vector                    ( Vector
 import           Data.Versions
 import           Haskus.Utils.Variant.Excepts
 import           Prelude                 hiding ( appendFile )
+import           System.FilePath
 import           System.Exit
 import           System.IO.Unsafe
 import           Text.PrettyPrint.HughesPJClass ( prettyShow )
@@ -61,34 +60,9 @@ import qualified Data.Text.Lazy                as L
 import qualified Graphics.Vty                  as Vty
 import qualified Data.Vector                   as V
 import System.Environment (getExecutablePath)
-#if !IS_WINDOWS
-import           GHCup.Prelude.File
-import           System.FilePath
 import qualified System.Posix.Process          as SPP
-#endif


-installedSign :: String
-#if IS_WINDOWS
-installedSign = "I "
-#else
-installedSign = "✓ "
-#endif
-
-setSign :: String
-#if IS_WINDOWS
-setSign = "IS"
-#else
-setSign = "✔✔"
-#endif
-
-notInstalledSign :: String
-#if IS_WINDOWS
-notInstalledSign = "X "
-#else
-notInstalledSign = "✗ "
-#endif
-
 hiddenTools :: [Tool]
 hiddenTools = []

@@ -120,7 +94,7 @@ data BrickState = BrickState


 keyHandlers :: KeyBindings
-            -> [ ( KeyCombination
+            -> [ ( Vty.Key
                 , BrickSettings -> String
                 , BrickState -> EventM String BrickState ()
                 )
@@ -157,9 +131,6 @@ showKey Vty.KUp = "↑"
 showKey Vty.KDown = "↓"
 showKey key = tail (show key)

-showMod :: Vty.Modifier -> String
-showMod = tail . show
-

 ui :: AttrMap -> BrickState -> Widget String
 ui dimAttrs BrickState{ appSettings = as@BrickSettings{}, ..}
@@ -176,7 +147,7 @@ ui dimAttrs BrickState{ appSettings = as@BrickSettings{}, ..}
      . txtWrap
      . T.pack
      . foldr1 (\x y -> x <> "  " <> y)
-      . fmap (\(KeyCombination key mods, s, _) -> intercalate "+" (showKey key : (showMod <$> mods)) <> ":" <> s as)
+      . fmap (\(key, s, _) -> showKey key <> ":" <> s as)
      $ keyHandlers appKeys
  header =
    minHSize 2 emptyWidget
@@ -190,9 +161,9 @@ ui dimAttrs BrickState{ appSettings = as@BrickSettings{}, ..}
    in withDefAttr listAttr . drawListElements (renderItem minTagSize minVerSize) True $ bis
  renderItem minTagSize minVerSize _ b listResult@ListResult{lTag = lTag', ..} =
    let marks = if
-          | lSet       -> (withAttr (attrName "set") $ str setSign)
-          | lInstalled -> (withAttr (attrName "installed") $ str installedSign)
-          | otherwise  -> (withAttr (attrName "not-installed") $ str notInstalledSign)
+          | lSet       -> (withAttr (attrName "set") $ str "✔✔")
+          | lInstalled -> (withAttr (attrName "installed") $ str "✓ ")
+          | otherwise  -> (withAttr (attrName "not-installed") $ str "✗ ")
        ver = case lCross of
          Nothing -> T.unpack . prettyVer $ lVer
          Just c  -> T.unpack (c <> "-" <> prettyVer lVer)
@@ -350,12 +321,12 @@ eventHandler st@BrickState{..} ev = do
    (MouseDown _ Vty.BScrollDown _ _) ->
      put (BrickState { appState = moveCursor 1 appState Down, .. })
    (VtyEvent (Vty.EvResize _ _)) -> put st
-    (VtyEvent (Vty.EvKey Vty.KUp [])) ->
+    (VtyEvent (Vty.EvKey Vty.KUp _)) ->
      put BrickState{ appState = moveCursor 1 appState Up, .. }
-    (VtyEvent (Vty.EvKey Vty.KDown [])) ->
+    (VtyEvent (Vty.EvKey Vty.KDown _)) ->
      put BrickState{ appState = moveCursor 1 appState Down, .. }
-    (VtyEvent (Vty.EvKey key mods)) ->
-      case find (\(keyCombo, _, _) -> keyCombo == KeyCombination key mods) (keyHandlers kb) of
+    (VtyEvent (Vty.EvKey key _)) ->
+      case find (\(key', _, _) -> key' == key) (keyHandlers kb) of
        Nothing -> put st
        Just (_, _, handler) -> handler st
    _ -> put st
@@ -461,7 +432,7 @@ filterVisible v t e | lInstalled e = True
                                  (lTool e `notElem` hiddenTools)


-install' :: (MonadReader AppState m, MonadIO m, MonadThrow m, MonadFail m, MonadMask m, MonadUnliftIO m, Alternative m)
+install' :: (MonadReader AppState m, MonadIO m, MonadThrow m, MonadFail m, MonadMask m, MonadUnliftIO m)
         => BrickState
         -> (Int, ListResult)
         -> m (Either String ())
@@ -492,11 +463,6 @@ install' _ (_, ListResult {..}) = do
              , ToolShadowed
              , UninstallFailed
              , MergeFileTreeError
-              , NoCompatiblePlatform
-              , GHCup.Errors.ParseError
-              , UnsupportedSetupCombo
-              , DistroNotFound
-              , NoCompatibleArch
              ]

  run (do
@@ -525,15 +491,12 @@ install' _ (_, ListResult {..}) = do
            forM_ (_viPostInstall =<< vi) $ \msg -> logInfo msg
            case lTool of
              GHCup -> do
-#if !IS_WINDOWS
                up <- liftIO $ fmap (either (const Nothing) Just)
                  $ try @_ @SomeException $ canonicalizePath (binDir </> "ghcup" <.> exeExt)
                when ((normalise <$> up) == Just (normalise ce)) $
                  -- TODO: track cli arguments of previous invocation
                  liftIO $ SPP.executeFile ce False ["tui"] Nothing
-#else
                logInfo "Please restart 'ghcup' for the changes to take effect"
-#endif
              _ -> pure ()
            pure $ Right ()
          VRight (vi, _, _) -> do
@@ -546,7 +509,7 @@ install' _ (_, ListResult {..}) = do
            <> "Also check the logs in ~/.ghcup/logs"


-set' :: (MonadReader AppState m, MonadIO m, MonadThrow m, MonadFail m, MonadMask m, MonadUnliftIO m, Alternative m)
+set' :: (MonadReader AppState m, MonadIO m, MonadThrow m, MonadFail m, MonadMask m, MonadUnliftIO m)
     => BrickState
     -> (Int, ListResult)
     -> m (Either String ())
@@ -688,10 +651,8 @@ getGHCupInfo = do

  r <-
    flip runReaderT settings
-    . runE @'[DigestError, ContentLengthError, GPGError, JSONError , DownloadFailed , FileDoesNotExistError, StackPlatformDetectError]
-    $ do
-      pfreq <- lift getPlatformReq
-      liftE $ getDownloadsF pfreq
+    . runE @'[DigestError, ContentLengthError, GPGError, JSONError , DownloadFailed , FileDoesNotExistError]
+    $ liftE getDownloadsF

  case r of
    VRight a -> pure $ Right a
--- a/app/ghcup/Main.hs
+++ b/app/ghcup/Main.hs
@@ -42,6 +42,7 @@ import           Data.Aeson.Encode.Pretty       ( encodePretty )
 import           Data.Either
 import           Data.Functor
 import           Data.Maybe
+import           Data.Versions
 import           GHC.IO.Encoding
 import           Haskus.Utils.Variant.Excepts
 import           Language.Haskell.TH
@@ -84,7 +85,7 @@ toSettings options = do
         keepDirs    = fromMaybe (fromMaybe (Types.keepDirs defaultSettings) uKeepDirs) optKeepDirs
         downloader  = fromMaybe (fromMaybe defaultDownloader uDownloader) optsDownloader
         keyBindings = maybe defaultKeyBindings mergeKeys uKeyBindings
-         urlSource   = fromMaybe (fromMaybe (Types.urlSource defaultSettings) uUrlSource) optUrlSource
+         urlSource   = maybe (fromMaybe (Types.urlSource defaultSettings) uUrlSource) (OwnSource . (:[]) . Right) optUrlSource
         noNetwork   = fromMaybe (fromMaybe (Types.noNetwork defaultSettings) uNoNetwork) optNoNetwork
         gpgSetting  = fromMaybe (fromMaybe (Types.gpgSetting defaultSettings) uGPGSetting) optGpg
         platformOverride = optPlatform <|> (uPlatformOverride <|> Types.platformOverride defaultSettings)
@@ -210,9 +211,10 @@ Report bugs at <https://github.com/haskell/ghcup-hs/issues>|]
                                            exitWith (ExitFailure 2)

                ghcupInfo <-
-                  ( flip runReaderT leanAppstate . runE @'[ContentLengthError, DigestError, DistroNotFound, DownloadFailed, FileDoesNotExistError, GPGError, JSONError, NoCompatibleArch, NoCompatiblePlatform, NoDownload, GHCup.Errors.ParseError, ProcessError, UnsupportedSetupCombo, StackPlatformDetectError] $ do
-                     liftE $ getDownloadsF pfreq
-                  )
+                  ( flip runReaderT leanAppstate
+                    . runE @'[DigestError, ContentLengthError, GPGError, JSONError , DownloadFailed, FileDoesNotExistError]
+                    $ liftE getDownloadsF
+                    )
                    >>= \case
                          VRight r -> pure r
                          VLeft  e -> do
@@ -339,9 +341,9 @@ Report bugs at <https://github.com/haskell/ghcup-hs/issues>|]
                          ] m Bool
  alreadyInstalling (Install (Right InstallOptions{..}))                 (GHC, ver)   = cmp' GHC instVer ver
  alreadyInstalling (Install (Left (InstallGHC InstallOptions{..})))     (GHC, ver)   = cmp' GHC instVer ver
-  alreadyInstalling (Install (Left (InstallCabal InstallOptions{..})))   (Cabal, ver)    = cmp' Cabal instVer ver
-  alreadyInstalling (Install (Left (InstallHLS InstallOptions{..})))     (HLS, ver)      = cmp' HLS instVer ver
-  alreadyInstalling (Install (Left (InstallStack InstallOptions{..})))   (Stack, ver)    = cmp' Stack instVer ver
+  alreadyInstalling (Install (Left (InstallCabal InstallOptions{..})))   (Cabal, ver) = cmp' Cabal instVer ver
+  alreadyInstalling (Install (Left (InstallHLS InstallOptions{..})))     (HLS, ver)   = cmp' HLS instVer ver
+  alreadyInstalling (Install (Left (InstallStack InstallOptions{..})))   (Stack, ver) = cmp' Stack instVer ver
  alreadyInstalling (Compile (CompileGHC GHCCompileOptions{ ovewrwiteVer = Just over }))
    (GHC, ver)   = cmp' GHC (Just $ GHCVersion (mkTVer over)) ver
  alreadyInstalling (Compile (CompileGHC GHCCompileOptions{ targetGhc = GHC.SourceDist tver }))
@@ -376,4 +378,3 @@ Report bugs at <https://github.com/haskell/ghcup-hs/issues>|]
  cmp' tool instVer ver = do
    (v, _) <- liftE $ fromVersion instVer tool
    pure (v == ver)
-
--- a/cabal.project.release
+++ b/cabal.project.release
@@ -4,26 +4,35 @@ optional-packages: ./vendored/*/*.cabal

 optimization: 2

-package ghcup
-  flags: +tui
+source-repository-package
+  type: git
+  location: https://github.com/fosskers/versions.git
+  tag: 7bc3355348aac3510771d4622aff09ac38c9924d

 if os(linux)
+  package ghcup
+    flags: +tui
  if arch(x86_64) || arch(i386)
    package *
      ghc-options: -split-sections -optl-static
 elif os(darwin)
  constraints: zlib +bundled-c-zlib,
               lzma +static
+  package ghcup
+    flags: +tui
 elif os(mingw32)
  constraints: zlib +bundled-c-zlib,
               lzma +static,
-               text -simdutf,
-			   vty-windows >=0.1.0.3
+               text -simdutf
+  package ghcup
+    flags: -tui
 elif os(freebsd)
  constraints: zlib +bundled-c-zlib,
               zip +disable-zstd
  package *
    ghc-options: -split-sections -pgmc clang++14
+  package ghcup
+    flags: +tui

 constraints: http-io-streams -brotli,
             any.aeson >= 2.0.1.0,
--- a/data/config.yaml
+++ b/data/config.yaml
@@ -16,11 +16,6 @@ gpg-setting: GPGNone # GPGStrict | GPGLax | GPGNone
 # TUI key bindings,
 # see https://hackage.haskell.org/package/vty-5.31/docs/Graphics-Vty-Input-Events.html#t:Key
 # for possible values.
-# It's also possible to define key+modifier, e.g.:
-#   quit:
-#     Key:
-#       KChar: c
-#     Mods: [MCtrl]
 key-bindings:
  up:
    KUp: []
@@ -51,45 +46,41 @@ meta-cache: 300 # in seconds
 #   2. Strict: fail hard
 meta-mode: Lax # Strict | Lax

-# Where to get GHC/cabal/hls download info/versions from. This is a list that performs
-# union over tool versions, preferring the later entries.
+# Where to get GHC/cabal/hls download info/versions from. For more detailed explanation
+# check the 'URLSource' type in the code.
 url-source:
  ## Use the internal download uri, this is the default
-  - GHCupURL
+  GHCupURL: []

-  ## Prefer stack supplied metadata (will still use GHCup metadata for versions not existing in stack metadata)
-  # - StackSetupURL
+  ## Example 1: Read download info from this location instead
+  ## Accepts file/http/https scheme
+  ## Can also be an array of URLs or an array of 'Either GHCupInfo URL', in
+  ## which case they are merged right-biased (overwriting duplicate versions).
+  # OwnSource: "file:///home/jule/git/ghcup-hs/ghcup-0.0.3.yaml"

-  ## Add pre-release channel
-  # - https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml
-  ## Add nightly channel
-  # - https://ghc.gitlab.haskell.org/ghcup-metadata/ghcup-nightlies-0.0.7.yaml
-  ## Add cross compiler channel
-  # - https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-cross-0.0.8.yaml
+  ## Example 2: Add custom tarballs to the default downloads, overwriting duplicate versions.
+  ## Can also be an array of 'Either GHCupInfo URL', also see Example 3.
+  # AddSource:
+    # Left:
+      # globalTools: {}
+      # toolRequirements: {}
+      # ghcupDownloads:
+        # GHC:
+          # 9.10.2:
+            # viTags: []
+            # viArch:
+              # A_64:
+                # Linux_UnknownLinux:
+                  # unknown_versioning:
+                    # dlUri: https://downloads.haskell.org/~ghc/7.10.3/ghc-7.10.3-x86_64-deb8-linux.tar.bz2
+                    # dlSubdir: ghc-7.10.3
+                    # dlHash: 01cfbad8dff1e8b34a5fdca8caeaf843b56e36af919e29cd68870d2588563db5

-  ## Use dwarf bindist for 9.4.7 for ghcup metadata
-  # - ghcup-info:
-  #     ghcupDownloads:
-  #       GHC:
-  #         9.4.7:
-  #           viTags: []
-  #           viArch:
-  #             A_64:
-  #               Linux_UnknownLinux:
-  #                 unknown_versioning:
-  #                   dlUri: https://downloads.haskell.org/ghc/9.4.7/ghc-9.4.7-x86_64-deb10-linux-dwarf.tar.xz
-  #                   dlSubdir:
-  #                     RegexDir: "ghc-.*"
-  #                   dlHash: b261b3438ba455e3cf757f9c8dc3a06fdc061ea8ec287a65b7809e25fe18bad4
-
-  ## for stack metadata and the linux64-tinfo6 bindists, use static alpine for 9.8.1
-  # - setup-info:
-  #     ghc:
-  #       linux64-tinfo6:
-  #         9.8.1:
-  #           url: "https://downloads.haskell.org/~ghc/9.8.1/ghc-9.8.1-x86_64-alpine3_12-linux-static.tar.xz"
-  #           content-length: 229037440
-  #           sha256: b48f3d3a508d0c140d1c801e04afc65e80c0d25e7e939a8a41edb387b26b81b3
+  ## Example 3: Add multiple custom download files to the default downloads via right-biased merge (overwriting duplicate
+  ## versions).
+  # AddSource:
+    # - Right: "file:///home/jule/git/ghcup-hs/ghcup-prereleases.yaml"
+    # - Right: "file:///home/jule/git/ghcup-hs/ghcup-custom.yaml"

 # This is a way to override platform detection, e.g. when you're running
 # a Ubuntu derivate based on 18.04, you could do:
--- a/data/metadata
+++ b/data/metadata
--- a/docs/guide.md
+++ b/docs/guide.md
@@ -95,7 +95,7 @@ platform-override:

 This is the complete list of env variables that change GHCup behavior:

-* `GHCUP_USE_XDG_DIRS`: see [XDG support](#xdg-support) below
+* `GHCUP_USE_XDG_DIRS`: see [XDG support](#xdg-support) above
 * `GHCUP_INSTALL_BASE_PREFIX`: the base of ghcup (default: `$HOME`)
 * `GHCUP_CURL_OPTS`: additional options that can be passed to curl
 * `GHCUP_WGET_OPTS`: additional options that can be passed to wget
@@ -153,7 +153,8 @@ To use a mirror, set the following option in `~/.ghcup/config.yaml`:

 ```yml
 url-source:
-  - https://some-url/ghcup-0.0.6.yaml
+  # Accepts file/http/https scheme
+  OwnSource: "https://some-url/ghcup-0.0.6.yaml"
 ```

 See [config.yaml](https://github.com/haskell/ghcup-hs/blob/master/data/config.yaml)
@@ -183,8 +184,8 @@ This will result in `~/.ghcup/config.yaml` to contain this record:

 ```yml
 url-source:
-  - GHCupURL
-  - https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml
+  AddSource:
+  - Right: https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml
 ```

 You can add as many channels as you like. They are combined under *Last*, so versions from the prerelease channel
@@ -194,13 +195,14 @@ To remove the channel, delete the entire `url-source` section or set it back to

 ```yml
 url-source:
-  - GHCupURL
+  GHCupURL: []
 ```

 If you want to combine your release channel with a mirror, you'd do it like so:

 ```yml
 url-source:
+  OwnSource:
  # base metadata
  - "https://mirror.sjtu.edu.cn/ghcup/yaml/ghcup/data/ghcup-0.0.6.yaml"
  # prerelease channel
@@ -212,7 +214,17 @@ url-source:
 Stack manages GHC versions internally by default. In order to make it use ghcup installed
 GHC versions there are two strategies.

-### Strategy 1: Stack hooks (new, recommended)
+### Strategy 1: System GHC (works on all stack versions)
+
+You can instruct stack to use "system" GHC versions (whatever is in PATH). To do so,
+run the following commands:
+
+```sh
+stack config set install-ghc false --global
+stack config set system-ghc  true  --global
+```
+
+### Strategy 2: Stack hooks (new, recommended)

 Since stack 2.9.1 you can customize the installation logic of GHC completely, see [https://docs.haskellstack.org/en/stable/yaml_configuration/#ghc-installation-customisation](https://docs.haskellstack.org/en/stable/yaml_configuration/#ghc-installation-customisation).

@@ -234,61 +246,6 @@ stack config set system-ghc false --global
 By default, when the hook fails for whatever reason, stack will fall back to its own installation logic. To disable
 this, run `stack config set install-ghc false --global`.

-### Strategy 2: System GHC (works on all stack versions)
-
-You can instruct stack to use "system" GHC versions (whatever is in PATH). To do so,
-run the following commands:
-
-```sh
-stack config set install-ghc false --global
-stack config set system-ghc  true  --global
-```
-
-### Using stack's setup-info metadata to install GHC
-
-You can now use stack's [setup-info metadata](https://github.com/commercialhaskell/stackage-content/blob/master/stack/stack-setup-2.yaml)
-to install GHC. For that, you can invoke ghcup like so as a shorthand:
-
-```sh
-# ghcup will only see GHC now
-ghcup -s StackSetupURL install ghc 9.4.7
-# this combines both ghcup and stack metadata
-ghcup -s '["GHCupURL", "StackSetupURL"]' install ghc 9.4.7
-```
-
-To make this permanent and combine it with the GHCup metadata, you can add the following to your `~/.ghcup/config.yaml`:
-
-```yaml
-url-source:
-  - GHCupURL
-  # stack versions take precedence
-  # you'll still have access to GHCup provided versions and tools in case they don't exist in stack metadata
-  - StackSetupURL
-```
-
-You can customize or add sections to the setup-info similar to how the [stack documentation](https://docs.haskellstack.org/en/stable/yaml_configuration/#setup-info) explains it. E.g. to change the 9.4.7 bindist, you might do:
-
-```yaml
-url-source:
-  - GHCupURL
-  - StackSetupURL
-  - setup-info:
-      ghc:
-        linux64-tinfo6:
-          9.4.7:
-            url: "https://downloads.haskell.org/~ghc/9.4.7/ghc-9.4.7-x86_64-fedora27-linux.tar.xz"
-            content-length: 179117892
-            sha256: 216b76b7c6383e6ad9ba82533f323f8550e52893a8b9fa33c7b9dc4201ac766a
-```
-
-#### Caveats
-
-The main caveat with using this method is that there's no guarantee that GHCup will pick a compatible HLS bindist
-when you try to install HLS.
-
-Another potential usability issue is that the `latest` and `recommended` shorthands won't work anymore, since
-Stack metadata doesn't have a concept of those and we don't try to be smart when combining the metadatas.
-
 ### Windows

 On windows, you may find the following config options useful too:
@@ -499,48 +456,8 @@ variables and, in the case of Windows, parameters to tweak the script behavior.

 ### github workflows

-On github workflows GHCup itself is pre-installed on all platforms, but may use non-standard install locations.
-Here's an example workflow with a GHC matrix:
-
-```yaml
-jobs:
-  build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: true
-      matrix:
-        os: [ubuntu-22.04, macOS-latest]
-        ghc: ['9.6', '9.4', '9.2', '9.0', '8.10', '8.8', '8.6']
-    steps:
-    - uses: actions/checkout@v3
-    - name: Setup toolchain
-      run: |
-        ghcup install cabal --set recommended
-        ghcup install ghc --set ${{ matrix.ghc }}
-    - name: Build
-      run: |
-        cabal update
-        cabal test all --test-show-details=direct
-
-  i386:
-    runs-on: ubuntu-latest
-    container:
-      image: i386/ubuntu:bionic
-    steps:
-    - name: Install GHCup in container
-      run: |
-        apt-get update -y
-        apt-get install -y autoconf build-essential zlib1g-dev libgmp-dev curl
-        # we just go with recommended versions of cabal and GHC
-        curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 sh
-    - uses: actions/checkout@v1
-    - name: Test
-      run: |
-        # in containers we need to fix PATH
-        source ~/.ghcup/env
-        cabal update
-        cabal test all --test-show-details=direct
-```
+On github workflows you can use [https://github.com/haskell/actions/](https://github.com/haskell/actions/).
+GHCup itself is also pre-installed on all platforms, but may use non-standard install locations.

 ## GPG verification

--- a/docs/install.md
+++ b/docs/install.md
@@ -42,14 +42,10 @@ Also see [tags and shortcuts](../guide/#tags-and-shortcuts) for more information

 The following distro packages are required: `build-essential curl libffi-dev libffi6 libgmp-dev libgmp10 libncurses-dev libncurses5 libtinfo5`

-#### Version >= 11 && <= 12
+#### Version >= 11

 The following distro packages are required: `build-essential curl libffi-dev libffi7 libgmp-dev libgmp10 libncurses-dev libncurses5 libtinfo5`

-#### Version >= 12
-
-The following distro packages are required: `build-essential curl libffi-dev libffi8 libgmp-dev libgmp10 libncurses-dev libncurses5 libtinfo5`
-
 ### Linux Ubuntu

 #### Generic
@@ -60,13 +56,10 @@ The following distro packages are required: `build-essential curl libffi-dev lib

 The following distro packages are required: `build-essential curl libffi-dev libffi7 libgmp-dev libgmp10 libncurses-dev libncurses5 libtinfo5`

-#### Version >= 20.10 && < 23
+#### Version >= 20.10

 The following distro packages are required: `build-essential curl libffi-dev libffi8ubuntu1 libgmp-dev libgmp10 libncurses-dev libncurses5 libtinfo5`

-#### Version >= 23
-
-The following distro packages are required: `build-essential curl libffi-dev libffi8ubuntu1 libgmp-dev libgmp10 libncurses-dev`

 ### Linux Fedora

@@ -140,18 +133,16 @@ GHCup supports the following tools, which are also known as the **Haskell Toolch
 <table>
 <thead><tr><th>GHC Version</th><th>Tags</th></tr></thead>
 <tbody>
-<tr><td>9.8.1</td><td><span style="color:blue">latest</span>, base-4.19.0.0</td></tr>
-<tr><td>9.6.3</td><td>base-4.18.1.0</td></tr>
-<tr><td>9.6.2</td><td>base-4.18.0.0</td></tr>
+<tr><td>9.6.2</td><td><span style="color:blue">latest</span>, base-4.18.0.0</td></tr>
 <tr><td>9.6.1</td><td>base-4.18.0.0</td></tr>
-<tr><td>9.4.7</td><td><span style="color:green">recommended</span>, base-4.17.2.0</td></tr>
+<tr><td>9.4.7</td><td>base-4.17.2.0</td></tr>
 <tr><td>9.4.6</td><td>base-4.17.2.0</td></tr>
 <tr><td>9.4.5</td><td>base-4.17.1.0</td></tr>
 <tr><td>9.4.4</td><td>base-4.17.0.0</td></tr>
 <tr><td>9.4.3</td><td>base-4.17.0.0</td></tr>
 <tr><td>9.4.2</td><td>base-4.17.0.0</td></tr>
 <tr><td>9.4.1</td><td>base-4.17.0.0</td></tr>
-<tr><td>9.2.8</td><td>base-4.16.4.0</td></tr>
+<tr><td>9.2.8</td><td><span style="color:green">recommended</span>, base-4.16.4.0</td></tr>
 <tr><td>9.2.7</td><td>base-4.16.4.0</td></tr>
 <tr><td>9.2.6</td><td>base-4.16.4.0</td></tr>
 <tr><td>9.2.5</td><td>base-4.16.4.0</td></tr>
@@ -192,8 +183,7 @@ GHCup supports the following tools, which are also known as the **Haskell Toolch
 <table>
 <thead><tr><th>Cabal Version</th><th>Tags</th></tr></thead>
 <tbody>
-<tr><td>3.10.2.0</td><td><span style="color:blue">latest</span></td></tr>
-<tr><td>3.10.1.0</td><td></td></tr>
+<tr><td>3.10.1.0</td><td><span style="color:blue">latest</span></td></tr>
 <tr><td>3.8.1.0</td><td></td></tr>
 <tr><td>3.6.2.0</td><td><span style="color:green">recommended</span></td></tr>
 <tr><td>3.6.0.0</td><td></td></tr>
@@ -210,9 +200,7 @@ GHCup supports the following tools, which are also known as the **Haskell Toolch
 <table>
 <thead><tr><th>HLS Version</th><th>Tags</th></tr></thead>
 <tbody>
-<tr><td>2.4.0.0</td><td><span style="color:blue">latest</span>, <span style="color:green">recommended</span></td></tr>
-<tr><td>2.3.0.0</td><td></td></tr>
-<tr><td>2.2.0.0</td><td></td></tr>
+<tr><td>2.2.0.0</td><td><span style="color:blue">latest</span>, <span style="color:green">recommended</span></td></tr>
 <tr><td>2.1.0.0</td><td></td></tr>
 <tr><td>2.0.0.1</td><td></td></tr>
 <tr><td>2.0.0.0</td><td></td></tr>
@@ -237,9 +225,8 @@ GHCup supports the following tools, which are also known as the **Haskell Toolch
 <table>
 <thead><tr><th>Stack Version</th><th>Tags</th></tr></thead>
 <tbody>
-<tr><td>2.13.1</td><td><span style="color:blue">latest</span></td></tr>
-<tr><td>2.11.1</td><td><span style="color:green">recommended</span></td></tr>
-<tr><td>2.9.3</td><td></td></tr>
+<tr><td>2.11.1</td><td><span style="color:blue">latest</span></td></tr>
+<tr><td>2.9.3</td><td><span style="color:green">recommended</span></td></tr>
 <tr><td>2.9.1</td><td></td></tr>
 <tr><td>2.7.5</td><td></td></tr>
 <tr><td>2.7.3</td><td></td></tr>
--- a/ghcup.cabal
+++ b/ghcup.cabal
@@ -1,6 +1,6 @@
 cabal-version:      2.4
 name:               ghcup
-version:            0.1.20.0
+version:            0.1.19.5
 license:            LGPL-3.0-only
 license-file:       LICENSE
 copyright:          Julian Ospald 2020
@@ -36,7 +36,7 @@ source-repository head

 flag tui
  description:
-    Build the brick powered tui (ghcup tui).
+    Build the brick powered tui (ghcup tui). This is disabled on windows.

  default:     False
  manual:      True
@@ -86,7 +86,7 @@ common app-common-depends
    , unordered-containers   ^>=0.2
    , uri-bytestring         ^>=0.3.2.2
    , utf8-string            ^>=1.0
-    , vector                 >=0.12     && <0.14
+    , vector                 ^>=0.12
    , versions               >=6.0.3    && <6.1
    , yaml-streamly          ^>=0.12.0

@@ -117,9 +117,7 @@ library
    GHCup.Types
    GHCup.Types.JSON
    GHCup.Types.JSON.Utils
-    GHCup.Types.JSON.Versions
    GHCup.Types.Optics
-    GHCup.Types.Stack
    GHCup.Utils
    GHCup.Utils.Dirs
    GHCup.Version
@@ -190,7 +188,7 @@ library
    , unliftio-core         ^>=0.2.0.1
    , unordered-containers  ^>=0.2.10.0
    , uri-bytestring        ^>=0.3.2.2
-    , vector                 >=0.12     && <0.14
+    , vector                ^>=0.12
    , versions              >=6.0.3      && <6.1
    , word8                 ^>=0.1.3
    , yaml-streamly         ^>=0.12.0
@@ -236,9 +234,9 @@ library
      , unix             ^>=2.7
      , unix-bytestring  ^>=0.3.7.3

-  if flag(tui)
+  if (flag(tui) && !os(windows))
    cpp-options:   -DBRICK
-    build-depends: vty ^>=6.0
+    build-depends: vty ^>=5.39

 library ghcup-optparse
  import:             app-common-depends
@@ -284,7 +282,7 @@ library ghcup-optparse
  if flag(internal-downloader)
    cpp-options: -DINTERNAL_DOWNLOADER

-  if flag(tui)
+  if (flag(tui) && !os(windows))
    cpp-options:   -DBRICK

  if os(windows)
@@ -320,13 +318,14 @@ executable ghcup
  if flag(internal-downloader)
    cpp-options: -DINTERNAL_DOWNLOADER

-  if flag(tui)
+  if (flag(tui) && !os(windows))
    cpp-options:   -DBRICK
    other-modules: BrickMain
    build-depends:
-      , brick         ^>=2.1
+      , brick         ^>=1.5
      , transformers  ^>=0.5
-      , vty           ^>=6.0
+      , unix          ^>=2.7
+      , vty           ^>=5.39

  if os(windows)
    cpp-options: -DIS_WINDOWS
--- a/lib-opt/GHCup/OptParse.hs
+++ b/lib-opt/GHCup/OptParse.hs
@@ -57,13 +57,16 @@ import           GHCup.Types
 import           Control.Monad.Fail             ( MonadFail )
 #endif
 import           Control.Monad.Reader
+import           Data.Bifunctor
 import           Data.Either
 import           Data.Functor
 import           Data.Maybe
 import           Options.Applicative     hiding ( style )
 import           Options.Applicative.Help.Pretty ( text )
 import           Prelude                 hiding ( appendFile )
+import           URI.ByteString

+import qualified Data.ByteString.UTF8          as UTF8


 data Options = Options
@@ -74,13 +77,12 @@ data Options = Options
  , optMetaCache   :: Maybe Integer
  , optMetaMode    :: Maybe MetaMode
  , optPlatform    :: Maybe PlatformRequest
-  , optUrlSource   :: Maybe URLSource
+  , optUrlSource   :: Maybe URI
  , optNoVerify    :: Maybe Bool
  , optKeepDirs    :: Maybe KeepDirs
  , optsDownloader :: Maybe Downloader
  , optNoNetwork   :: Maybe Bool
  , optGpg         :: Maybe GPGSetting
-  , optStackSetup  :: Maybe Bool
  -- commands
  , optCommand     :: Command
  }
@@ -132,13 +134,13 @@ opts =
      )
    <*> optional
          (option
-            (eitherReader parseUrlSource)
+            (eitherReader parseUri)
            (  short 's'
            <> long "url-source"
-            <> metavar "URL_SOURCE"
-            <> help "Alternative ghcup download info"
+            <> metavar "URL"
+            <> help "Alternative ghcup download info url"
            <> internal
-            <> completer urlSourceCompleter
+            <> completer fileUri
            )
          )
    <*> (fmap . fmap) not (invertableSwitch "verify" (Just 'n') True (help "Disable tarball checksum verification (default: enabled)"))
@@ -176,9 +178,10 @@ opts =
          "GPG verification (default: none)"
          <> completer (listCompleter ["strict", "lax", "none"])
          ))
-    <*> invertableSwitch "stack-setup" (Just 's') False (help "Use stack's setup info for discovering and installing GHC versions")
    <*> com
-
+ where
+  parseUri s' =
+    first show $ parseURI strictURIParserOptions (UTF8.fromString s')


 com :: Parser Command
--- a/lib-opt/GHCup/OptParse/Common.hs
+++ b/lib-opt/GHCup/OptParse/Common.hs
@@ -64,8 +64,6 @@ import           URI.ByteString
 import qualified Data.ByteString.UTF8          as UTF8
 import qualified Data.Map.Strict               as M
 import qualified Data.Text                     as T
-import qualified Data.Text.Lazy.Encoding       as LE
-import qualified Data.Text.Lazy                as LT
 import qualified Text.Megaparsec               as MP
 import qualified System.FilePath.Posix         as FP
 import GHCup.Version
@@ -211,7 +209,19 @@ platformParser s' = case MP.parse (platformP <* MP.eof) "" (T.pack s') of
        )
    ]
  distroP :: MP.Parsec Void Text LinuxDistro
-  distroP = choice' ((\d -> MP.chunk (T.pack $ distroToString d) $> d) <$> allDistros)
+  distroP = choice'
+    [ MP.chunk "debian" $> Debian
+    , MP.chunk "deb" $> Debian
+    , MP.chunk "ubuntu" $> Ubuntu
+    , MP.chunk "mint" $> Mint
+    , MP.chunk "fedora" $> Fedora
+    , MP.chunk "centos" $> CentOS
+    , MP.chunk "redhat" $> RedHat
+    , MP.chunk "alpine" $> Alpine
+    , MP.chunk "gentoo" $> Gentoo
+    , MP.chunk "exherbo" $> Exherbo
+    , MP.chunk "unknown" $> UnknownLinux
+    ]


 uriParser :: String -> Either String URI
@@ -324,15 +334,6 @@ toolCompleter = listCompleter ["ghc", "cabal", "hls", "stack"]
 gitFileUri :: [String] -> Completer
 gitFileUri add = mkCompleter $ fileUri' (["git://"] <> add)

-urlSourceCompleter :: Completer
-urlSourceCompleter = mkCompleter $ urlSourceCompleter' []
-
-urlSourceCompleter' :: [String] -> String -> IO [String]
-urlSourceCompleter' add str' = do
-  let static = ["GHCupURL", "StackSetupURL"]
-  file <- fileUri' add str'
-  pure $ static ++ file
-
 fileUri :: Completer
 fileUri = mkCompleter $ fileUri' []

@@ -366,7 +367,7 @@ fileUri' add = \case
  -- We need to do this so bash doesn't expand out any ~ or other
  -- chars we want to complete on, or emit an end of line error
  -- when seeking the close to the quote.
-  --
+  -- 
  -- NOTE: copied from https://hackage.haskell.org/package/optparse-applicative-0.17.0.0/docs/src/Options.Applicative.Builder.Completer.html#requote
  requote :: String -> String
  requote s =
@@ -461,15 +462,13 @@ tagCompleter tool add = listIOCompleter $ do
        defaultKeyBindings
        loggerConfig

-  mpFreq <- flip runReaderT appState . runE $ platformRequest
-  forFold mpFreq $ \pfreq -> do
-    mGhcUpInfo <- flip runReaderT appState . runE $ getDownloadsF pfreq
-    case mGhcUpInfo of
-      VRight ghcupInfo -> do
-        let allTags = filter (/= Old)
-              $ _viTags =<< M.elems (availableToolVersions (_ghcupDownloads ghcupInfo) tool)
-        pure $ nub $ (add ++) $ fmap tagToString allTags
-      VLeft _ -> pure  (nub $ ["recommended", "latest", "latest-prerelease"] ++ add)
+  mGhcUpInfo <- flip runReaderT appState . runE $ getDownloadsF
+  case mGhcUpInfo of
+    VRight ghcupInfo -> do
+      let allTags = filter (/= Old)
+            $ _viTags =<< M.elems (availableToolVersions (_ghcupDownloads ghcupInfo) tool)
+      pure $ nub $ (add ++) $ fmap tagToString allTags
+    VLeft _ -> pure  (nub $ ["recommended", "latest", "latest-prerelease"] ++ add)

 versionCompleter :: [ListCriteria] -> Tool -> Completer
 versionCompleter criteria tool = versionCompleter' criteria tool (const True)
@@ -490,8 +489,8 @@ versionCompleter' criteria tool filter' = listIOCompleter $ do
                   defaultKeyBindings
                   loggerConfig
  mpFreq <- flip runReaderT leanAppState . runE $ platformRequest
+  mGhcUpInfo <- flip runReaderT leanAppState . runE $ getDownloadsF
  forFold mpFreq $ \pfreq -> do
-    mGhcUpInfo <- flip runReaderT leanAppState . runE $ getDownloadsF pfreq
    forFold mGhcUpInfo $ \ghcupInfo -> do
      let appState = AppState
            settings
@@ -830,15 +829,3 @@ logGHCPostRm ghcVer = do
  let storeGhcDir = cabalStore </> ("ghc-" <> T.unpack (prettyVer $ _tvVersion ghcVer))
  logInfo $ T.pack $ "After removing GHC you might also want to clean up your cabal store at: " <> storeGhcDir

-parseUrlSource :: String -> Either String URLSource
-parseUrlSource "GHCupURL" = pure GHCupURL
-parseUrlSource "StackSetupURL" = pure StackSetupURL
-parseUrlSource s' = (eitherDecode . LE.encodeUtf8 . LT.pack $ s')
-            <|> (fmap (OwnSource . (:[]) . Right) . first show . parseURI strictURIParserOptions .UTF8.fromString $ s')
-
-parseNewUrlSource :: String -> Either String NewURLSource
-parseNewUrlSource "GHCupURL" = pure NewGHCupURL
-parseNewUrlSource "StackSetupURL" = pure NewStackSetupURL
-parseNewUrlSource s' = (eitherDecode . LE.encodeUtf8 . LT.pack $ s')
-            <|> (fmap NewURI . first show . parseURI strictURIParserOptions .UTF8.fromString $ s')
-
--- a/lib-opt/GHCup/OptParse/Config.hs
+++ b/lib-opt/GHCup/OptParse/Config.hs
@@ -32,6 +32,7 @@ import           Options.Applicative     hiding ( style, ParseError )
 import           Options.Applicative.Help.Pretty ( text )
 import           Prelude                 hiding ( appendFile )
 import           System.Exit
+import           URI.ByteString          hiding ( uriParser )

 import qualified Data.Text                     as T
 import qualified Data.ByteString.UTF8          as UTF8
@@ -50,7 +51,7 @@ data ConfigCommand
  = ShowConfig
  | SetConfig String (Maybe String)
  | InitConfig
-  | AddReleaseChannel Bool NewURLSource
+  | AddReleaseChannel Bool URI
  deriving (Eq, Show)


@@ -74,8 +75,8 @@ configP = subparser
  showP = info (pure ShowConfig) (progDesc "Show current config (default)")
  setP  = info argsP (progDesc "Set config KEY to VALUE (or specify as single json value)" <> footerDoc (Just $ text configSetFooter))
  argsP = SetConfig <$> argument str (metavar "<JSON_VALUE | YAML_KEY>") <*> optional (argument str (metavar "YAML_VALUE"))
-  addP  = info (AddReleaseChannel <$> switch (long "force" <> help "Delete existing entry (if any) and append instead of failing") <*> argument (eitherReader parseNewUrlSource) (metavar "URL_SOURCE" <> completer urlSourceCompleter))
-    (progDesc "Add a release channel, e.g. from a URI")
+  addP  = info (AddReleaseChannel <$> switch (long "force" <> help "Delete existing entry (if any) and append instead of failing") <*> argument (eitherReader uriParser) (metavar "URI" <> completer fileUri))
+    (progDesc "Add a release channel from a URI")



@@ -206,15 +207,27 @@ config configCommand settings userConf keybindings runLogger = case configComman
        pure $ ExitFailure 65
      VLeft _ -> pure $ ExitFailure 65

-  AddReleaseChannel force new -> do
+  AddReleaseChannel force uri -> do
    r <- runE @'[DuplicateReleaseChannel] $ do
-      let oldSources = fromURLSource (urlSource settings)
-      let merged = oldSources ++ [new]
-      case checkDuplicate oldSources new of
-        Duplicate
-          | not force -> throwE (DuplicateReleaseChannel new)
-        DuplicateLast -> pure ()
-        _ -> lift $ doConfig (defaultUserSettings { uUrlSource = Just $ SimpleList merged })
+      case urlSource settings of
+        AddSource xs -> do
+          case checkDuplicate xs (Right uri) of
+            Duplicate
+              | not force -> throwE (DuplicateReleaseChannel uri)
+            DuplicateLast -> pure ()
+            _ -> lift $ doConfig (defaultUserSettings { uUrlSource = Just $ AddSource (appendUnique xs (Right uri)) })
+        GHCupURL -> do
+          lift $ doConfig (defaultUserSettings { uUrlSource = Just $ AddSource [Right uri] })
+          pure ()
+        OwnSource xs -> do
+          case checkDuplicate xs (Right uri) of
+            Duplicate
+              | not force -> throwE (DuplicateReleaseChannel uri)
+            DuplicateLast -> pure ()
+            _ -> lift $ doConfig (defaultUserSettings { uUrlSource = Just $ OwnSource (appendUnique xs (Right uri)) })
+        OwnSpec spec -> do
+          lift $ doConfig (defaultUserSettings { uUrlSource = Just $ OwnSource [Left spec, Right uri] })
+          pure ()
    case r of
      VRight _ -> do
        pure ExitSuccess
@@ -229,6 +242,15 @@ config configCommand settings userConf keybindings runLogger = case configComman
    | a `elem` xs  = Duplicate
    | otherwise    = NoDuplicate

+  -- appends the element to the end of the list, but also removes it from the existing list
+  appendUnique :: Eq a => [a] -> a -> [a]
+  appendUnique xs' e = go xs'
+   where
+    go [] = [e]
+    go (x:xs)
+      | x == e    =     go xs -- skip
+      | otherwise = x : go xs
+
  doConfig :: MonadIO m => UserSettings -> m ()
  doConfig usersettings = do
    let settings' = updateSettings usersettings userConf
--- a/lib-opt/GHCup/OptParse/Install.hs
+++ b/lib-opt/GHCup/OptParse/Install.hs
@@ -63,6 +63,7 @@ data InstallCommand = InstallGHC InstallOptions
    --[ Options ]--
    ---------------

+
 data InstallOptions = InstallOptions
  { instVer      :: Maybe ToolVersion
  , instBindist  :: Maybe URI
@@ -133,7 +134,7 @@ installParser =
           )
      )
    )
-    <|> (Right <$> installOpts (Just GHC))
+    <|> (Right <$> installOpts Nothing)
 where
  installHLSFooter :: String
  installHLSFooter = [s|Discussion:
@@ -290,11 +291,6 @@ type InstallGHCEffects = '[ AlreadyInstalled
                          , UninstallFailed
                          , UnknownArchive
                          , InstallSetError
-                          , NoCompatiblePlatform
-                          , GHCup.Errors.ParseError
-                          , UnsupportedSetupCombo
-                          , DistroNotFound
-                          , NoCompatibleArch
                          ]

 runInstGHC :: AppState
@@ -314,13 +310,13 @@ runInstGHC appstate' =

 install :: Either InstallCommand InstallOptions -> Settings -> IO AppState -> (ReaderT LeanAppState IO () -> IO ()) -> IO ExitCode
 install installCommand settings getAppState' runLogger = case installCommand of
-  (Right iGHCopts) -> do
+  (Right iopts) -> do
    runLogger (logWarn "This is an old-style command for installing GHC. Use 'ghcup install ghc' instead.")
-    installGHC iGHCopts
-  (Left (InstallGHC iGHCopts)) -> installGHC iGHCopts
-  (Left (InstallCabal iopts))  -> installCabal iopts
-  (Left (InstallHLS iopts))    -> installHLS iopts
-  (Left (InstallStack iopts))  -> installStack iopts
+    installGHC iopts
+  (Left (InstallGHC iopts)) -> installGHC iopts
+  (Left (InstallCabal iopts)) -> installCabal iopts
+  (Left (InstallHLS iopts)) -> installHLS iopts
+  (Left (InstallStack iopts)) -> installStack iopts
 where
  installGHC :: InstallOptions -> IO ExitCode
  installGHC InstallOptions{..} = do
--- a/lib-opt/GHCup/OptParse/Prefetch.hs
+++ b/lib-opt/GHCup/OptParse/Prefetch.hs
@@ -14,7 +14,6 @@ module GHCup.OptParse.Prefetch where
 import           GHCup
 import           GHCup.Errors
 import           GHCup.Types
-import           GHCup.Types.Optics
 import           GHCup.Prelude.File
 import           GHCup.Prelude.Logger
 import           GHCup.Prelude.String.QQ
@@ -158,9 +157,7 @@ type PrefetchEffects = '[ TagNotFound
                        , GPGError
                        , DownloadFailed
                        , JSONError
-                        , FileDoesNotExistError
-                        , StackPlatformDetectError
-                        ]
+                        , FileDoesNotExistError ]


 runPrefetch :: MonadUnliftIO m
@@ -213,8 +210,7 @@ prefetch prefetchCommand runAppState runLogger =
        (v, _) <- liftE $ fromVersion mt Stack
        liftE $ fetchToolBindist (_tvVersion v) Stack pfCacheDir
      PrefetchMetadata -> do
-        pfreq <- lift getPlatformReq
-        _ <- liftE $ getDownloadsF pfreq
+        _ <- liftE getDownloadsF
        pure ""
       ) >>= \case
                VRight _ -> do
--- a/lib-opt/GHCup/OptParse/Run.hs
+++ b/lib-opt/GHCup/OptParse/Run.hs
@@ -187,11 +187,6 @@ type RunEffects = '[ AlreadyInstalled
                   , ProcessError
                   , UninstallFailed
                   , MergeFileTreeError
-                   , NoCompatiblePlatform
-                   , GHCup.Errors.ParseError
-                   , UnsupportedSetupCombo
-                   , DistroNotFound
-                   , NoCompatibleArch
                   ]

 runLeanRUN :: (MonadUnliftIO m, MonadIO m)
@@ -231,7 +226,6 @@ run :: forall m .
       , MonadCatch m
       , MonadIO m
       , MonadUnliftIO m
-       , Alternative m
       )
   => RunOptions
   -> IO AppState
@@ -261,9 +255,7 @@ run RunOptions{..} runAppState leanAppstate runLogger = do
               liftIO $ putStr tmp
               pure ExitSuccess
             (cmd:args) -> do
-               newEnv <- liftIO $ addToPath [tmp] runAppendPATH
-               let pathVar = if isWindows then "Path" else "PATH"
-               forM_ (Map.lookup pathVar . Map.fromList $ newEnv) $ liftIO . setEnv pathVar
+               newEnv <- liftIO $ addToPath tmp runAppendPATH
 #ifndef IS_WINDOWS
               void $ liftIO $ SPP.executeFile cmd True args (Just newEnv)
               pure ExitSuccess
@@ -337,7 +329,6 @@ run RunOptions{..} runAppState leanAppstate runLogger = do
                           , MonadThrow m
                           , MonadIO m
                           , MonadCatch m
-                           , Alternative m
                           )
                        => Toolchain
                        -> FilePath
@@ -363,11 +354,6 @@ run RunOptions{..} runAppState leanAppstate runLogger = do
                              , CopyError
                              , UninstallFailed
                              , MergeFileTreeError
-                              , NoCompatiblePlatform
-                              , GHCup.Errors.ParseError
-                              , UnsupportedSetupCombo
-                              , DistroNotFound
-                              , NoCompatibleArch
                              ] (ResourceT (ReaderT AppState m)) ()
   installToolChainFull Toolchain{..} tmp = do
         case ghcVer of
--- a/lib/GHCup/Download.hs
+++ b/lib/GHCup/Download.hs
@@ -5,6 +5,7 @@
 {-# LANGUAGE TypeApplications      #-}
 {-# LANGUAGE TypeFamilies          #-}

+
 {-|
 Module      : GHCup.Download
 Description : Downloading
@@ -30,11 +31,9 @@ import           GHCup.Download.Utils
 #endif
 import           GHCup.Errors
 import           GHCup.Types
-import qualified GHCup.Types.Stack                as Stack
 import           GHCup.Types.Optics
 import           GHCup.Types.JSON               ( )
 import           GHCup.Utils.Dirs
-import           GHCup.Platform
 import           GHCup.Prelude
 import           GHCup.Prelude.File
 import           GHCup.Prelude.Logger.Internal
@@ -56,7 +55,6 @@ import           Data.ByteString                ( ByteString )
 import           Data.CaseInsensitive           ( mk )
 #endif
 import           Data.Maybe
-import           Data.Either
 import           Data.List
 import           Data.Time.Clock
 import           Data.Time.Clock.POSIX
@@ -114,71 +112,24 @@ getDownloadsF :: ( FromJSONKey Tool
                 , MonadFail m
                 , MonadMask m
                 )
-              => PlatformRequest
-              -> Excepts
-                   '[DigestError, ContentLengthError, GPGError, JSONError , DownloadFailed , FileDoesNotExistError, StackPlatformDetectError]
+              => Excepts
+                   '[DigestError, ContentLengthError, GPGError, JSONError , DownloadFailed , FileDoesNotExistError]
                   m
                   GHCupInfo
-getDownloadsF pfreq@(PlatformRequest arch plat _) = do
+getDownloadsF = do
  Settings { urlSource } <- lift getSettings
-  let newUrlSources = fromURLSource urlSource
-  infos <- liftE $ mapM dl' newUrlSources
-  keys <- if any isRight infos
-          then liftE . reThrowAll @_ @_ @'[StackPlatformDetectError] StackPlatformDetectError $ getStackPlatformKey pfreq
-          else pure []
-  ghcupInfos <- fmap catMaybes $ forM infos $ \case
-    Left gi  -> pure (Just gi)
-    Right si -> pure $ fromStackSetupInfo si keys
-  mergeGhcupInfo ghcupInfos
+  case urlSource of
+    GHCupURL -> liftE $ getBase ghcupURL
+    (OwnSource exts) -> do
+      ext  <- liftE $ mapM (either pure getBase) exts
+      mergeGhcupInfo ext
+    (OwnSpec av) -> pure av
+    (AddSource exts) -> do
+      base <- liftE $ getBase ghcupURL
+      ext  <- liftE $ mapM (either pure getBase) exts
+      mergeGhcupInfo (base:ext)
+
 where
-
-  dl' :: ( FromJSONKey Tool
-         , FromJSONKey Version
-         , FromJSON VersionInfo
-         , MonadReader env m
-         , HasSettings env
-         , HasDirs env
-         , MonadIO m
-         , MonadCatch m
-         , HasLog env
-         , MonadThrow m
-         , MonadFail m
-         , MonadMask m
-         )
-      => NewURLSource
-      -> Excepts
-           '[DownloadFailed, GPGError, DigestError, ContentLengthError, JSONError, FileDoesNotExistError]
-           m (Either GHCupInfo Stack.SetupInfo)
-  dl' NewGHCupURL       = fmap Left $ liftE $ getBase @GHCupInfo ghcupURL
-  dl' NewStackSetupURL  = fmap Right $ liftE $ getBase @Stack.SetupInfo stackSetupURL
-  dl' (NewGHCupInfo gi) = pure (Left gi)
-  dl' (NewSetupInfo si) = pure (Right si)
-  dl' (NewURI uri)      = catchE @JSONError (\(JSONDecodeError _) -> Right <$> getBase @Stack.SetupInfo uri)
-                            $ fmap Left $ getBase @GHCupInfo uri
-
-  fromStackSetupInfo :: MonadThrow m
-                     => Stack.SetupInfo
-                     -> [String]
-                     -> m GHCupInfo
-  fromStackSetupInfo (Stack.siGHCs -> ghcDli) keys = do
-    let ghcVersionsPerKey = (`M.lookup` ghcDli) <$> (T.pack <$> keys)
-        ghcVersions = fromMaybe mempty . listToMaybe . catMaybes $ ghcVersionsPerKey
-    (ghcupInfo' :: M.Map GHCTargetVersion DownloadInfo) <-
-      M.mapKeys mkTVer <$> M.traverseMaybeWithKey (\_ a -> pure $ fromStackDownloadInfo a) ghcVersions
-    let ghcupDownloads' = M.singleton GHC (M.map fromDownloadInfo ghcupInfo')
-    pure (GHCupInfo mempty ghcupDownloads' mempty)
-   where
-    fromDownloadInfo :: DownloadInfo -> VersionInfo
-    fromDownloadInfo dli = let aspec = M.singleton arch (M.singleton plat (M.singleton Nothing dli))
-                           in VersionInfo [] Nothing Nothing Nothing Nothing aspec Nothing Nothing Nothing
-
-    fromStackDownloadInfo :: MonadThrow m => Stack.GHCDownloadInfo -> m DownloadInfo
-    fromStackDownloadInfo (Stack.GHCDownloadInfo { gdiDownloadInfo = Stack.DownloadInfo{..} }) = do
-      url <- either (\e -> throwM $ ParseError (show e)) pure $ parseURI strictURIParserOptions . E.encodeUtf8 $ downloadInfoUrl
-      sha256 <- maybe (throwM $ DigestMissing url) (pure . E.decodeUtf8) downloadInfoSha256
-      pure $ DownloadInfo url (Just $ RegexDir "ghc-.*") sha256 Nothing Nothing
-
-
  mergeGhcupInfo :: MonadFail m
                 => [GHCupInfo]
                 -> m GHCupInfo
@@ -190,7 +141,6 @@ getDownloadsF pfreq@(PlatformRequest arch plat _) = do
    in pure $ GHCupInfo newToolReqs newDownloads newGlobalTools


-
 yamlFromCache :: (MonadReader env m, HasDirs env) => URI -> m FilePath
 yamlFromCache uri = do
  Dirs{..} <- getDirs
@@ -201,7 +151,7 @@ etagsFile :: FilePath -> FilePath
 etagsFile = (<.> "etags")


-getBase :: forall j m env . ( MonadReader env m
+getBase :: ( MonadReader env m
           , HasDirs env
           , HasSettings env
           , MonadFail m
@@ -209,10 +159,9 @@ getBase :: forall j m env . ( MonadReader env m
           , MonadCatch m
           , HasLog env
           , MonadMask m
-           , FromJSON j
           )
        => URI
-        -> Excepts '[DownloadFailed, GPGError, DigestError, ContentLengthError, JSONError, FileDoesNotExistError] m j
+        -> Excepts '[DownloadFailed, GPGError, DigestError, ContentLengthError, JSONError, FileDoesNotExistError] m GHCupInfo
 getBase uri = do
  Settings { noNetwork, downloader, metaMode } <- lift getSettings

@@ -377,7 +326,6 @@ getDownloadInfo' t v = do
    )


-
 -- | Tries to download from the given http or https url
 -- and saves the result in continuous memory into a file.
 -- If the filename is not provided, then we:
--- a/lib/GHCup/Errors.hs
+++ b/lib/GHCup/Errors.hs
@@ -87,7 +87,6 @@ allHFError = unlines allErrors
    , let proxy = Proxy :: Proxy ToolShadowed in format proxy
    , let proxy = Proxy :: Proxy ContentLengthError in format proxy
    , let proxy = Proxy :: Proxy DuplicateReleaseChannel in format proxy
-    , let proxy = Proxy :: Proxy UnsupportedSetupCombo in format proxy
    , ""
    , "# high level errors (4000+)"
    , let proxy = Proxy :: Proxy DownloadFailed in format proxy
@@ -100,7 +99,6 @@ allHFError = unlines allErrors
    , let proxy = Proxy :: Proxy ParseError in format proxy
    , let proxy = Proxy :: Proxy UnexpectedListLength in format proxy
    , let proxy = Proxy :: Proxy NoUrlBase in format proxy
-    , let proxy = Proxy :: Proxy DigestMissing in format proxy
    , ""
    , "# orphans (800+)"
    , let proxy = Proxy :: Proxy URIParseError in format proxy
@@ -676,29 +674,18 @@ instance HFErrorProject ContentLengthError where
  eBase _ = 340
  eDesc _ = "File content length verification failed"

-data DuplicateReleaseChannel = DuplicateReleaseChannel NewURLSource
+data DuplicateReleaseChannel = DuplicateReleaseChannel URI
  deriving Show

 instance HFErrorProject DuplicateReleaseChannel where
  eBase _ = 350
-  eDesc _ = "Duplicate release channel detected when adding new source.\nGiving up. You can use '--force' to remove and append the duplicate source (this may change order/semantics)."
+  eDesc _ = "Duplicate release channel detected when adding URI.\nGiving up. You can use '--force' to remove and append the duplicate URI (this may change order/semantics)."

 instance Pretty DuplicateReleaseChannel where
-  pPrint (DuplicateReleaseChannel source) =
+  pPrint (DuplicateReleaseChannel uri) =
    text $ "Duplicate release channel detected when adding: \n  "
-      <> show source
-      <> "\nGiving up. You can use '--force' to remove and append the duplicate source (this may change order/semantics)."
-
-data UnsupportedSetupCombo = UnsupportedSetupCombo Architecture Platform
-  deriving Show
-
-instance Pretty UnsupportedSetupCombo where
-  pPrint (UnsupportedSetupCombo arch plat) =
-    text "Could not find a compatible setup combo for:" <+> pPrint arch <+> pPrint plat
-
-instance HFErrorProject UnsupportedSetupCombo where
-  eBase _ = 360
-  eDesc _ = "Could not find a compatible setup combo"
+      <> (T.unpack . E.decodeUtf8With E.lenientDecode . serializeURIRef') uri
+      <> "\nGiving up. You can use '--force' to remove and append the duplicate URI (this may change order/semantics)."

    -------------------------
    --[ High-level errors ]--
@@ -787,22 +774,6 @@ instance HFErrorProject GHCupSetError where
  eNum (GHCupSetError xs) = 9000 + eNum xs
  eDesc _ = "Setting the current version failed."

-- | Executing stacks platform detection failed.
-data StackPlatformDetectError = forall es . (ToVariantMaybe StackPlatformDetectError es, PopVariant StackPlatformDetectError es, Show (V es), Pretty (V es), HFErrorProject (V es)) => StackPlatformDetectError (V es)
-
-instance Pretty StackPlatformDetectError where
-  pPrint (StackPlatformDetectError reason) =
-    case reason of
-      VMaybe (_ :: StackPlatformDetectError) -> pPrint reason
-      _ -> text "Running stack platform detection logic failed:" <+> pPrint reason
-
-deriving instance Show StackPlatformDetectError
-
-instance HFErrorProject StackPlatformDetectError where
-  eBase _ = 6000
-  eNum (StackPlatformDetectError xs) = 6000 + eNum xs
-  eDesc _ = "Running stack platform detection logic failed."
-

    ---------------------------------------------
    --[ True Exceptions (e.g. for MonadThrow) ]--
@@ -850,18 +821,6 @@ instance HFErrorProject NoUrlBase where
  eBase _ = 520
  eDesc _ = "URL does not have a base filename."

-data DigestMissing = DigestMissing URI
-  deriving Show
-
-instance Pretty DigestMissing where
-  pPrint (DigestMissing uri) =
-    text "Digest missing for:" <+> (text . T.unpack . E.decodeUtf8With E.lenientDecode . serializeURIRef') uri
-
-instance Exception DigestMissing
-
-instance HFErrorProject DigestMissing where
-  eBase _ = 530
-  eDesc _ = "An expected digest is missing."


    ------------------------
--- a/lib/GHCup/GHC.hs
+++ b/lib/GHCup/GHC.hs
@@ -74,7 +74,6 @@ import qualified Crypto.Hash.SHA256            as SHA256
 import qualified Data.ByteString.Base16        as B16
 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.IO                  as T
 import qualified Data.Text.Encoding            as E
@@ -217,9 +216,7 @@ testUnpackedGHC path tver addMakeArgs = do
  lift $ logInfo $ "Testing GHC version " <> tVerToText tver <> "!"
  ghcDir <- lift $ ghcupGHCDir tver
  let ghcBinDir = fromGHCupPath ghcDir </> "bin"
-  env <- liftIO $ addToPath [ghcBinDir] False
-  let pathVar = if isWindows then "Path" else "PATH"
-  forM_ (Map.lookup pathVar . Map.fromList $ env) $ liftIO . setEnv pathVar
+  env <- liftIO $ addToPath ghcBinDir False

  lEM $ make' (fmap T.unpack addMakeArgs)
              (Just $ fromGHCupPath path)
@@ -515,7 +512,6 @@ installGHCBin :: ( MonadFail m
                 , MonadResource m
                 , MonadIO m
                 , MonadUnliftIO m
-                 , Alternative m
                 )
              => GHCTargetVersion -- ^ the version to install
              -> InstallDir
@@ -537,11 +533,6 @@ installGHCBin :: ( MonadFail m
                    , ProcessError
                    , UninstallFailed
                    , MergeFileTreeError
-                    , NoCompatiblePlatform
-                    , ParseError
-                    , UnsupportedSetupCombo
-                    , DistroNotFound
-                    , NoCompatibleArch
                    ]
                   m
                   ()
--- a/lib/GHCup/Platform.hs
+++ b/lib/GHCup/Platform.hs
@@ -28,8 +28,6 @@ import           GHCup.Prelude
 import           GHCup.Prelude.Logger
 import           GHCup.Prelude.Process
 import           GHCup.Prelude.String.QQ
-import           GHCup.Prelude.Version.QQ
-import           GHCup.Prelude.MegaParsec

 #if !MIN_VERSION_base(4,13,0)
 import           Control.Monad.Fail             ( MonadFail )
@@ -50,18 +48,11 @@ import           Prelude                 hiding ( abs
                                                )
 import           System.Info
 import           System.OsRelease
-import           System.Exit
-import           System.FilePath
 import           Text.PrettyPrint.HughesPJClass ( prettyShow )
 import           Text.Regex.Posix

-import qualified Text.Megaparsec               as MP
-
 import qualified Data.Text                     as T
 import qualified Data.Text.IO                  as T
-import           Data.Void
-import qualified Data.List                     as L
-



@@ -206,155 +197,3 @@ getLinuxDistro = do
  try_debian_version = do
    ver <- T.readFile debian_version
    pure (T.pack "debian", Just ver)
-
-
-getStackGhcBuilds :: (MonadReader env m, HasLog env, MonadIO m)
-                  => PlatformResult
-                  -> Excepts '[ParseError, NoCompatiblePlatform, DistroNotFound, ProcessError] m [String]
-getStackGhcBuilds PlatformResult{..} = do
-    case _platform of
-      Linux _ -> do
-        -- Some systems don't have ldconfig in the PATH, so make sure to look in
-        -- /sbin and /usr/sbin as well
-        sbinEnv <- liftIO $ addToPath sbinDirs False
-        ldConfig <- lift $ executeOut' "ldconfig" ["-p"] Nothing (Just sbinEnv)
-        firstWords <- case ldConfig of
-                        CapturedProcess ExitSuccess so _ ->
-                          pure . mapMaybe (listToMaybe . T.words) . T.lines . T.pack . stripNewlineEnd . T.unpack . decUTF8Safe' $ so
-                        CapturedProcess (ExitFailure _) _ _ ->
-                          -- throwE $ NonZeroExit c "ldconfig" ["-p" ]
-                          pure []
-        let checkLib :: (MonadReader env m, HasLog env, MonadIO m) => String -> m Bool
-            checkLib lib
-              | libT `elem` firstWords = do
-                  logDebug $ "Found shared library " <> libT <> " in 'ldconfig -p' output"
-                  pure True
-              | isWindows =
-                  -- Cannot parse /usr/lib on Windows
-                  pure False
-              | otherwise = hasMatches lib usrLibDirs
-              -- This is a workaround for the fact that libtinfo.so.x doesn't
-              -- appear in the 'ldconfig -p' output on Arch or Slackware even
-              -- when it exists. There doesn't seem to be an easy way to get the
-              -- true list of directories to scan for shared libs, but this
-              -- works for our particular cases.
-             where
-              libT = T.pack lib
-
-            hasMatches :: (MonadReader env m, HasLog env, MonadIO m) => String -> [FilePath] -> m Bool
-            hasMatches lib dirs = do
-              matches <- filterM (liftIO . doesFileExist . (</> lib)) dirs
-              case matches of
-                [] -> logDebug ("Did not find shared library " <> libT) >> pure False
-                (path:_) -> logDebug ("Found shared library " <> libT <> " in " <> T.pack path) >> pure True
-             where
-              libT = T.pack lib
-
-            getLibc6Version :: MonadIO m
-                            => Excepts '[ParseError, ProcessError] m Version
-            getLibc6Version = do
-              CapturedProcess{..} <- lift $ executeOut "ldd" ["--version"] Nothing
-              case _exitCode of
-                ExitSuccess -> either (throwE . ParseError . show) pure
-                                 . MP.parse lddVersion "" . T.pack . stripNewlineEnd . T.unpack . decUTF8Safe' $ _stdOut
-                ExitFailure c -> throwE $ NonZeroExit c "ldd" ["--version" ]
-
-            -- Assumes the first line of ldd has the format:
-            --
-            -- ldd (...) nn.nn
-            --
-            -- where nn.nn corresponds to the version of libc6.
-            lddVersion :: MP.Parsec Void Text Version
-            lddVersion = do
-              skipWhile (/= ')')
-              skip (== ')')
-              skipSpace
-              version'
-
-        hasMusl <- hasMatches relFileLibcMuslx86_64So1 libDirs
-        mLibc6Version <- veitherToEither <$> runE getLibc6Version
-        case mLibc6Version of
-          Right libc6Version -> logDebug $ "Found shared library libc6 in version: " <> prettyVer libc6Version
-          Left _ -> logDebug "Did not find a version of shared library libc6."
-        let hasLibc6_2_32 = either (const False) (>= [vver|2.32|]) mLibc6Version
-        hastinfo5 <- checkLib relFileLibtinfoSo5
-        hastinfo6 <- checkLib relFileLibtinfoSo6
-        hasncurses6 <- checkLib relFileLibncurseswSo6
-        hasgmp5 <- checkLib relFileLibgmpSo10
-        hasgmp4 <- checkLib relFileLibgmpSo3
-        let libComponents = if hasMusl
-              then
-                [ ["musl"] ]
-              else
-                concat
-                  [ if hastinfo6 && hasgmp5
-                    then
-                      if hasLibc6_2_32
-                      then [["tinfo6"]]
-                      else [["tinfo6-libc6-pre232"]]
-                    else [[]]
-                  , [ [] | hastinfo5 && hasgmp5 ]
-                  , [ ["ncurses6"] | hasncurses6 && hasgmp5 ]
-                  , [ ["gmp4"] | hasgmp4 ]
-                  ]
-        pure $ map
-          (\c -> case c of
-            [] -> []
-            _ -> L.intercalate "-" c)
-          libComponents
-      FreeBSD ->
-        case _distroVersion of
-          Just fVer
-            | fVer >= [vers|12|] -> pure []
-          _ -> pure ["ino64"]
-      Darwin  -> pure []
-      Windows -> pure []
- where
-
-  relFileLibcMuslx86_64So1 :: FilePath
-  relFileLibcMuslx86_64So1 = "libc.musl-x86_64.so.1"
-  libDirs :: [FilePath]
-  libDirs = ["/lib", "/lib64"]
-  usrLibDirs :: [FilePath]
-  usrLibDirs = ["/usr/lib", "/usr/lib64"]
-  sbinDirs :: [FilePath]
-  sbinDirs = ["/sbin", "/usr/sbin"]
-  relFileLibtinfoSo5 :: FilePath
-  relFileLibtinfoSo5 = "libtinfo.so.5"
-  relFileLibtinfoSo6 :: FilePath
-  relFileLibtinfoSo6 = "libtinfo.so.6"
-  relFileLibncurseswSo6 :: FilePath
-  relFileLibncurseswSo6 = "libncursesw.so.6"
-  relFileLibgmpSo10 :: FilePath
-  relFileLibgmpSo10 = "libgmp.so.10"
-  relFileLibgmpSo3 :: FilePath
-  relFileLibgmpSo3 = "libgmp.so.3"
-
-getStackOSKey :: Monad m => PlatformRequest -> Excepts '[UnsupportedSetupCombo] m String
-getStackOSKey PlatformRequest { .. } =
-  case (_rArch, _rPlatform) of
-    (A_32   , Linux _) -> pure "linux32"
-    (A_64   , Linux _) -> pure "linux64"
-    (A_32   , Darwin ) -> pure "macosx"
-    (A_64   , Darwin ) -> pure "macosx"
-    (A_32   , FreeBSD) -> pure "freebsd32"
-    (A_64   , FreeBSD) -> pure "freebsd64"
-    (A_32   , Windows) -> pure "windows32"
-    (A_64   , Windows) -> pure "windows64"
-    (A_ARM  , Linux _) -> pure "linux-armv7"
-    (A_ARM64, Linux _) -> pure "linux-aarch64"
-    (A_Sparc, Linux _) -> pure "linux-sparc"
-    (A_ARM64, Darwin ) -> pure "macosx-aarch64"
-    (A_ARM64, FreeBSD) -> pure "freebsd-aarch64"
-    (arch', os') -> throwE $ UnsupportedSetupCombo arch' os'
-
-getStackPlatformKey :: (MonadReader env m, MonadFail m, HasLog env, MonadCatch m, MonadIO m)
-                    => PlatformRequest
-                    -> Excepts '[UnsupportedSetupCombo, ParseError, NoCompatiblePlatform, NoCompatibleArch, DistroNotFound, ProcessError] m [String]
-getStackPlatformKey pfreq@PlatformRequest{..} = do
-  osKey <- liftE  $ getStackOSKey pfreq
-  builds <- liftE $ getStackGhcBuilds (PlatformResult _rPlatform _rVersion)
-  let builds' = (\build -> if null build then osKey else osKey <> "-" <> build) <$> builds
-  logDebug $ "Potential GHC builds: " <> mconcat (L.intersperse ", " $ fmap T.pack builds')
-  pure builds'
-
--- a/lib/GHCup/Prelude.hs
+++ b/lib/GHCup/Prelude.hs
@@ -43,10 +43,6 @@ import           Control.Monad.Reader
 import           Haskus.Utils.Variant.Excepts
 import           Text.PrettyPrint.HughesPJClass ( Pretty )
 import qualified Data.Text                     as T
-import System.Environment (getEnvironment)
-import qualified Data.Map.Strict               as Map
-import System.FilePath
-import Data.List (intercalate)



@@ -92,25 +88,3 @@ throwSomeE :: forall es' es a m. (Monad m, LiftVariant es' es) => V es' -> Excep
 {-# INLINABLE throwSomeE #-}
 throwSomeE = Excepts . pure . VLeft . liftVariant
 #endif
-
-addToPath :: [FilePath]
-          -> Bool         -- ^ if False will prepend
-          -> IO [(String, String)]
-addToPath paths append = do
- cEnv <- getEnvironment
- return $ addToPath' cEnv paths append
-
-addToPath' :: [(String, String)]
-          -> [FilePath]
-          -> Bool         -- ^ if False will prepend
-          -> [(String, String)]
-addToPath' cEnv' newPaths append =
-  let cEnv           = Map.fromList cEnv'
-      paths          = ["PATH", "Path"]
-      curPaths       = (\x -> maybe [] splitSearchPath (Map.lookup x cEnv)) =<< paths
-      {- HLINT ignore "Redundant bracket" -}
-      newPath        = intercalate [searchPathSeparator] (if append then (curPaths ++ newPaths) else (newPaths ++ curPaths))
-      envWithoutPath = foldr (\x y -> Map.delete x y) cEnv paths
-      pathVar        = if isWindows then "Path" else "PATH"
-      envWithNewPath = Map.toList $ Map.insert pathVar newPath envWithoutPath
-  in envWithNewPath
--- a/lib/GHCup/Prelude/MegaParsec.hs
+++ b/lib/GHCup/Prelude/MegaParsec.hs
@@ -120,17 +120,3 @@ verP suffix = do

 pathSep :: MP.Parsec Void Text Char
 pathSep = MP.oneOf pathSeparators
-
-skipWhile :: (Char -> Bool) -> MP.Parsec Void Text ()
-skipWhile f = void $ MP.takeWhileP Nothing f
-
-skip :: (Char -> Bool) -> MP.Parsec Void Text ()
-skip f = void $ MP.satisfy f
-
-skipSpace :: MP.Parsec Void Text ()
-skipSpace = void $ MP.satisfy isSpace
-
-isSpace :: Char -> Bool
-isSpace c = (c == ' ') || ('\t' <= c && c <= '\r')
-{-# INLINE isSpace #-}
-
--- a/lib/GHCup/Prelude/Process.hs
+++ b/lib/GHCup/Prelude/Process.hs
@@ -11,7 +11,6 @@ Portability : portable
 -}
 module GHCup.Prelude.Process (
  executeOut,
-  executeOut',
  execLogged,
  exec,
  toProcessError,
--- a/lib/GHCup/Prelude/Process/Posix.hs
+++ b/lib/GHCup/Prelude/Process/Posix.hs
@@ -70,16 +70,6 @@ executeOut path args chdir = liftIO $ captureOutStreams $ do
  maybe (pure ()) changeWorkingDirectory chdir
  SPP.executeFile path True args Nothing

-executeOut' :: MonadIO m
-            => FilePath          -- ^ command as filename, e.g. 'ls'
-            -> [String]          -- ^ arguments to the command
-            -> Maybe FilePath    -- ^ chdir to this path
-            -> Maybe [(String, String)]
-            -> m CapturedProcess
-executeOut' path args chdir env = liftIO $ captureOutStreams $ do
-  maybe (pure ()) changeWorkingDirectory chdir
-  SPP.executeFile path True args env
-

 execLogged :: ( MonadReader env m
              , HasSettings env
@@ -179,7 +169,7 @@ execLogged exe args chdir lfile env = do
    overwriteNthLine n str = pos1 <> moveLineUp n <> clearLine <> str <> moveLineDown n <> pos1

    blue :: ByteString -> ByteString
-    blue bs
+    blue bs 
      | no_color = bs
      | otherwise = "\x1b[0;34m" <> bs <> "\x1b[0m"

--- a/lib/GHCup/Prelude/Process/Windows.hs
+++ b/lib/GHCup/Prelude/Process/Windows.hs
@@ -140,16 +140,8 @@ executeOut :: MonadIO m
           -> [String]          -- ^ arguments to the command
           -> Maybe FilePath    -- ^ chdir to this path
           -> m CapturedProcess
-executeOut path args chdir = executeOut' path args chdir Nothing
-
-executeOut' :: MonadIO m
-            => FilePath          -- ^ command as filename, e.g. 'ls'
-            -> [String]          -- ^ arguments to the command
-            -> Maybe FilePath    -- ^ chdir to this path
-            -> Maybe [(String, String)]
-            -> m CapturedProcess
-executeOut' path args chdir env' = do
-  cp <- createProcessWithMingwPath ((proc path args){ cwd = chdir, env = env' })
+executeOut path args chdir = do
+  cp <- createProcessWithMingwPath ((proc path args){ cwd = chdir })
  (exit, out, err) <- liftIO $ readCreateProcessWithExitCodeBS cp ""
  pure $ CapturedProcess exit out err

--- a/lib/GHCup/Stack.hs
+++ b/lib/GHCup/Stack.hs
@@ -234,7 +234,7 @@ setStack ver = do

  liftIO (isShadowed stackbin) >>= \case
    Nothing -> pure ()
-    Just pa -> lift $ logWarn $ T.pack $ prettyHFError (ToolShadowed Stack pa stackbin ver)
+    Just pa -> lift $ logWarn $ T.pack $ prettyHFError (ToolShadowed Cabal pa stackbin ver)

  pure ()

--- a/lib/GHCup/Types.hs
+++ b/lib/GHCup/Types.hs
@@ -22,12 +22,10 @@ module GHCup.Types
  ( module GHCup.Types
 #if defined(BRICK)
  , Key(..)
-  , Modifier(..)
 #endif
  )
  where

-import           GHCup.Types.Stack              ( SetupInfo )
 import {-# SOURCE #-} GHCup.Utils.Dirs          ( fromGHCupPath, GHCupPath )

 import           Control.DeepSeq                ( NFData, rnf )
@@ -41,13 +39,14 @@ import           Optics                         ( makeLenses )
 import           Text.PrettyPrint.HughesPJClass (Pretty, pPrint, text)
 import           URI.ByteString
 #if defined(BRICK)
-import           Graphics.Vty                   ( Key(..), Modifier(..) )
+import           Graphics.Vty                   ( Key(..) )
 #endif

 import qualified Data.ByteString.Lazy          as BL
 import qualified Data.Text                     as T
 import qualified GHC.Generics                  as GHC
 import qualified Data.List.NonEmpty            as NE
+import           Data.Foldable                  (foldMap)

 #if !defined(BRICK)
 data Key = KEsc  | KChar Char | KBS | KEnter
@@ -56,15 +55,8 @@ data Key = KEsc  | KChar Char | KBS | KEnter
         | KFun Int | KBackTab | KPrtScr | KPause | KIns
         | KHome | KPageUp | KDel | KEnd | KPageDown | KBegin | KMenu
    deriving (Eq,Show,Read,Ord,GHC.Generic)
-
-data Modifier = MShift | MCtrl | MMeta | MAlt
-    deriving (Eq,Show,Read,Ord,GHC.Generic)
 #endif

-data KeyCombination = KeyCombination { key :: Key, mods :: [Modifier] }
-    deriving (Eq,Show,Read,Ord,GHC.Generic)
-
-

    --------------------
    --[ GHCInfo Tree ]--
@@ -201,7 +193,7 @@ instance Pretty Tag where
  pPrint (Base       pvp'') = text ("base-" ++ T.unpack (prettyPVP pvp''))
  pPrint (UnknownTag t    ) = text t
  pPrint LatestPrerelease   = text "latest-prerelease"
-  pPrint LatestNightly      = text "latest-prerelease"
+  pPrint LatestNightly   = text "latest-prerelease"
  pPrint Old                = mempty

 data Architecture = A_64
@@ -257,18 +249,13 @@ data LinuxDistro = Debian
                 | RedHat
                 | Alpine
                 | AmazonLinux
-                 | Rocky
-                 | Void
                 -- rolling
                 | Gentoo
                 | Exherbo
                 -- not known
                 | UnknownLinux
                 -- ^ must exit
-  deriving (Eq, GHC.Generic, Ord, Show, Enum, Bounded)
-
-allDistros :: [LinuxDistro]
-allDistros = enumFromTo minBound maxBound
+  deriving (Eq, GHC.Generic, Ord, Show)

 instance NFData LinuxDistro

@@ -281,8 +268,6 @@ distroToString CentOS = "centos"
 distroToString RedHat = "redhat"
 distroToString Alpine = "alpine"
 distroToString AmazonLinux = "amazon"
-distroToString Rocky = "rocky"
-distroToString Void = "void"
 distroToString Gentoo = "gentoo"
 distroToString Exherbo = "exherbo"
 distroToString UnknownLinux = "unknown"
@@ -342,41 +327,15 @@ instance Pretty TarDir where

 -- | Where to fetch GHCupDownloads from.
 data URLSource = GHCupURL
-               | StackSetupURL
-               | OwnSource     [Either (Either GHCupInfo SetupInfo) URI] -- ^ complete source list
-               | OwnSpec               (Either GHCupInfo SetupInfo)
-               | AddSource     [Either (Either GHCupInfo SetupInfo) URI] -- ^ merge with GHCupURL
-               | SimpleList    [NewURLSource]
-               deriving (Eq, GHC.Generic, Show)
-
-data NewURLSource = NewGHCupURL
-                  | NewStackSetupURL
-                  | NewGHCupInfo     GHCupInfo
-                  | NewSetupInfo     SetupInfo
-                  | NewURI           URI
-               deriving (Eq, GHC.Generic, Show)
-
-instance NFData NewURLSource
-
-fromURLSource :: URLSource -> [NewURLSource]
-fromURLSource GHCupURL              = [NewGHCupURL]
-fromURLSource StackSetupURL         = [NewStackSetupURL]
-fromURLSource (OwnSource arr)       = convert' <$> arr
-fromURLSource (AddSource arr)       = NewGHCupURL:(convert' <$> arr)
-fromURLSource (SimpleList arr)      = arr
-fromURLSource (OwnSpec (Left gi))   = [NewGHCupInfo gi]
-fromURLSource (OwnSpec (Right si)) = [NewSetupInfo si]
-
-convert' :: Either (Either GHCupInfo SetupInfo) URI -> NewURLSource
-convert' (Left (Left gi))  = NewGHCupInfo gi
-convert' (Left (Right si)) = NewSetupInfo si
-convert' (Right uri)       = NewURI uri
+               | OwnSource [Either GHCupInfo URI] -- ^ complete source list
+               | OwnSpec GHCupInfo
+               | AddSource [Either GHCupInfo URI] -- ^ merge with GHCupURL
+               deriving (GHC.Generic, Show)

 instance NFData URLSource
 instance NFData (URIRef Absolute) where
  rnf (URI !_ !_ !_ !_ !_) = ()

-
 data MetaMode = Strict
              | Lax
  deriving (Show, Read, Eq, GHC.Generic)
@@ -449,51 +408,47 @@ fromSettings Settings{..} (Just KeyBindings{..}) =
  }

 data UserKeyBindings = UserKeyBindings
-  { kUp           :: Maybe KeyCombination
-  , kDown         :: Maybe KeyCombination
-  , kQuit         :: Maybe KeyCombination
-  , kInstall      :: Maybe KeyCombination
-  , kUninstall    :: Maybe KeyCombination
-  , kSet          :: Maybe KeyCombination
-  , kChangelog    :: Maybe KeyCombination
-  , kShowAll      :: Maybe KeyCombination
-  , kShowAllTools :: Maybe KeyCombination
+  { kUp        :: Maybe Key
+  , kDown      :: Maybe Key
+  , kQuit      :: Maybe Key
+  , kInstall   :: Maybe Key
+  , kUninstall :: Maybe Key
+  , kSet       :: Maybe Key
+  , kChangelog :: Maybe Key
+  , kShowAll   :: Maybe Key
+  , kShowAllTools :: Maybe Key
  }
  deriving (Show, GHC.Generic)

 data KeyBindings = KeyBindings
-  { bUp              :: KeyCombination
-  , bDown            :: KeyCombination
-  , bQuit            :: KeyCombination
-  , bInstall         :: KeyCombination
-  , bUninstall       :: KeyCombination
-  , bSet             :: KeyCombination
-  , bChangelog       :: KeyCombination
-  , bShowAllVersions :: KeyCombination
-  , bShowAllTools    :: KeyCombination
+  { bUp        :: Key
+  , bDown      :: Key
+  , bQuit      :: Key
+  , bInstall   :: Key
+  , bUninstall :: Key
+  , bSet       :: Key
+  , bChangelog :: Key
+  , bShowAllVersions :: Key
+  , bShowAllTools :: Key
  }
  deriving (Show, GHC.Generic)

 instance NFData KeyBindings
-#if !defined(BRICK)
+#if defined(IS_WINDOWS) || !defined(BRICK)
 instance NFData Key
-
-instance NFData Modifier
-
 #endif
-instance NFData KeyCombination

 defaultKeyBindings :: KeyBindings
 defaultKeyBindings = KeyBindings
-  { bUp              = KeyCombination { key = KUp      , mods = [] }
-  , bDown            = KeyCombination { key = KDown    , mods = [] }
-  , bQuit            = KeyCombination { key = KChar 'q', mods = [] }
-  , bInstall         = KeyCombination { key = KChar 'i', mods = [] }
-  , bUninstall       = KeyCombination { key = KChar 'u', mods = [] }
-  , bSet             = KeyCombination { key = KChar 's', mods = [] }
-  , bChangelog       = KeyCombination { key = KChar 'c', mods = [] }
-  , bShowAllVersions = KeyCombination { key = KChar 'a', mods = [] }
-  , bShowAllTools    = KeyCombination { key = KChar 't', mods = [] }
+  { bUp = KUp
+  , bDown = KDown
+  , bQuit = KChar 'q'
+  , bInstall = KChar 'i'
+  , bUninstall = KChar 'u'
+  , bSet = KChar 's'
+  , bChangelog = KChar 'c'
+  , bShowAllVersions = KChar 'a'
+  , bShowAllTools = KChar 't'
  }

 data AppState = AppState
@@ -787,4 +742,3 @@ instance Pretty ToolVersion where
 data BuildSystem = Hadrian
                 | Make
  deriving (Show, Eq)
-
--- a/lib/GHCup/Types/JSON.hs
+++ b/lib/GHCup/Types/JSON.hs
@@ -22,9 +22,7 @@ Portability : portable
 module GHCup.Types.JSON where

 import           GHCup.Types
-import           GHCup.Types.Stack (SetupInfo)
 import           GHCup.Types.JSON.Utils
-import           GHCup.Types.JSON.Versions ()
 import           GHCup.Prelude.MegaParsec

 import           Control.Applicative            ( (<|>) )
@@ -33,9 +31,7 @@ import           Data.Aeson.TH
 import           Data.Aeson.Types        hiding (Key)
 import           Data.ByteString                ( ByteString )
 import           Data.List.NonEmpty             ( NonEmpty(..) )
-import           Data.Maybe
 import           Data.Text.Encoding            as E
-import           Data.Foldable
 import           Data.Versions
 import           Data.Void
 import           URI.ByteString
@@ -116,6 +112,34 @@ instance FromJSONKey GHCTargetVersion where
    Right x -> pure x
    Left  e -> fail $ "Failure in GHCTargetVersion (FromJSONKey)" <> show e

+instance ToJSON Versioning where
+  toJSON = toJSON . prettyV
+
+instance FromJSON Versioning where
+  parseJSON = withText "Versioning" $ \t -> case versioning t of
+    Right x -> pure x
+    Left  e -> fail $ "Failure in GHCTargetVersion (FromJSON)" <> show e
+
+instance ToJSONKey Versioning where
+  toJSONKey = toJSONKeyText $ \x -> prettyV x
+
+instance FromJSONKey Versioning where
+  fromJSONKey = FromJSONKeyTextParser $ \t -> case versioning t of
+    Right x -> pure x
+    Left  e -> fail $ "Failure in Versioning (FromJSONKey)" <> show e
+
+instance ToJSONKey (Maybe Versioning) where
+  toJSONKey = toJSONKeyText $ \case
+    Just x  -> prettyV x
+    Nothing -> T.pack "unknown_versioning"
+
+instance FromJSONKey (Maybe Versioning) where
+  fromJSONKey = FromJSONKeyTextParser $ \t ->
+    if t == T.pack "unknown_versioning" then pure Nothing else just t
+   where
+    just t = case versioning t of
+      Right x -> pure $ Just x
+      Left  e -> fail $ "Failure in (Maybe Versioning) (FromJSONKey)" <> show e

 instance ToJSONKey Platform where
  toJSONKey = toJSONKeyText $ \case
@@ -152,6 +176,43 @@ instance ToJSONKey Architecture where
 instance FromJSONKey Architecture where
  fromJSONKey = genericFromJSONKey defaultJSONKeyOptions

+instance ToJSONKey (Maybe Version) where
+  toJSONKey = toJSONKeyText $ \case
+    Just x  -> prettyVer x
+    Nothing -> T.pack "unknown_version"
+
+instance FromJSONKey (Maybe Version) where
+  fromJSONKey = FromJSONKeyTextParser $ \t ->
+    if t == T.pack "unknown_version" then pure Nothing else just t
+   where
+    just t = case version t of
+      Right x -> pure $ Just x
+      Left  e -> fail $ "Failure in (Maybe Version) (FromJSONKey)" <> show e
+
+instance ToJSON Version where
+  toJSON = toJSON . prettyVer
+
+instance FromJSON Version where
+  parseJSON = withText "Version" $ \t -> case version t of
+    Right x -> pure x
+    Left  e -> fail $ "Failure in Version (FromJSON)" <> show e
+
+instance ToJSONKey Version where
+  toJSONKey = toJSONKeyText $ \x -> prettyVer x
+
+instance FromJSONKey Version where
+  fromJSONKey = FromJSONKeyTextParser $ \t -> case version t of
+    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

@@ -281,64 +342,33 @@ instance FromJSONKey (Maybe VersionRange)  where
      Left  e -> fail $ "Failure in (Maybe VersionRange) (FromJSONKey)" <> MP.errorBundlePretty e


+
 deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''Requirements
 deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''DownloadInfo
 deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''VersionInfo
-
-instance FromJSON GHCupInfo where
-  parseJSON = withObject "GHCupInfo" $ \o -> do
-    toolRequirements' <- o .:? "toolRequirements"
-    globalTools'      <- o .:? "globalTools"
-    ghcupDownloads'   <- o .:  "ghcupDownloads"
-    pure (GHCupInfo (fromMaybe mempty toolRequirements') ghcupDownloads' (fromMaybe mempty globalTools'))
-
-deriveToJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''GHCupInfo
-
-instance ToJSON NewURLSource where
-  toJSON NewGHCupURL       = String "GHCupURL"
-  toJSON NewStackSetupURL  = String "StackSetupURL"
-  toJSON (NewGHCupInfo gi) = object [ "ghcup-info" .= gi ]
-  toJSON (NewSetupInfo si) = object [ "setup-info" .= si ]
-  toJSON (NewURI uri)      = toJSON uri
-
-instance ToJSON URLSource where
-  toJSON = toJSON . fromURLSource
-
+deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''GHCupInfo
+deriveToJSON defaultOptions { sumEncoding = ObjectWithSingleField } ''URLSource
 deriveJSON defaultOptions { sumEncoding = ObjectWithSingleField } ''Key
-deriveJSON defaultOptions { sumEncoding = ObjectWithSingleField } ''Modifier
+deriveJSON defaultOptions { fieldLabelModifier = \str' -> maybe str' T.unpack . T.stripPrefix (T.pack "k-") . T.pack . kebab $ str' } ''UserKeyBindings
 deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel, unwrapUnaryRecords = True } ''Port
 deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel, unwrapUnaryRecords = True } ''Host
 deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''UserInfo
 deriveJSON defaultOptions { fieldLabelModifier = \str' -> maybe str' (T.unpack . T.toLower) . T.stripPrefix (T.pack "authority") . T.pack $ str' } ''Authority
 deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''DownloadMirror
 deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''DownloadMirrors
+deriveToJSON defaultOptions { fieldLabelModifier = kebab } ''Settings
+deriveToJSON defaultOptions { fieldLabelModifier = drop 2 . kebab } ''KeyBindings -- move under key-bindings key

 instance FromJSON URLSource where
  parseJSON v =
        parseGHCupURL v
-    <|> parseStackURL v
    <|> parseOwnSourceLegacy v
    <|> parseOwnSourceNew1 v
    <|> parseOwnSourceNew2 v
    <|> parseOwnSpec v
    <|> legacyParseAddSource v
    <|> newParseAddSource v
-    -- new since Stack SetupInfo
-    <|> parseOwnSpecNew v
-    <|> parseOwnSourceNew3 v
-    <|> newParseAddSource2 v
-    -- more lenient versions
-    <|> parseOwnSpecLenient v
-    <|> parseOwnSourceLenient v
-    <|> parseAddSourceLenient v
-    -- simplified list
-    <|> parseNewUrlSource v
-    <|> parseNewUrlSource' v
   where
-    convert'' :: Either GHCupInfo URI -> Either (Either GHCupInfo SetupInfo) URI
-    convert'' (Left gi)  = Left (Left gi)
-    convert'' (Right uri) = Right uri
-
    parseOwnSourceLegacy = withObject "URLSource" $ \o -> do
      r :: URI <- o .: "OwnSource"
      pure (OwnSource [Right r])
@@ -347,100 +377,18 @@ instance FromJSON URLSource where
      pure (OwnSource (fmap Right r))
    parseOwnSourceNew2 = withObject "URLSource" $ \o -> do
      r :: [Either GHCupInfo URI] <- o .: "OwnSource"
-      pure (OwnSource (convert'' <$> r))
+      pure (OwnSource r)
    parseOwnSpec = withObject "URLSource" $ \o -> do
      r :: GHCupInfo <- o .: "OwnSpec"
-      pure (OwnSpec $ Left r)
+      pure (OwnSpec r)
    parseGHCupURL = withObject "URLSource" $ \o -> do
      _ :: [Value] <- o .: "GHCupURL"
      pure GHCupURL
-    parseStackURL = withObject "URLSource" $ \o -> do
-      _ :: [Value] <- o .: "StackSetupURL"
-      pure StackSetupURL
    legacyParseAddSource = withObject "URLSource" $ \o -> do
      r :: Either GHCupInfo URI <- o .: "AddSource"
-      pure (AddSource [convert'' r])
+      pure (AddSource [r])
    newParseAddSource = withObject "URLSource" $ \o -> do
      r :: [Either GHCupInfo URI] <- o .: "AddSource"
-      pure (AddSource (convert'' <$> r))
-
-    -- new since Stack SetupInfo
-    parseOwnSpecNew = withObject "URLSource" $ \o -> do
-      r :: Either GHCupInfo SetupInfo <- o .: "OwnSpec"
-      pure (OwnSpec r)
-    parseOwnSourceNew3 = withObject "URLSource" $ \o -> do
-      r :: [Either (Either GHCupInfo SetupInfo) URI] <- o .: "OwnSource"
-      pure (OwnSource r)
-    newParseAddSource2 = withObject "URLSource" $ \o -> do
-      r :: [Either (Either GHCupInfo SetupInfo) URI] <- o .: "AddSource"
      pure (AddSource r)

-    -- more lenient versions
-    parseOwnSpecLenient = withObject "URLSource" $ \o -> do
-      spec :: Object <- o .: "OwnSpec"
-      OwnSpec <$> lenientInfoParser spec
-    parseOwnSourceLenient = withObject "URLSource" $ \o -> do
-      mown :: Array <- o .: "OwnSource"
-      OwnSource . toList <$> mapM lenientInfoUriParser mown
-    parseAddSourceLenient = withObject "URLSource" $ \o -> do
-      madd :: Array <- o .: "AddSource"
-      AddSource . toList <$> mapM lenientInfoUriParser madd
-
-    -- simplified
-    parseNewUrlSource = withArray "URLSource" $ \a -> do
-      SimpleList . toList <$> mapM parseJSON a
-    parseNewUrlSource' v' = SimpleList .(:[]) <$> parseJSON v'
-
-
-lenientInfoUriParser :: Value -> Parser (Either (Either GHCupInfo SetupInfo) URI)
-lenientInfoUriParser (Object o) = Left <$> lenientInfoParser o
-lenientInfoUriParser v@(String _) = Right <$> parseJSON v
-lenientInfoUriParser _ = fail "Unexpected json in lenientInfoUriParser"
-
-
-lenientInfoParser :: Object -> Parser (Either GHCupInfo SetupInfo)
-lenientInfoParser o = do
-  setup_info :: Maybe Object <- o .:? "setup-info"
-  case setup_info of
-    Nothing -> do
-      r <- parseJSON (Object o)
-      pure $ Left r
-    Just setup_info' -> do
-      r <- parseJSON (Object setup_info')
-      pure $ Right r
-
-instance FromJSON NewURLSource where
-  parseJSON v = uri v <|> url v <|> gi v <|> si v
-   where
-    uri = withText "NewURLSource" $ \t -> NewURI <$> parseJSON (String t)
-    url = withText "NewURLSource" $ \t -> case T.unpack t of
-                                            "GHCupURL" -> pure NewGHCupURL
-                                            "StackSetupURL" -> pure NewStackSetupURL
-                                            t' -> fail $ "Unexpected text value in NewURLSource: " <> t'
-    gi = withObject "NewURLSource" $ \o -> do
-       ginfo :: GHCupInfo <- o .: "ghcup-info"
-       pure $ NewGHCupInfo ginfo
-
-    si = withObject "NewURLSource" $ \o -> do
-       sinfo :: SetupInfo <- o .: "setup-info"
-       pure $ NewSetupInfo sinfo
-
-
-instance FromJSON KeyCombination where
-  parseJSON v = proper v <|> simple v
-   where
-    simple = withObject "KeyCombination" $ \o -> do
-      k <- parseJSON (Object o)
-      pure (KeyCombination k [])
-    proper = withObject "KeyCombination" $ \o -> do
-      k <- o .: "Key"
-      m <- o .: "Mods"
-      pure $ KeyCombination k m
-
-instance ToJSON KeyCombination where
-  toJSON (KeyCombination k m) = object ["Key" .= k, "Mods" .= m]
-
-deriveToJSON defaultOptions { fieldLabelModifier = drop 2 . kebab } ''KeyBindings -- move under key-bindings key
-deriveJSON defaultOptions { fieldLabelModifier = \str' -> maybe str' T.unpack . T.stripPrefix (T.pack "k-") . T.pack . kebab $ str' } ''UserKeyBindings
 deriveJSON defaultOptions { fieldLabelModifier = \str' -> maybe str' T.unpack . T.stripPrefix (T.pack "u-") . T.pack . kebab $ str' } ''UserSettings
-deriveToJSON defaultOptions { fieldLabelModifier = kebab } ''Settings
--- a/lib/GHCup/Types/JSON/Versions.hs
+++ b/lib/GHCup/Types/JSON/Versions.hs
@@ -1,90 +0,0 @@
-{-# OPTIONS_GHC -Wno-orphans #-}
-
-{-# LANGUAGE DataKinds             #-}
-{-# LANGUAGE FlexibleContexts      #-}
-{-# LANGUAGE FlexibleInstances     #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE TypeFamilies          #-}
-
-{-|
-Module      : GHCup.Types.JSON.Versions
-Description : GHCup Version JSON types/instances
-Copyright   : (c) Julian Ospald, 2020
-License     : LGPL-3.0
-Maintainer  : hasufell@hasufell.de
-Stability   : experimental
-Portability : portable
-}
-module GHCup.Types.JSON.Versions where
-
-import           Data.Aeson              hiding (Key)
-import           Data.Aeson.Types        hiding (Key)
-import           Data.Versions
-
-import qualified Data.Text                     as T
-
-instance ToJSON Versioning where
-  toJSON = toJSON . prettyV
-
-instance FromJSON Versioning where
-  parseJSON = withText "Versioning" $ \t -> case versioning t of
-    Right x -> pure x
-    Left  e -> fail $ "Failure in GHCTargetVersion (FromJSON)" <> show e
-
-instance ToJSONKey Versioning where
-  toJSONKey = toJSONKeyText $ \x -> prettyV x
-
-instance FromJSONKey Versioning where
-  fromJSONKey = FromJSONKeyTextParser $ \t -> case versioning t of
-    Right x -> pure x
-    Left  e -> fail $ "Failure in Versioning (FromJSONKey)" <> show e
-
-instance ToJSONKey (Maybe Versioning) where
-  toJSONKey = toJSONKeyText $ \case
-    Just x  -> prettyV x
-    Nothing -> T.pack "unknown_versioning"
-
-instance FromJSONKey (Maybe Versioning) where
-  fromJSONKey = FromJSONKeyTextParser $ \t ->
-    if t == T.pack "unknown_versioning" then pure Nothing else just t
-   where
-    just t = case versioning t of
-      Right x -> pure $ Just x
-      Left  e -> fail $ "Failure in (Maybe Versioning) (FromJSONKey)" <> show e
-
-instance ToJSONKey (Maybe Version) where
-  toJSONKey = toJSONKeyText $ \case
-    Just x  -> prettyVer x
-    Nothing -> T.pack "unknown_version"
-
-instance FromJSONKey (Maybe Version) where
-  fromJSONKey = FromJSONKeyTextParser $ \t ->
-    if t == T.pack "unknown_version" then pure Nothing else just t
-   where
-    just t = case version t of
-      Right x -> pure $ Just x
-      Left  e -> fail $ "Failure in (Maybe Version) (FromJSONKey)" <> show e
-
-instance ToJSON Version where
-  toJSON = toJSON . prettyVer
-
-instance FromJSON Version where
-  parseJSON = withText "Version" $ \t -> case version t of
-    Right x -> pure x
-    Left  e -> fail $ "Failure in Version (FromJSON)" <> show e
-
-instance ToJSONKey Version where
-  toJSONKey = toJSONKeyText $ \x -> prettyVer x
-
-instance FromJSONKey Version where
-  fromJSONKey = FromJSONKeyTextParser $ \t -> case version t of
-    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
--- a/lib/GHCup/Types/Stack.hs
+++ b/lib/GHCup/Types/Stack.hs
@@ -1,180 +0,0 @@
-{-# OPTIONS_GHC -Wno-orphans #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RecordWildCards #-}
-{-# LANGUAGE FlexibleInstances #-}
-
-{-|
-Module      : GHCup.Types.Stack
-Description : GHCup types.Stack
-Copyright   : (c) Julian Ospald, 2023
-License     : LGPL-3.0
-Maintainer  : hasufell@hasufell.de
-Stability   : experimental
-Portability : portable
-}
-module GHCup.Types.Stack where
-
-import           GHCup.Types.JSON.Versions ()
-
-import           Control.Applicative
-import           Control.DeepSeq                ( NFData )
-import           Data.ByteString
-import           Data.Aeson
-import           Data.Aeson.Types
-import           Data.Map.Strict                ( Map )
-import           Data.Text                      ( Text )
-import           Data.Text.Encoding
-import           Data.Versions
-
-import qualified Data.Map as Map
-import qualified GHC.Generics                  as GHC
-
-
-    --------------------------------------
-    --[ Stack download info copy pasta ]--
-    --------------------------------------
-
-data SetupInfo = SetupInfo
-  { siSevenzExe :: Maybe DownloadInfo
-  , siSevenzDll :: Maybe DownloadInfo
-  , siMsys2     :: Map Text VersionedDownloadInfo
-  , siGHCs      :: Map Text (Map Version GHCDownloadInfo)
-  , siStack     :: Map Text (Map Version DownloadInfo)
-  }
-  deriving (Show, Eq, GHC.Generic)
-
-instance NFData SetupInfo
-
-instance FromJSON SetupInfo where
-  parseJSON = withObject "SetupInfo" $ \o -> do
-    siSevenzExe <- o .:? "sevenzexe-info"
-    siSevenzDll <- o .:? "sevenzdll-info"
-    siMsys2     <- o .:? "msys2"          .!= mempty
-    siGHCs      <- o .:? "ghc"            .!= mempty
-    siStack     <- o .:? "stack"          .!= mempty
-    pure SetupInfo {..}
-
-instance ToJSON SetupInfo where
-  toJSON (SetupInfo {..}) = object [ "sevenzexe-info" .= siSevenzExe
-                                   , "sevenzdll-info" .= siSevenzDll
-                                   , "msys2"          .= siMsys2
-                                   , "ghc"            .= siGHCs
-                                   , "stack"          .= siStack
-                                   ]
-
-- | For the @siGHCs@ field maps are deeply merged. For all fields the values
-- from the first @SetupInfo@ win.
-instance Semigroup SetupInfo where
-  l <> r =
-    SetupInfo
-    { siSevenzExe = siSevenzExe l <|> siSevenzExe r
-    , siSevenzDll = siSevenzDll l <|> siSevenzDll r
-    , siMsys2     = siMsys2 l <> siMsys2 r
-    , siGHCs      = Map.unionWith (<>) (siGHCs l) (siGHCs r)
-    , siStack     = Map.unionWith (<>) (siStack l) (siStack r) }
-
-instance Monoid SetupInfo where
-  mempty =
-    SetupInfo
-    { siSevenzExe = Nothing
-    , siSevenzDll = Nothing
-    , siMsys2     = Map.empty
-    , siGHCs      = Map.empty
-    , siStack     = Map.empty
-    }
-  mappend = (<>)
-
-- | Build of the compiler distribution (e.g. standard, gmp4, tinfo6)
-- | Information for a file to download.
-data DownloadInfo = DownloadInfo
-  { downloadInfoUrl           :: Text
-    -- ^ URL or absolute file path
-  , downloadInfoContentLength :: Maybe Int
-  , downloadInfoSha1          :: Maybe ByteString
-  , downloadInfoSha256        :: Maybe ByteString
-  }
-  deriving (Show, Eq, GHC.Generic)
-
-instance ToJSON DownloadInfo where
-  toJSON (DownloadInfo {..}) = object [ "url"            .= downloadInfoUrl
-                                      , "content-length" .= downloadInfoContentLength
-                                      , "sha1"           .= (decodeUtf8 <$> downloadInfoSha1)
-                                      , "sha256"         .= (decodeUtf8 <$> downloadInfoSha256)
-                                      ]
-
-instance NFData DownloadInfo
-
-instance FromJSON DownloadInfo where
-  parseJSON = withObject "DownloadInfo" parseDownloadInfoFromObject
-
-- | Parse JSON in existing object for 'DownloadInfo'
-parseDownloadInfoFromObject :: Object -> Parser DownloadInfo
-parseDownloadInfoFromObject o = do
-  url           <- o .: "url"
-  contentLength <- o .:? "content-length"
-  sha1TextMay   <- o .:? "sha1"
-  sha256TextMay <- o .:? "sha256"
-  pure
-    DownloadInfo
-    { downloadInfoUrl           = url
-    , downloadInfoContentLength = contentLength
-    , downloadInfoSha1          = fmap encodeUtf8 sha1TextMay
-    , downloadInfoSha256        = fmap encodeUtf8 sha256TextMay
-    }
-
-data VersionedDownloadInfo = VersionedDownloadInfo
-  { vdiVersion      :: Version
-  , vdiDownloadInfo :: DownloadInfo
-  }
-  deriving (Show, Eq, GHC.Generic)
-
-instance ToJSON VersionedDownloadInfo where
-  toJSON (VersionedDownloadInfo {vdiDownloadInfo = DownloadInfo{..}, ..})
-    = object [ "version"        .= vdiVersion
-             , "url"            .= downloadInfoUrl
-             , "content-length" .= downloadInfoContentLength
-             , "sha1"           .= (decodeUtf8 <$> downloadInfoSha1)
-             , "sha256"         .= (decodeUtf8 <$> downloadInfoSha256)
-             ]
-
-instance NFData VersionedDownloadInfo
-
-instance FromJSON VersionedDownloadInfo where
-  parseJSON = withObject "VersionedDownloadInfo" $ \o -> do
-    ver'         <- o .: "version"
-    downloadInfo <- parseDownloadInfoFromObject o
-    pure VersionedDownloadInfo
-      { vdiVersion      = ver'
-      , vdiDownloadInfo = downloadInfo
-      }
-
-data GHCDownloadInfo = GHCDownloadInfo
-  { gdiConfigureOpts :: [Text]
-  , gdiConfigureEnv  :: Map Text Text
-  , gdiDownloadInfo  :: DownloadInfo
-  }
-  deriving (Show, Eq, GHC.Generic)
-
-instance NFData GHCDownloadInfo
-
-instance ToJSON GHCDownloadInfo where
-  toJSON (GHCDownloadInfo {gdiDownloadInfo = DownloadInfo {..}, ..})
-    = object [ "configure-opts" .= gdiConfigureOpts
-             , "configure-env"  .= gdiConfigureEnv
-             , "url"            .= downloadInfoUrl
-             , "content-length" .= downloadInfoContentLength
-             , "sha1"           .= (decodeUtf8 <$> downloadInfoSha1)
-             , "sha256"         .= (decodeUtf8 <$> downloadInfoSha256)
-             ]
-
-instance FromJSON GHCDownloadInfo where
-  parseJSON = withObject "GHCDownloadInfo" $ \o -> do
-    configureOpts <- o .:? "configure-opts" .!= mempty
-    configureEnv  <- o .:? "configure-env"  .!= mempty
-    downloadInfo  <- parseDownloadInfoFromObject o
-    pure GHCDownloadInfo
-      { gdiConfigureOpts = configureOpts
-      , gdiConfigureEnv  = configureEnv
-      , gdiDownloadInfo  = downloadInfo
-      }
-
--- a/lib/GHCup/Utils.hs
+++ b/lib/GHCup/Utils.hs
@@ -49,6 +49,7 @@ import           GHCup.Prelude.Logger.Internal
 import           GHCup.Prelude.MegaParsec
 import           GHCup.Prelude.Process
 import           GHCup.Prelude.String.QQ
+
 import           Codec.Archive           hiding ( Directory )
 import           Control.Applicative
 import           Control.Exception.Safe
@@ -89,9 +90,9 @@ import qualified Data.Text.Encoding            as E
 import qualified Text.Megaparsec               as MP
 import qualified Data.List.NonEmpty            as NE
 import qualified Streamly.Prelude              as S
-
 import Control.DeepSeq (force)
 import GHC.IO (evaluate)
+import System.Environment (getEnvironment, setEnv)
 import Data.Time (Day(..), diffDays, addDays)


@@ -368,9 +369,7 @@ cabalSet = do
  handleIO' NoSuchThing (\_ -> pure Nothing) $ do
    broken <- liftIO $ isBrokenSymlink cabalbin
    if broken
-      then do
-        logWarn $ "Broken symlink at " <> T.pack cabalbin
-        pure Nothing
+      then pure Nothing
      else do
        link <- liftIO
          $ handleIO' InvalidArgument
@@ -467,9 +466,7 @@ stackSet = do
  handleIO' NoSuchThing (\_ -> pure Nothing) $ do
    broken <- liftIO $ isBrokenSymlink stackBin
    if broken
-      then do
-        logWarn $ "Broken symlink at " <> T.pack stackBin
-        pure Nothing
+      then pure Nothing
      else do
        link <- liftIO
          $ handleIO' InvalidArgument
@@ -523,17 +520,15 @@ isLegacyHLS ver = do


 -- Return the currently set hls version, if any.
-hlsSet :: (HasLog env, MonadReader env m, HasDirs env, MonadIO m, MonadThrow m, MonadCatch m) => m (Maybe Version)
+hlsSet :: (MonadReader env m, HasDirs env, MonadIO m, MonadThrow m, MonadCatch m) => m (Maybe Version)
 hlsSet = do
  Dirs {..}  <- getDirs
  let hlsBin = binDir </> "haskell-language-server-wrapper" <> exeExt

-  handleIO' NoSuchThing (\_ -> pure Nothing) $ do
-    broken <- liftIO $ isBrokenSymlink hlsBin
+  liftIO $ handleIO' NoSuchThing (\_ -> pure Nothing) $ do
+    broken <- isBrokenSymlink hlsBin
    if broken
-      then do
-        logWarn $ "Broken symlink at " <> T.pack hlsBin
-        pure Nothing
+      then pure Nothing
      else do
        link <- liftIO $ getLinkTarget hlsBin
        Just <$> linkVersion link
@@ -561,7 +556,6 @@ hlsSet = do
 -- | Return the GHC versions the currently selected HLS supports.
 hlsGHCVersions :: ( MonadReader env m
                  , HasDirs env
-                  , HasLog env
                  , MonadIO m
                  , MonadThrow m
                  , MonadCatch m
@@ -1085,7 +1079,7 @@ darwinNotarization :: (MonadReader env m, HasDirs env, MonadIO m)
                   -> FilePath
                   -> m (Either ProcessError ())
 darwinNotarization Darwin path = exec
-  "/usr/bin/xattr"
+  "xattr"
  ["-r", "-d", "com.apple.quarantine", path]
  Nothing
  Nothing
@@ -1320,6 +1314,22 @@ warnAboutHlsCompatibility = do



+addToPath :: FilePath
+          -> Bool         -- ^ if False will prepend
+          -> IO [(String, String)]
+addToPath path append = do
+ cEnv <- Map.fromList <$> getEnvironment
+ let paths          = ["PATH", "Path"]
+     curPaths       = (\x -> maybe [] splitSearchPath (Map.lookup x cEnv)) =<< paths
+     {- HLINT ignore "Redundant bracket" -}
+     newPath        = intercalate [searchPathSeparator] (if append then (curPaths ++ [path]) else (path : curPaths))
+     envWithoutPath = foldr (\x y -> Map.delete x y) cEnv paths
+     pathVar        = if isWindows then "Path" else "PATH"
+     envWithNewPath = Map.toList $ Map.insert pathVar newPath envWithoutPath
+ liftIO $ setEnv pathVar newPath
+ return envWithNewPath
+
+
    -----------
    --[ Git ]--
    -----------
--- a/lib/GHCup/Version.hs
+++ b/lib/GHCup/Version.hs
@@ -34,10 +34,7 @@ import Data.Void (Void)
 -- Note that when updating this, CI requires that the file exsists AND the same file exists at
 -- 'https://www.haskell.org/ghcup/exp/ghcup-<ver>.yaml' with some newlines added.
 ghcupURL :: URI
-ghcupURL = [uri|https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-0.0.8.yaml|]
-
-stackSetupURL :: URI
-stackSetupURL = [uri|https://raw.githubusercontent.com/commercialhaskell/stackage-content/master/stack/stack-setup-2.yaml|]
+ghcupURL = [uri|https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-0.0.7.yaml|]

 -- | The current ghcup version.
 ghcUpVer :: V.PVP
@@ -56,7 +53,7 @@ versionCmp ver1 (VR_eq ver2)   = ver1 == ver2

 versionRange :: V.Versioning -> VersionRange -> Bool
 versionRange ver' (SimpleRange cmps) = all (versionCmp ver') cmps
-versionRange ver' (OrRange cmps range) =
+versionRange ver' (OrRange cmps range) = 
  versionRange ver' (SimpleRange cmps) || versionRange ver' range

 pvpToVersion :: MonadThrow m => V.PVP -> Text -> m V.Version
--- a/scripts/bootstrap/bootstrap-haskell
+++ b/scripts/bootstrap/bootstrap-haskell
@@ -172,8 +172,9 @@ _done() {
 				green "Start a new haskell project in the current directory via:"
 				green "  cabal init --interactive"
 				green
-				green "To install other GHC versions and tools, run:"
-				green "  ghcup tui"
+				green "Install other GHC versions and tools via:"
+				green "  ghcup list"
+				green "  ghcup install <tool> <version>"
 				green
 				green "To install system libraries and update msys2/mingw64,"
 				green "open the \"Mingw haskell shell\""
--- a/scripts/bootstrap/bootstrap-haskell.ps1
+++ b/scripts/bootstrap/bootstrap-haskell.ps1
@@ -11,7 +11,7 @@
    * cabal - The Cabal build tool for managing Haskell software"
    * stack - (optional) A cross-platform program for developing Haskell projects"
    * hls   - (optional) A language server for developers to integrate with their editor/IDE"
-
+    
 	By default, the installation is non-interactive, unless you run it with 'Interactive $true'.
 #>
 param (
@@ -42,9 +42,7 @@ param (
    # The Msys2 version to download (e.g. 20221216)
    [string]$Msys2Version,
    # The Msys2 sha256sum hash
-    [string]$Msys2Hash,
-    # Whether to disable creation of several desktop shortcuts
-    [switch]$DontWriteDesktopShortcuts
+    [string]$Msys2Hash
 )

 $DefaultMsys2Version = "20221216"
@@ -141,7 +139,7 @@ filter Get-FileSize {
 function Get-FileWCSynchronous{
    param(
        [Parameter(Mandatory=$true)]
-        [string]$url,
+        [string]$url, 
        [string]$destinationFolder="$env:USERPROFILE\Downloads",
        [switch]$includeStats
    )
@@ -231,7 +229,7 @@ if ($GhcupBasePrefixEnv) {
    Print-Msg -color Green -msg ("Picked {0} as default Install prefix!" -f $defaultGhcupBasePrefix)
  } else {
    Print-Msg -color Red -msg "Couldn't find a writable partition with at least 5GB free disk space!"
-    Exit 1
+    Exit 1    
  }
 }

@@ -276,7 +274,7 @@ Press enter to accept the default [{0}]:
    if (!($GhcupBasePrefix.EndsWith('\'))) {
      $GhcupBasePrefix = ('{0}\' -f $GhcupBasePrefix)
    }
-
+  
    $GhcupBasePrefix = $GhcupBasePrefix.TrimEnd().TrimStart()
    if (!($GhcupBasePrefix)) {
      Print-Msg -color Red -msg "No directory specified!"
@@ -352,7 +350,7 @@ if ($CabalDir) {
  $CabDirEnv = $CabalDir
  if (!($CabDirEnv)) {
    Print-Msg -color Red -msg "No directory specified!"
-    Exit 1
+    Exit 1        
  } elseif (!(Split-Path -IsAbsolute -Path "$CabDirEnv")) {
    Print-Msg -color Red -msg "Invalid/Non-absolute Path specified"
    Exit 1
@@ -367,7 +365,7 @@ if ($CabalDir) {

    $CabDirEnv = $CabDirEnv.TrimEnd().TrimStart()
    if (!($CabDirEnv)) {
-      Print-Msg -color Red -msg "No directory specified!"
+      Print-Msg -color Red -msg "No directory specified!"         
    } elseif (!(Split-Path -IsAbsolute -Path "$CabDirEnv")) {
      Print-Msg -color Red -msg "Invalid/Non-absolute Path specified"
    } else {
@@ -412,26 +410,6 @@ if (!($InstallStack)) {
  }
 }

-if ($Interactive) {
-	$DesktopDecision = $Host.UI.PromptForChoice('Create Desktop shortcuts'
-                                        , 'Do you want to create convenience desktop shortcuts (e.g. for uninstallation and msys2 shell)?'
-                                        , [System.Management.Automation.Host.ChoiceDescription[]] @('&Yes'
-                                            '&No'
-                                            '&Abort'), 0)
-	if ($DesktopDecision -eq 0) {
-      $InstallDesktopShortcuts = $true
-    } elseif ($DesktopDecision -eq 2) {
-      Exit 0
-    }
-} else {
-	if ($Minimal) {
-      $InstallDesktopShortcuts = $false
-	} elseif ($DontWriteDesktopShortcuts) {
-      $InstallDesktopShortcuts = $false
-	} else {
-      $InstallDesktopShortcuts = $true
-	}
-}

 # mingw foo
 Print-Msg -msg 'First checking for Msys2...'
@@ -507,12 +485,12 @@ if (!(Test-Path -Path ('{0}' -f $MsysDir))) {
        $MsysDirPrompt = Read-Host
        $MsysDir = ($defaultMsys2Dir,$MsysDirPrompt)[[bool]$MsysDirPrompt]
      } else {
-        Print-Msg -color Magenta -msg 'Input existing MSys2 toolchain directory:'
+        Print-Msg -color Magenta -msg 'Input existing MSys2 toolchain directory:' 
        $MsysDir = Read-Host
      }
      $MsysDir = $MsysDir.TrimEnd().TrimStart()
      if (!($MsysDir)) {
-        Print-Msg -color Red -msg "No directory specified!"
+        Print-Msg -color Red -msg "No directory specified!"         
      } elseif (!(Test-Path -LiteralPath ('{0}' -f $MsysDir))) {
        Print-Msg -color Red -msg ('MSys2 installation at ''{0}'' could not be found!' -f $MsysDir)
      } elseif (!(Split-Path -IsAbsolute -Path "$MsysDir")) {
@@ -532,11 +510,8 @@ if (!(Test-Path -Path ('{0}' -f $MsysDir))) {
 	Start-Sleep -s 5
 }

-
-if ($InstallDesktopShortcuts) {
-
-	Print-Msg -msg 'Creating shortcuts...'
-	$uninstallShortCut = @'
+Print-Msg -msg 'Creating shortcuts...'
+$uninstallShortCut = @'
 $decision = $Host.UI.PromptForChoice('Uninstall Haskell'
 , 'Do you want to uninstall all of the haskell toolchain, including GHC, Cabal, Stack and GHCup itself?'
 , [System.Management.Automation.Host.ChoiceDescription[]] @('&Uninstall'
@@ -598,13 +573,12 @@ if ($Host.Name -eq "ConsoleHost")
 }
 '@

-	$GhcInstArgs = '-mingw64 -mintty -c "pacman --noconfirm -S --needed base-devel gettext autoconf make libtool automake python p7zip patch unzip"'
-	Create-Shortcut -SourceExe ('{0}\msys2_shell.cmd' -f $MsysDir) -ArgumentsToSourceExe $GhcInstArgs -DestinationPath 'Install GHC dev dependencies.lnk' -TempPath $GhcupDir
-	Create-Shortcut -SourceExe ('{0}\msys2_shell.cmd' -f $MsysDir) -ArgumentsToSourceExe '-mingw64' -DestinationPath 'Mingw haskell shell.lnk' -TempPath $GhcupDir
-	Create-Shortcut -SourceExe 'https://www.msys2.org/docs/package-management' -ArgumentsToSourceExe '' -DestinationPath 'Mingw package management docs.url' -TempPath $GhcupDir
-	$DesktopDir = [Environment]::GetFolderPath("Desktop")
-	$null = New-Item -Path $DesktopDir -Name "Uninstall Haskell.ps1" -ItemType "file" -Force -Value $uninstallShortCut
-}
+$GhcInstArgs = '-mingw64 -mintty -c "pacman --noconfirm -S --needed base-devel gettext autoconf make libtool automake python p7zip patch unzip"'
+Create-Shortcut -SourceExe ('{0}\msys2_shell.cmd' -f $MsysDir) -ArgumentsToSourceExe $GhcInstArgs -DestinationPath 'Install GHC dev dependencies.lnk' -TempPath $GhcupDir
+Create-Shortcut -SourceExe ('{0}\msys2_shell.cmd' -f $MsysDir) -ArgumentsToSourceExe '-mingw64' -DestinationPath 'Mingw haskell shell.lnk' -TempPath $GhcupDir
+Create-Shortcut -SourceExe 'https://www.msys2.org/docs/package-management' -ArgumentsToSourceExe '' -DestinationPath 'Mingw package management docs.url' -TempPath $GhcupDir
+$DesktopDir = [Environment]::GetFolderPath("Desktop")
+$null = New-Item -Path $DesktopDir -Name "Uninstall Haskell.ps1" -ItemType "file" -Force -Value $uninstallShortCut

 Print-Msg -msg ('Adding {0}\bin to Users Path...' -f $GhcupDir)
 Add-EnvPath -Path ('{0}\bin' -f ([System.IO.Path]::GetFullPath("$GhcupDir"))) -Container 'User'
--- a/scripts/hooks/stack/ghc-install.sh
+++ b/scripts/hooks/stack/ghc-install.sh
@@ -9,8 +9,8 @@ set -eu

 case $HOOK_GHC_TYPE in
    bindist)
-        ghc_path=$(ghcup whereis ghc "$HOOK_GHC_VERSION" || { ghcup install ghc "$HOOK_GHC_VERSION" >/dev/null && ghcup whereis ghc "$HOOK_GHC_VERSION" ; }) || { >&2 echo "Installing $HOOK_GHC_VERSION via ghcup failed" exit 3 ;}
-        printf "%s" "${ghc_path}"
+        ghcdir=$(ghcup whereis --directory ghc "$HOOK_GHC_VERSION" || ghcup run --ghc "$HOOK_GHC_VERSION" --install) || exit 3
+        printf "%s/ghc" "${ghcdir}"
        ;;
    git)
        # TODO: should be somewhat possible
--- a/test/ghcup-test/golden/windows/GHCupInfo.json
+++ b/test/ghcup-test/golden/windows/GHCupInfo.json
--- a/test/optparse-test/ConfigTest.hs
+++ b/test/optparse-test/ConfigTest.hs
@@ -5,7 +5,6 @@ module ConfigTest where
 import Test.Tasty
 import Test.Tasty.HUnit
 import GHCup.OptParse
-import GHCup.Types (NewURLSource(..))
 import Utils
 import Control.Monad.IO.Class
 import URI.ByteString.QQ
@@ -24,13 +23,7 @@ checkList =
  , ("config init", InitConfig)
  , ("config show", ShowConfig)
  , ("config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml"
-    , AddReleaseChannel False (NewURI [uri|https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml|])
-    )
-  , ("config add-release-channel GHCupURL"
-    , AddReleaseChannel False NewGHCupURL
-    )
-  , ("config add-release-channel StackSetupURL"
-    , AddReleaseChannel False NewStackSetupURL
+    , AddReleaseChannel False [uri|https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml|]
    )
  , ("config set cache true", SetConfig "cache" (Just "true"))
  ]
Author	SHA1	Message	Date
Julian Ospald	16ae69e994	Fix property tests	2023-10-13 18:08:16 +08:00
Julian Ospald	94888e9d8e	Add temp git ref to versions to fix CI	2023-10-13 17:52:39 +08:00
Colin Woodbury	cc7cc8c0e4	refactor: use upstream TH constructors	2023-10-13 17:35:39 +09:00
Colin Woodbury	28cb01539d	chore: bump `versions` upper bound and squash warnings	2023-10-13 17:31:17 +09:00
Colin Woodbury	8aa05f311e	refactor: upgrade `versions` library usage	2023-10-13 17:09:35 +09:00