Remove zip dependency

Merge branch 'remove-string-interpolate'
2021-08-25 20:13:17 +02:00 · 2021-08-25 20:12:56 +02:00
24 changed files with 143 additions and 507 deletions
--- a/app/ghcup/Main.hs
+++ b/app/ghcup/Main.hs
@@ -30,7 +30,6 @@ import           GHCup.Utils.Prelude
 import           GHCup.Utils.String.QQ
 import           GHCup.Version

-import           Cabal.Plan ( findPlanJson, SearchPlanJson(..) )
 import           Codec.Archive
 import           Control.Concurrent
 import           Control.Concurrent.Async
@@ -43,8 +42,6 @@ import           Control.Monad.Fail             ( MonadFail )
 import           Control.Monad.Logger
 import           Control.Monad.Reader
 import           Control.Monad.Trans.Resource
-import           Data.Aeson                     ( decodeStrict', Value )
-import           Data.Aeson.Encode.Pretty       ( encodePretty )
 import           Data.Bifunctor
 import           Data.Char
 import           Data.Either
@@ -1366,16 +1363,6 @@ describe_result = $( LitE . StringL <$>
                     )
                   )

-plan_json :: String
-plan_json = $( LitE . StringL <$>
-                     runIO (handleIO (\_ -> pure "") $ do
-                             fp <- findPlanJson (ProjectRelativeToDir ".")
-                             c <- B.readFile fp
-                             (Just res) <- pure $ decodeStrict' @Value c
-                             pure $ T.unpack $ decUTF8Safe' $ encodePretty res
-                     )
-                   )
-
 formatConfig :: UserSettings -> String
 formatConfig settings
  = UTF8.toString . YP.encodePretty yamlConfig $ settings
@@ -1394,9 +1381,6 @@ main = do
          (head . lines $ describe_result)
        )
        (long "version" <> help "Show version" <> hidden)
-  let planJson = infoOption
-        plan_json
-        (long "plan-json" <> help "Show the build-time configuration" <> internal)
  let numericVersionHelp = infoOption
        numericVer
        (  long "numeric-version"
@@ -1424,7 +1408,7 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]

  customExecParser
      (prefs showHelpOnError)
-      (info (opts <**> helper <**> versionHelp <**> numericVersionHelp <**> planJson <**> listCommands)
+      (info (opts <**> helper <**> versionHelp <**> numericVersionHelp <**> listCommands)
            (footerDoc (Just $ text main_footer))
      )
    >>= \opt@Options {..} -> do
--- a/37
+++ b/37
@@ -3,7 +3,6 @@
 # Main settings:
 #   * BOOTSTRAP_HASKELL_NONINTERACTIVE - any nonzero value for noninteractive installation
 #   * BOOTSTRAP_HASKELL_NO_UPGRADE - any nonzero value to not trigger the upgrade
-#   * BOOTSTRAP_HASKELL_MINIMAL - any nonzero value to only install ghcup
 #   * GHCUP_USE_XDG_DIRS - any nonzero value to respect The XDG Base Directory Specification
 #   * BOOTSTRAP_HASKELL_VERBOSE - any nonzero value for more verbose installation
 #   * BOOTSTRAP_HASKELL_GHC_VERSION - the ghc version to install
@@ -592,12 +591,10 @@ ask_bashrc
 ask_bashrc_answer=$?
 ask_cabal_config_init
 ask_cabal_config_init_answer=$?
-if [ -z "${BOOTSTRAP_HASKELL_MINIMAL}" ] ; then
-	ask_hls
-	ask_hls_answer=$?
-	ask_stack
-	ask_stack_answer=$?
-fi
+ask_hls
+ask_hls_answer=$?
+ask_stack
+ask_stack_answer=$?

 edo mkdir -p "${GHCUP_BIN}"

@@ -623,30 +620,14 @@ if [ -z "${BOOTSTRAP_HASKELL_NONINTERACTIVE}" ] ; then
    read -r answer </dev/tty
 fi

-if [ -z "${BOOTSTRAP_HASKELL_MINIMAL}" ] ; then
-	eghcup --cache install ghc "${BOOTSTRAP_HASKELL_GHC_VERSION}"
+eghcup --cache install ghc "${BOOTSTRAP_HASKELL_GHC_VERSION}"

-	eghcup set ghc "${BOOTSTRAP_HASKELL_GHC_VERSION}"
-	eghcup --cache install cabal "${BOOTSTRAP_HASKELL_CABAL_VERSION}"
+eghcup set ghc "${BOOTSTRAP_HASKELL_GHC_VERSION}"
+eghcup --cache install cabal "${BOOTSTRAP_HASKELL_CABAL_VERSION}"

-	do_cabal_config_init $ask_cabal_config_init_answer
+do_cabal_config_init $ask_cabal_config_init_answer

-	edo cabal new-update
-else # don't install ghc and cabal
-	case "${plat}" in
-			MSYS*|MINGW*)
-				# need to bootstrap cabal to initialize config on windows
-				# we'll remove it afterwards
-				tmp_dir="$(mktemp -d)"
-				eghcup --cache install cabal -i "${tmp_dir}" "${BOOTSTRAP_HASKELL_CABAL_VERSION}"
-				PATH="${tmp_dir}:$PATH" do_cabal_config_init $ask_cabal_config_init_answer
-				rm "${tmp_dir}/cabal"
-				unset tmp_dir
-				;;
-			*)
-				;;
-	esac
-fi
+edo cabal new-update

 case $ask_hls_answer in
 	1)
--- a/bootstrap-haskell.ps1
+++ b/bootstrap-haskell.ps1
@@ -32,9 +32,7 @@ param (
    # Whether to install hls as well
    [switch]$InstallHLS,
    # Skip adjusting cabal.config with mingw paths
-    [switch]$NoAdjustCabalConfig,
-    # Do minimal installation of ghcup and msys2 only
-    [switch]$Minimal
+    [switch]$NoAdjustCabalConfig
 )

 $Silent = !$Interactive
@@ -531,14 +529,10 @@ if (!($NoAdjustCabalConfig)) {
  $AdjustCabalConfigExport = 'export BOOTSTRAP_HASKELL_ADJUST_CABAL_CONFIG=1 ;'
 }

-if ($Minimal) {
-  $MinimalExport = 'export BOOTSTRAP_HASKELL_MINIMAL=1 ;'
-}
-
 if ((Get-Process -ID $PID).ProcessName.StartsWith("bootstrap-haskell") -Or $InBash) {
-  Exec "$Bash" '-lc' ('{4} {6} {7} {8} {9} [ -n ''{1}'' ] && export GHCUP_MSYS2=$(cygpath -m ''{1}'') ; [ -n ''{2}'' ] && export GHCUP_INSTALL_BASE_PREFIX=$(cygpath -m ''{2}/'') ; export PATH=$(cygpath -u ''{3}/bin''):$PATH ; export CABAL_DIR=''{5}'' ; [[ ''{0}'' = https* ]]  && curl --proto ''=https'' --tlsv1.2 -sSf {0} | bash || cat $(cygpath -m ''{0}'') | bash' -f $BootstrapUrl, $MsysDir, $GhcupBasePrefix, $GhcupDir, $SilentExport, $CabalDirFull, $StackInstallExport, $HLSInstallExport, $AdjustCabalConfigExport, $MinimalExport)
+  Exec "$Bash" '-lc' ('{4} {6} {7} {8} [ -n ''{1}'' ] && export GHCUP_MSYS2=$(cygpath -m ''{1}'') ; [ -n ''{2}'' ] && export GHCUP_INSTALL_BASE_PREFIX=$(cygpath -m ''{2}/'') ; export PATH=$(cygpath -u ''{3}/bin''):$PATH ; export CABAL_DIR=''{5}'' ; [[ ''{0}'' = https* ]]  && curl --proto ''=https'' --tlsv1.2 -sSf {0} | bash || cat $(cygpath -m ''{0}'') | bash' -f $BootstrapUrl, $MsysDir, $GhcupBasePrefix, $GhcupDir, $SilentExport, $CabalDirFull, $StackInstallExport, $HLSInstallExport, $AdjustCabalConfigExport)
 } else {
-  Exec "$Msys2Shell" '-mingw64' '-mintty' '-c' ('{4} {6} {7} {8} {9} [ -n ''{1}'' ] && export GHCUP_MSYS2=$(cygpath -m ''{1}'') ; [ -n ''{2}'' ] && export GHCUP_INSTALL_BASE_PREFIX=$(cygpath -m ''{2}/'') ; export PATH=$(cygpath -u ''{3}/bin''):$PATH ; export CABAL_DIR=''{5}'' ; trap ''echo Press any key to exit && read -n 1 && exit'' 2 ; [[ ''{0}'' = https* ]]  && curl --proto ''=https'' --tlsv1.2 -sSf {0} | bash || cat $(cygpath -m ''{0}'') | bash ; echo ''Press any key to exit'' && read -n 1' -f $BootstrapUrl, $MsysDir, $GhcupBasePrefix, $GhcupDir, $SilentExport, $CabalDirFull, $StackInstallExport, $HLSInstallExport, $AdjustCabalConfigExport, $MinimalExport)
+  Exec "$Msys2Shell" '-mingw64' '-mintty' '-c' ('{4} {6} {7} {8} [ -n ''{1}'' ] && export GHCUP_MSYS2=$(cygpath -m ''{1}'') ; [ -n ''{2}'' ] && export GHCUP_INSTALL_BASE_PREFIX=$(cygpath -m ''{2}/'') ; export PATH=$(cygpath -u ''{3}/bin''):$PATH ; export CABAL_DIR=''{5}'' ; trap ''echo Press any key to exit && read -n 1 && exit'' 2 ; [[ ''{0}'' = https* ]]  && curl --proto ''=https'' --tlsv1.2 -sSf {0} | bash || cat $(cygpath -m ''{0}'') | bash ; echo ''Press any key to exit'' && read -n 1' -f $BootstrapUrl, $MsysDir, $GhcupBasePrefix, $GhcupDir, $SilentExport, $CabalDirFull, $StackInstallExport, $HLSInstallExport, $AdjustCabalConfigExport)
 }


--- a/cabal.ghc8105.project
+++ b/cabal.ghc8105.project
@@ -10,25 +10,24 @@ package ghcup

 source-repository-package
    type: git
-    location: https://github.com/bgamari/terminal-size
-    tag: 34ea816bd63f75f800eedac12c6908c6f3736036
+    location: https://github.com/jtdaugherty/brick.git
+    tag: b3b96cfe66dfd398d338e3feb2b6855e66a35190

 source-repository-package
    type: git
-    location: https://github.com/hasufell/libarchive
-    tag: 024a7e8ab7b4d3848dc64dca1e70a04831eedc99
+    location: https://github.com/Bodigrim/tar
+    tag: ac197ec7ea4838dc2b4e22b9b888b080cedf29cf
+
+source-repository-package
+    type: git
+    location: https://github.com/bgamari/terminal-size
+    tag: 34ea816bd63f75f800eedac12c6908c6f3736036

 constraints: http-io-streams -brotli

 package libarchive
  flags: -system-libarchive

-package aeson-pretty
-  flags: +lib-only
-
-package cabal-plan
-  flags: -exe
-
 allow-newer: base, ghc-prim, template-haskell, language-c

-with-compiler: ghc-8.10.7
+with-compiler: ghc-8.10.5
--- a/cabal.ghc8105.project.freeze
+++ b/cabal.ghc8105.project.freeze
@@ -1,7 +1,7 @@
 active-repositories: hackage.haskell.org:merge
 constraints: any.Cabal ==3.2.1.0,
             any.HUnit ==1.6.2.0,
-             any.HsOpenSSL ==0.11.7.1,
+             any.HsOpenSSL ==0.11.7,
             HsOpenSSL -fast-bignum -homebrew-openssl -macports-openssl -use-pkg-config,
             any.QuickCheck ==2.14.2,
             QuickCheck -old-random +templatehaskell,
@@ -9,7 +9,7 @@ constraints: any.Cabal ==3.2.1.0,
             any.aeson ==1.5.6.0,
             aeson -bytestring-builder -cffi -developer -fast,
             any.aeson-pretty ==0.8.8,
-             aeson-pretty +lib-only,
+             aeson-pretty -lib-only,
             any.alex ==3.2.6,
             alex +small_base,
             any.ansi-terminal ==0.11,
@@ -23,7 +23,7 @@ constraints: any.Cabal ==3.2.1.0,
             any.attoparsec ==0.13.2.5,
             attoparsec -developer,
             any.auto-update ==0.1.6,
-             any.base ==4.14.3.0,
+             any.base ==4.14.2.0,
             any.base-compat ==0.11.2,
             any.base-compat-batteries ==0.11.2,
             any.base-orphans ==0.8.4,
@@ -34,7 +34,7 @@ constraints: any.Cabal ==3.2.1.0,
             any.binary ==0.8.8.0,
             any.bindings-DSL ==1.0.25,
             any.blaze-builder ==0.4.2.1,
-             any.brick ==0.64,
+             any.brick ==0.63,
             brick -demos,
             any.bytestring ==0.10.12.0,
             any.bz2 ==1.0.1.0,
@@ -42,8 +42,6 @@ constraints: any.Cabal ==3.2.1.0,
             any.bzlib-conduit ==0.3.0.2,
             any.c2hs ==0.28.8,
             c2hs +base3 -regression,
-             any.cabal-plan ==0.7.2.0,
-             cabal-plan -_ -exe -license-report,
             any.call-stack ==0.4.0,
             any.case-insensitive ==1.2.1.0,
             any.casing ==0.1.4.1,
@@ -54,6 +52,8 @@ constraints: any.Cabal ==3.2.1.0,
             chs-deps -cross,
             any.clock ==0.8.2,
             clock -llvm,
+             any.cmdargs ==0.10.21,
+             cmdargs +quotation -testprog,
             any.colour ==2.3.6,
             any.comonad ==5.0.8,
             comonad +containers +distributive +indexed-traversable,
@@ -65,8 +65,8 @@ constraints: any.Cabal ==3.2.1.0,
             any.conduit-zstd ==0.0.2.0,
             any.config-ini ==0.2.4.0,
             config-ini -enable-doctests,
-             any.containers ==0.6.5.1,
-             any.contravariant ==1.5.5,
+             any.containers ==0.6.4.1,
+             any.contravariant ==1.5.4,
             contravariant +semigroups +statevar +tagged,
             any.cpphs ==1.20.9.1,
             cpphs -old-locale,
@@ -75,7 +75,7 @@ constraints: any.Cabal ==3.2.1.0,
             cryptohash-sha256 -exe +use-cbits,
             any.data-clist ==0.1.2.3,
             any.data-default-class ==0.1.2.0,
-             any.data-fix ==0.3.2,
+             any.data-fix ==0.3.1,
             any.deepseq ==1.4.4.0,
             any.digest ==0.0.1.3,
             digest -bytestring-in-base,
@@ -86,26 +86,32 @@ constraints: any.Cabal ==3.2.1.0,
             any.dlist ==1.0,
             dlist -werror,
             any.easy-file ==0.2.2,
+             any.errors ==2.3.0,
             any.exceptions ==0.10.4,
             any.extra ==1.7.9,
             any.fast-logger ==3.0.5,
             any.filepath ==1.4.2.1,
             any.free ==5.1.7,
             any.generic-arbitrary ==0.1.0,
-             any.ghc-boot-th ==8.10.7,
+             any.generics-sop ==0.5.1.1,
+             any.ghc-boot-th ==8.10.5,
             any.ghc-byteorder ==4.11.0.0.10,
             any.ghc-prim ==0.6.1,
             any.happy ==1.20.0,
-             any.hashable ==1.3.3.0,
+             any.hashable ==1.3.2.0,
             hashable +integer-gmp -random-initial-seed,
+             any.haskell-src-exts ==1.23.1,
+             any.haskell-src-meta ==0.8.7,
             any.haskus-utils-data ==1.4,
             any.haskus-utils-types ==1.5.1,
             any.haskus-utils-variant ==3.1,
+             any.hpath-filepath ==0.10.4,
+             any.hpath-posix ==0.13.3,
             any.hsc2hs ==0.68.7,
             hsc2hs -in-ghc-tree,
             any.hspec ==2.7.10,
             any.hspec-core ==2.7.10,
-             any.hspec-discover ==2.7.10 || ==2.8.3,
+             any.hspec-discover ==2.7.10 || ==2.8.2,
             any.hspec-expectations ==0.8.2,
             any.hspec-golden-aeson ==0.9.0.0,
             any.http-io-streams ==0.1.6.0,
@@ -131,7 +137,7 @@ constraints: any.Cabal ==3.2.1.0,
             any.microlens ==0.4.12.0,
             any.microlens-mtl ==0.2.0.1,
             any.microlens-th ==0.4.3.10,
-             any.monad-control ==1.0.3.1,
+             any.monad-control ==1.0.3,
             any.monad-logger ==0.3.36,
             monad-logger +template_haskell,
             any.monad-loops ==0.4.3,
@@ -149,6 +155,7 @@ constraints: any.Cabal ==3.2.1.0,
             optics-core -explicit-generic-labels,
             any.optics-extra ==0.4,
             any.optics-th ==0.4,
+             any.optics-vl ==0.2.1,
             any.optparse-applicative ==0.16.1.0,
             optparse-applicative +process,
             any.os-release ==1.0.2,
@@ -160,8 +167,8 @@ constraints: any.Cabal ==3.2.1.0,
             any.polyparse ==1.13,
             any.pretty ==1.1.3.6,
             any.pretty-terminal ==0.1.0.0,
-             any.primitive ==0.7.2.0,
-             any.process ==1.6.13.2,
+             any.primitive ==0.7.1.0,
+             any.process ==1.6.9.0,
             any.profunctors ==5.6.2,
             any.quickcheck-arbitrary-adt ==0.3.1.0,
             any.quickcheck-io ==0.2.0,
@@ -171,7 +178,7 @@ constraints: any.Cabal ==3.2.1.0,
             any.regex-base ==0.94.0.1,
             any.regex-posix ==0.96.0.1,
             regex-posix -_regex-posix-clib,
-             any.resourcet ==1.2.4.3,
+             any.resourcet ==1.2.4.2,
             any.rts ==1.0.1,
             any.safe ==0.3.19,
             any.safe-exceptions ==0.1.7.2,
@@ -180,6 +187,7 @@ constraints: any.Cabal ==3.2.1.0,
             any.semigroupoids ==5.3.5,
             semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers,
             any.setenv ==0.1.1.3,
+             any.sop-core ==0.5.0.1,
             any.split ==0.2.3.4,
             any.splitmix ==0.1.0.3,
             splitmix -optimised-mixer,
@@ -190,31 +198,39 @@ constraints: any.Cabal ==3.2.1.0,
             any.strict ==0.4.0.1,
             strict +assoc,
             any.strict-base ==0.4.0.0,
+             any.string-interpolate ==0.3.1.1,
+             string-interpolate -bytestring-builder -extended-benchmarks -text-builder,
+             any.syb ==0.7.2.1,
             any.tagged ==0.8.6.1,
             tagged +deepseq +transformers,
+             any.tar ==0.6.0.0,
             any.template-haskell ==2.16.0.0,
             any.temporary ==1.3,
             any.terminal-progress-bar ==0.4.1,
             any.terminal-size ==0.3.2.1,
             any.terminfo ==0.4.1.4,
             any.text ==1.2.4.1,
+             any.text-conversions ==0.3.1,
             any.text-zipper ==0.11,
             any.tf-random ==0.5,
             any.th-abstraction ==0.4.2.0,
             any.th-compat ==0.1.2,
+             any.th-expand-syns ==0.4.8.0,
             any.th-lift ==0.8.2,
             any.th-lift-instances ==0.1.18,
+             any.th-orphans ==0.13.11,
+             any.th-reify-many ==0.1.9,
             any.these ==1.1.1.1,
             these +assoc,
             any.time ==1.9.3,
             any.time-compat ==1.9.6,
             time-compat -old-locale,
             any.transformers ==0.5.6.2,
-             any.transformers-base ==0.4.6,
+             any.transformers-base ==0.4.5.2,
             transformers-base +orphaninstances,
             any.transformers-compat ==0.7,
             transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
-             any.typed-process ==0.2.6.1,
+             any.typed-process ==0.2.6.0,
             any.unix ==2.7.2.2,
             any.unix-bytestring ==0.3.7.3,
             any.unix-compat ==0.5.3,
@@ -245,4 +261,4 @@ constraints: any.Cabal ==3.2.1.0,
             any.zlib-bindings ==0.1.1.5,
             any.zstd ==0.1.2.0,
             zstd +standalone
-index-state: hackage.haskell.org 2021-08-24T16:50:39Z
+index-state: hackage.haskell.org 2021-07-27T07:59:57Z
--- a/cabal.ghc901.project
+++ b/cabal.ghc901.project
@@ -10,25 +10,24 @@ package ghcup

 source-repository-package
    type: git
-    location: https://github.com/bgamari/terminal-size
-    tag: 34ea816bd63f75f800eedac12c6908c6f3736036
+    location: https://github.com/jtdaugherty/brick.git
+    tag: b3b96cfe66dfd398d338e3feb2b6855e66a35190

 source-repository-package
    type: git
-    location: https://github.com/hasufell/libarchive
-    tag: 024a7e8ab7b4d3848dc64dca1e70a04831eedc99
+    location: https://github.com/Bodigrim/tar
+    tag: ac197ec7ea4838dc2b4e22b9b888b080cedf29cf
+
+source-repository-package
+    type: git
+    location: https://github.com/bgamari/terminal-size
+    tag: 34ea816bd63f75f800eedac12c6908c6f3736036

 constraints: http-io-streams -brotli

 package libarchive
  flags: -system-libarchive

-package aeson-pretty
-  flags: +lib-only
-
-package cabal-plan
-  flags: -exe
-
 allow-newer: base, ghc-prim, template-haskell, language-c

 with-compiler: ghc-9.0.1
--- a/cabal.ghc901.project.freeze
+++ b/cabal.ghc901.project.freeze
@@ -1,7 +1,7 @@
 active-repositories: hackage.haskell.org:merge
 constraints: any.Cabal ==3.4.0.0,
             any.HUnit ==1.6.2.0,
-             any.HsOpenSSL ==0.11.7.1,
+             any.HsOpenSSL ==0.11.7,
             HsOpenSSL -fast-bignum -homebrew-openssl -macports-openssl -use-pkg-config,
             any.QuickCheck ==2.14.2,
             QuickCheck -old-random +templatehaskell,
@@ -9,7 +9,7 @@ constraints: any.Cabal ==3.4.0.0,
             any.aeson ==1.5.6.0,
             aeson -bytestring-builder -cffi -developer -fast,
             any.aeson-pretty ==0.8.8,
-             aeson-pretty +lib-only,
+             aeson-pretty -lib-only,
             any.alex ==3.2.6,
             alex +small_base,
             any.ansi-terminal ==0.11,
@@ -34,7 +34,7 @@ constraints: any.Cabal ==3.4.0.0,
             any.binary ==0.8.8.0,
             any.bindings-DSL ==1.0.25,
             any.blaze-builder ==0.4.2.1,
-             any.brick ==0.64,
+             any.brick ==0.63,
             brick -demos,
             any.bytestring ==0.10.12.1,
             any.bz2 ==1.0.1.0,
@@ -42,8 +42,6 @@ constraints: any.Cabal ==3.4.0.0,
             any.bzlib-conduit ==0.3.0.2,
             any.c2hs ==0.28.8,
             c2hs +base3 -regression,
-             any.cabal-plan ==0.7.2.0,
-             cabal-plan -_ -exe -license-report,
             any.call-stack ==0.4.0,
             any.case-insensitive ==1.2.1.0,
             any.casing ==0.1.4.1,
@@ -54,6 +52,8 @@ constraints: any.Cabal ==3.4.0.0,
             chs-deps -cross,
             any.clock ==0.8.2,
             clock -llvm,
+             any.cmdargs ==0.10.21,
+             cmdargs +quotation -testprog,
             any.colour ==2.3.6,
             any.comonad ==5.0.8,
             comonad +containers +distributive +indexed-traversable,
@@ -66,7 +66,7 @@ constraints: any.Cabal ==3.4.0.0,
             any.config-ini ==0.2.4.0,
             config-ini -enable-doctests,
             any.containers ==0.6.4.1,
-             any.contravariant ==1.5.5,
+             any.contravariant ==1.5.4,
             contravariant +semigroups +statevar +tagged,
             any.cpphs ==1.20.9.1,
             cpphs -old-locale,
@@ -75,7 +75,7 @@ constraints: any.Cabal ==3.4.0.0,
             cryptohash-sha256 -exe +use-cbits,
             any.data-clist ==0.1.2.3,
             any.data-default-class ==0.1.2.0,
-             any.data-fix ==0.3.2,
+             any.data-fix ==0.3.1,
             any.deepseq ==1.4.5.0,
             any.digest ==0.0.1.3,
             digest -bytestring-in-base,
@@ -86,27 +86,33 @@ constraints: any.Cabal ==3.4.0.0,
             any.dlist ==1.0,
             dlist -werror,
             any.easy-file ==0.2.2,
+             any.errors ==2.3.0,
             any.exceptions ==0.10.4,
             any.extra ==1.7.9,
             any.fast-logger ==3.0.5,
             any.filepath ==1.4.2.1,
             any.free ==5.1.7,
             any.generic-arbitrary ==0.1.0,
+             any.generics-sop ==0.5.1.1,
             any.ghc-bignum ==1.0,
             any.ghc-boot-th ==9.0.1,
             any.ghc-byteorder ==4.11.0.0.10,
             any.ghc-prim ==0.7.0,
             any.happy ==1.20.0,
-             any.hashable ==1.3.3.0,
+             any.hashable ==1.3.2.0,
             hashable +integer-gmp -random-initial-seed,
+             any.haskell-src-exts ==1.23.1,
+             any.haskell-src-meta ==0.8.7,
             any.haskus-utils-data ==1.4,
             any.haskus-utils-types ==1.5.1,
             any.haskus-utils-variant ==3.1,
+             any.hpath-filepath ==0.10.4,
+             any.hpath-posix ==0.13.3,
             any.hsc2hs ==0.68.7,
             hsc2hs -in-ghc-tree,
             any.hspec ==2.7.10,
             any.hspec-core ==2.7.10,
-             any.hspec-discover ==2.7.10 || ==2.8.3,
+             any.hspec-discover ==2.7.10 || ==2.8.2,
             any.hspec-expectations ==0.8.2,
             any.hspec-golden-aeson ==0.9.0.0,
             any.http-io-streams ==0.1.6.0,
@@ -131,7 +137,7 @@ constraints: any.Cabal ==3.4.0.0,
             any.microlens ==0.4.12.0,
             any.microlens-mtl ==0.2.0.1,
             any.microlens-th ==0.4.3.10,
-             any.monad-control ==1.0.3.1,
+             any.monad-control ==1.0.3,
             any.monad-logger ==0.3.36,
             monad-logger +template_haskell,
             any.monad-loops ==0.4.3,
@@ -149,6 +155,7 @@ constraints: any.Cabal ==3.4.0.0,
             optics-core -explicit-generic-labels,
             any.optics-extra ==0.4,
             any.optics-th ==0.4,
+             any.optics-vl ==0.2.1,
             any.optparse-applicative ==0.16.1.0,
             optparse-applicative +process,
             any.os-release ==1.0.2,
@@ -160,7 +167,7 @@ constraints: any.Cabal ==3.4.0.0,
             any.polyparse ==1.13,
             any.pretty ==1.1.3.6,
             any.pretty-terminal ==0.1.0.0,
-             any.primitive ==0.7.2.0,
+             any.primitive ==0.7.1.0,
             any.process ==1.6.11.0,
             any.profunctors ==5.6.2,
             any.quickcheck-arbitrary-adt ==0.3.1.0,
@@ -171,7 +178,7 @@ constraints: any.Cabal ==3.4.0.0,
             any.regex-base ==0.94.0.1,
             any.regex-posix ==0.96.0.1,
             regex-posix -_regex-posix-clib,
-             any.resourcet ==1.2.4.3,
+             any.resourcet ==1.2.4.2,
             any.rts ==1.0,
             any.safe ==0.3.19,
             any.safe-exceptions ==0.1.7.2,
@@ -180,6 +187,7 @@ constraints: any.Cabal ==3.4.0.0,
             any.semigroupoids ==5.3.5,
             semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers,
             any.setenv ==0.1.1.3,
+             any.sop-core ==0.5.0.1,
             any.split ==0.2.3.4,
             any.splitmix ==0.1.0.3,
             splitmix -optimised-mixer,
@@ -190,31 +198,39 @@ constraints: any.Cabal ==3.4.0.0,
             any.strict ==0.4.0.1,
             strict +assoc,
             any.strict-base ==0.4.0.0,
+             any.string-interpolate ==0.3.1.1,
+             string-interpolate -bytestring-builder -extended-benchmarks -text-builder,
+             any.syb ==0.7.2.1,
             any.tagged ==0.8.6.1,
             tagged +deepseq +transformers,
+             any.tar ==0.6.0.0,
             any.template-haskell ==2.17.0.0,
             any.temporary ==1.3,
             any.terminal-progress-bar ==0.4.1,
             any.terminal-size ==0.3.2.1,
             any.terminfo ==0.4.1.4,
             any.text ==1.2.4.1,
+             any.text-conversions ==0.3.1,
             any.text-zipper ==0.11,
             any.tf-random ==0.5,
             any.th-abstraction ==0.4.2.0,
             any.th-compat ==0.1.2,
+             any.th-expand-syns ==0.4.8.0,
             any.th-lift ==0.8.2,
             any.th-lift-instances ==0.1.18,
+             any.th-orphans ==0.13.11,
+             any.th-reify-many ==0.1.9,
             any.these ==1.1.1.1,
             these +assoc,
             any.time ==1.9.3,
             any.time-compat ==1.9.6,
             time-compat -old-locale,
             any.transformers ==0.5.6.2,
-             any.transformers-base ==0.4.6,
+             any.transformers-base ==0.4.5.2,
             transformers-base +orphaninstances,
             any.transformers-compat ==0.7,
             transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
-             any.typed-process ==0.2.6.1,
+             any.typed-process ==0.2.6.0,
             any.unix ==2.7.2.2,
             any.unix-bytestring ==0.3.7.3,
             any.unix-compat ==0.5.3,
@@ -245,4 +261,4 @@ constraints: any.Cabal ==3.4.0.0,
             any.zlib-bindings ==0.1.1.5,
             any.zstd ==0.1.2.0,
             zstd +standalone
-index-state: hackage.haskell.org 2021-08-24T16:50:39Z
+index-state: hackage.haskell.org 2021-07-27T07:59:57Z
--- a/cabal.project
+++ b/cabal.project
@@ -16,17 +16,11 @@ source-repository-package
 source-repository-package
    type: git
    location: https://github.com/hasufell/libarchive
-    tag: 8587aab78dd515928024ecd82c8f215e06db85cd
+    tag: 024a7e8ab7b4d3848dc64dca1e70a04831eedc99

 constraints: http-io-streams -brotli

 package libarchive
  flags: -system-libarchive

-package aeson-pretty
-  flags: +lib-only
-
-package cabal-plan
-  flags: -exe
-
 allow-newer: base, ghc-prim, template-haskell, language-c
--- a/ghcup-0.0.6.yaml
+++ b/ghcup-0.0.6.yaml
@@ -1690,6 +1690,7 @@ ghcupDownloads:
              dlHash: 56170d1a8450e18b7eb9c23c94723da352815b27ec250bb23742a62f16dcab6c
    8.10.6:
      viTags:
+      - Recommended
      - base-4.14.3.0
      viChangeLog: https://downloads.haskell.org/~ghc/8.10.6/docs/html/users_guide/8.10.6-notes.html
      viSourceDL:
@@ -1788,107 +1789,6 @@ ghcupDownloads:
              dlUri: https://downloads.haskell.org/~ghc/8.10.6/ghc-8.10.6-armv7-deb10-linux.tar.xz
              dlSubdir: ghc-8.10.6
              dlHash: d54de8306aa8b33afabf2ac94408e1f82c8e982a2a3346168c071b92bdb464c0
-    8.10.7:
-      viTags:
-      - Recommended
-      - base-4.14.3.0
-      viChangeLog: https://downloads.haskell.org/~ghc/8.10.7/docs/html/users_guide/8.10.7-notes.html
-      viSourceDL:
-        dlUri: https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-src.tar.xz
-        dlSubdir: ghc-8.10.7
-        dlHash: e3eef6229ce9908dfe1ea41436befb0455fefb1932559e860ad4c606b0d03c9d
-      viPostRemove: *ghc-post-remove
-      viPreCompile: *ghc-pre-compile
-      viArch:
-        A_64:
-          Linux_Debian:
-            '( >= 9 && < 10 )': &ghc-8107-64-deb9
-              dlUri: https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-x86_64-deb9-linux.tar.xz
-              dlSubdir: ghc-8.10.7
-              dlHash: ced9870ea351af64fb48274b81a664cdb6a9266775f1598a79cbb6fdd5770a23
-            '( >= 10 && < 11 )': &ghc-8107-64-deb10
-              dlUri: https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-x86_64-deb10-linux.tar.xz
-              dlSubdir: ghc-8.10.7
-              dlHash: a13719bca87a0d3ac0c7d4157a4e60887009a7f1a8dbe95c4759ec413e086d30
-            unknown_versioning: *ghc-8107-64-deb9
-          Linux_Ubuntu:
-            unknown_versioning: &ghc-8107-64-fedora
-              dlUri: https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-x86_64-fedora27-linux.tar.xz
-              dlSubdir: ghc-8.10.7
-              dlHash: b6ed67049a23054a8042e65c9976d5e196e5ee4e83b29b2ee35c8a22ab1e5b73
-            '( >= 16 && < 19 )': *ghc-8107-64-deb9
-          Linux_Mint:
-            unknown_versioning: *ghc-8107-64-deb10
-          Linux_Fedora:
-            '( >= 27 && < 28 )': *ghc-8107-64-fedora
-            unknown_versioning: *ghc-8107-64-fedora
-          Linux_CentOS:
-            '( >= 7 && < 8 )': &ghc-8107-64-centos
-              dlUri: https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-x86_64-centos7-linux.tar.xz
-              dlSubdir: ghc-8.10.7
-              dlHash: 262a50bfb5b7c8770e0d99f54d42e5876968da7bf93e2e4d6cfe397891a36d05
-            unknown_versioning: *ghc-8107-64-centos
-          Linux_RedHat:
-            unknown_versioning: *ghc-8107-64-centos
-          Linux_Alpine:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-x86_64-alpine3.10-linux-integer-simple.tar.xz
-              dlSubdir: ghc-8.10.7-x86_64-unknown-linux
-              dlHash: 16903df850ef73d5246f2ff169cbf57ecab76c2ac5acfa9928934282cfad575c
-          Linux_AmazonLinux:
-            unknown_versioning: *ghc-8107-64-centos
-          Linux_UnknownLinux:
-            unknown_versioning: *ghc-8107-64-fedora
-          Darwin:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-x86_64-apple-darwin.tar.xz
-              dlSubdir: ghc-8.10.7
-              dlHash: 287db0f9c338c9f53123bfa8731b0996803ee50f6ee847fe388092e5e5132047
-          FreeBSD:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-x86_64-unknown-freebsd.tar.xz
-              dlSubdir: ghc-8.10.7
-              dlHash: 45e35d24bc700e1093efa39189e9fa01498069881aed2fa8779c011941a80da1
-          Windows:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-x86_64-unknown-mingw32.tar.xz
-              dlSubdir: ghc-8.10.7
-              dlHash: b6515b0ea3f7a6e34d92e7fcd0c1fef50d6030fe8f46883000185289a4b8ea9a
-        A_32:
-          Linux_Debian:
-            '( >= 9 && < 10 )': &ghc-8107-32-deb9
-              dlUri: https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-i386-deb9-linux.tar.xz
-              dlSubdir: ghc-8.10.7
-              dlHash: fbfc1ef194f4e7a4c0da8c11cc69b17458a4b928b609b3622c97acc4acd5c5ab
-            unknown_versioning: *ghc-8107-32-deb9
-          Linux_Ubuntu:
-            unknown_versioning: *ghc-8107-32-deb9
-          Linux_Mint:
-            unknown_versioning: *ghc-8107-32-deb9
-          Linux_UnknownLinux:
-            unknown_versioning: *ghc-8107-32-deb9
-          Linux_Alpine:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/ghc/8.10.7/ghc-8.10.7-i386-alpine-linux.tar.xz
-              dlSubdir: ghc-8.10.7
-              dlHash: 3110e6ee029d9d8062158b54b06f71a21b0fac87bf0e085f9be5bbcf73f99e6d
-        A_ARM64:
-          Linux_UnknownLinux:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-aarch64-deb10-linux.tar.xz
-              dlSubdir: ghc-8.10.7
-              dlHash: fad2417f9b295233bf8ade79c0e6140896359e87be46cb61cd1d35863d9d0e55
-          Darwin:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-aarch64-apple-darwin.tar.xz
-              dlSubdir: ghc-8.10.7
-              dlHash: dc469fc3c35fd2a33a5a575ffce87f13de7b98c2d349a41002e200a56d9bba1c
-        A_ARM:
-          Linux_UnknownLinux:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-armv7-deb10-linux.tar.xz
-              dlSubdir: ghc-8.10.7
-              dlHash: 3949c31bdf7d3b4afb765ea8246bca4ca9707c5d988d9961a244f0da100956a2
    9.0.1:
      viTags:
      - Latest
--- a/ghcup-0.0.7.yaml
+++ b/ghcup-0.0.7.yaml
@@ -1746,6 +1746,7 @@ ghcupDownloads:
              dlHash: 56170d1a8450e18b7eb9c23c94723da352815b27ec250bb23742a62f16dcab6c
    8.10.6:
      viTags:
+      - Recommended
      - base-4.14.3.0
      viChangeLog: https://downloads.haskell.org/~ghc/8.10.6/docs/html/users_guide/8.10.6-notes.html
      viSourceDL:
@@ -1846,107 +1847,6 @@ ghcupDownloads:
              dlUri: https://downloads.haskell.org/~ghc/8.10.6/ghc-8.10.6-armv7-deb10-linux.tar.xz
              dlSubdir: ghc-8.10.6
              dlHash: d54de8306aa8b33afabf2ac94408e1f82c8e982a2a3346168c071b92bdb464c0
-    8.10.7:
-      viTags:
-      - Recommended
-      - base-4.14.3.0
-      viChangeLog: https://downloads.haskell.org/~ghc/8.10.7/docs/html/users_guide/8.10.7-notes.html
-      viSourceDL:
-        dlUri: https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-src.tar.xz
-        dlSubdir: ghc-8.10.7
-        dlHash: e3eef6229ce9908dfe1ea41436befb0455fefb1932559e860ad4c606b0d03c9d
-      viPostRemove: *ghc-post-remove
-      viPreCompile: *ghc-pre-compile
-      viArch:
-        A_64:
-          Linux_Debian:
-            '( >= 9 && < 10 )': &ghc-8107-64-deb9
-              dlUri: https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-x86_64-deb9-linux.tar.xz
-              dlSubdir: ghc-8.10.7
-              dlHash: ced9870ea351af64fb48274b81a664cdb6a9266775f1598a79cbb6fdd5770a23
-            '( >= 10 && < 11 )': &ghc-8107-64-deb10
-              dlUri: https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-x86_64-deb10-linux.tar.xz
-              dlSubdir: ghc-8.10.7
-              dlHash: a13719bca87a0d3ac0c7d4157a4e60887009a7f1a8dbe95c4759ec413e086d30
-            unknown_versioning: *ghc-8107-64-deb9
-          Linux_Ubuntu:
-            unknown_versioning: &ghc-8107-64-fedora
-              dlUri: https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-x86_64-fedora27-linux.tar.xz
-              dlSubdir: ghc-8.10.7
-              dlHash: b6ed67049a23054a8042e65c9976d5e196e5ee4e83b29b2ee35c8a22ab1e5b73
-            '( >= 16 && < 19 )': *ghc-8107-64-deb9
-          Linux_Mint:
-            unknown_versioning: *ghc-8107-64-deb10
-          Linux_Fedora:
-            '( >= 27 && < 28 )': *ghc-8107-64-fedora
-            unknown_versioning: *ghc-8107-64-fedora
-          Linux_CentOS:
-            '( >= 7 && < 8 )': &ghc-8107-64-centos
-              dlUri: https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-x86_64-centos7-linux.tar.xz
-              dlSubdir: ghc-8.10.7
-              dlHash: 262a50bfb5b7c8770e0d99f54d42e5876968da7bf93e2e4d6cfe397891a36d05
-            unknown_versioning: *ghc-8107-64-centos
-          Linux_RedHat:
-            unknown_versioning: *ghc-8107-64-centos
-          Linux_Alpine:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-x86_64-alpine3.10-linux-integer-simple.tar.xz
-              dlSubdir: ghc-8.10.7-x86_64-unknown-linux
-              dlHash: 16903df850ef73d5246f2ff169cbf57ecab76c2ac5acfa9928934282cfad575c
-          Linux_AmazonLinux:
-            unknown_versioning: *ghc-8107-64-centos
-          Linux_UnknownLinux:
-            unknown_versioning: *ghc-8107-64-fedora
-          Darwin:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-x86_64-apple-darwin.tar.xz
-              dlSubdir: ghc-8.10.7
-              dlHash: 287db0f9c338c9f53123bfa8731b0996803ee50f6ee847fe388092e5e5132047
-          FreeBSD:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-x86_64-unknown-freebsd.tar.xz
-              dlSubdir: ghc-8.10.7
-              dlHash: 45e35d24bc700e1093efa39189e9fa01498069881aed2fa8779c011941a80da1
-          Windows:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-x86_64-unknown-mingw32.tar.xz
-              dlSubdir: ghc-8.10.7
-              dlHash: b6515b0ea3f7a6e34d92e7fcd0c1fef50d6030fe8f46883000185289a4b8ea9a
-        A_32:
-          Linux_Debian:
-            '( >= 9 && < 10 )': &ghc-8107-32-deb9
-              dlUri: https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-i386-deb9-linux.tar.xz
-              dlSubdir: ghc-8.10.7
-              dlHash: fbfc1ef194f4e7a4c0da8c11cc69b17458a4b928b609b3622c97acc4acd5c5ab
-            unknown_versioning: *ghc-8107-32-deb9
-          Linux_Ubuntu:
-            unknown_versioning: *ghc-8107-32-deb9
-          Linux_Mint:
-            unknown_versioning: *ghc-8107-32-deb9
-          Linux_UnknownLinux:
-            unknown_versioning: *ghc-8107-32-deb9
-          Linux_Alpine:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/ghc/8.10.7/ghc-8.10.7-i386-alpine-linux.tar.xz
-              dlSubdir: ghc-8.10.7
-              dlHash: 3110e6ee029d9d8062158b54b06f71a21b0fac87bf0e085f9be5bbcf73f99e6d
-        A_ARM64:
-          Linux_UnknownLinux:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-aarch64-deb10-linux.tar.xz
-              dlSubdir: ghc-8.10.7
-              dlHash: fad2417f9b295233bf8ade79c0e6140896359e87be46cb61cd1d35863d9d0e55
-          Darwin:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-aarch64-apple-darwin.tar.xz
-              dlSubdir: ghc-8.10.7
-              dlHash: dc469fc3c35fd2a33a5a575ffce87f13de7b98c2d349a41002e200a56d9bba1c
-        A_ARM:
-          Linux_UnknownLinux:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-armv7-deb10-linux.tar.xz
-              dlSubdir: ghc-8.10.7
-              dlHash: 3949c31bdf7d3b4afb765ea8246bca4ca9707c5d988d9961a244f0da100956a2
    9.0.1:
      viTags:
      - Latest
--- a/ghcup.cabal
+++ b/ghcup.cabal
@@ -104,6 +104,7 @@ library
    , deepseq               ^>=1.4.4.0
    , directory             ^>=1.3.6.0
    , disk-free-space       ^>=0.1.0.1
+    , extra                 ^>=1.7.9
    , filepath              ^>=1.4.2.1
    , haskus-utils-types    ^>=1.5
    , haskus-utils-variant  >=3.0        && <3.2
@@ -184,12 +185,9 @@ executable ghcup
    -fwarn-incomplete-record-updates -threaded

  build-depends:
-    , aeson                 >=1.4      && <1.6
-    , aeson-pretty          ^>=0.8.8
    , async                 ^>=2.2.3
    , base                  >=4.13     && <5
    , bytestring            ^>=0.10
-    , cabal-plan            ^>=0.7.2
    , containers            ^>=0.6
    , deepseq               ^>=1.4
    , filepath              ^>=1.4.2.1
--- a/lib/GHCup.hs
+++ b/lib/GHCup.hs
@@ -58,6 +58,7 @@ import           Control.Monad.IO.Unlift        ( MonadUnliftIO( withRunInIO ) )
 import           Data.ByteString                ( ByteString )
 import           Data.Either
 import           Data.List
+import           Data.List.Extra
 import           Data.Maybe
 import           Data.String                    ( fromString )
 import           Data.Text                      ( Text )
@@ -472,9 +473,6 @@ installCabalUnpacked path inst mver' = do
        <> maybe "" (("-" <>) . T.unpack . prettyVer) mver'
        <> exeExt
  let destPath = inst </> destFileName
-
-  liftE $ throwIfFileAlreadyExists destPath
-    
  handleIO (throwE . CopyError . show) $ liftIO $ copyFile
    (path </> cabalFile <> exeExt)
    destPath
@@ -544,7 +542,6 @@ installHLSBindist :: ( MonadMask m
                        , UnknownArchive
                        , TarDirDoesNotExist
                        , ArchiveResult
-                        , FileAlreadyExistsError
                        ]
                       m
                       ()
@@ -592,7 +589,7 @@ installHLSUnpacked :: (MonadFail m, MonadLogger m, MonadCatch m, MonadIO m)
              => FilePath      -- ^ Path to the unpacked hls bindist (where the executable resides)
              -> FilePath      -- ^ Path to install to
              -> Maybe Version -- ^ Nothing for isolated install
-              -> Excepts '[CopyError, FileAlreadyExistsError] m ()
+              -> Excepts '[CopyError] m ()
 installHLSUnpacked path inst mver' = do
  lift $ $(logInfo) "Installing HLS"
  liftIO $ createDirRecursive' inst
@@ -608,32 +605,20 @@ installHLSUnpacked path inst mver' = do
    let toF = dropSuffix exeExt f
              <> maybe "" (("~" <>) . T.unpack . prettyVer) mver'
              <> exeExt
-
-    let srcPath = path </> f
-    let destPath = inst </> toF
-
-    liftE $ throwIfFileAlreadyExists destPath
-      
    handleIO (throwE . CopyError . show) $ liftIO $ copyFile
-      srcPath
-      destPath
-    lift $ chmod_755 destPath
+      (path </> f)
+      (inst </> toF)
+    lift $ chmod_755 (inst </> toF)

  -- install haskell-language-server-wrapper
  let wrapper = "haskell-language-server-wrapper"
      toF = wrapper
            <> maybe "" (("-" <>) . T.unpack . prettyVer) mver'
            <> exeExt
-      srcWrapperPath = path </> wrapper <> exeExt
-      destWrapperPath = inst </> toF
-
-  liftE $ throwIfFileAlreadyExists destWrapperPath
-      
  handleIO (throwE . CopyError . show) $ liftIO $ copyFile
-    srcWrapperPath
-    destWrapperPath
-    
-  lift $ chmod_755 destWrapperPath
+    (path </> wrapper <> exeExt)
+    (inst </> toF)
+  lift $ chmod_755 (inst </> toF)

 -- | Installs hls binaries @haskell-language-server-\<ghcver\>@
 -- into @~\/.ghcup\/bin/@, as well as @haskell-languager-server-wrapper@.
@@ -662,7 +647,6 @@ installHLSBin :: ( MonadMask m
                    , UnknownArchive
                    , TarDirDoesNotExist
                    , ArchiveResult
-                    , FileAlreadyExistsError
                    ]
                   m
                   ()
@@ -699,7 +683,6 @@ installStackBin :: ( MonadMask m
                      , UnknownArchive
                      , TarDirDoesNotExist
                      , ArchiveResult
-                      , FileAlreadyExistsError
                      ]
                     m
                     ()
@@ -735,7 +718,6 @@ installStackBindist :: ( MonadMask m
                          , UnknownArchive
                          , TarDirDoesNotExist
                          , ArchiveResult
-                          , FileAlreadyExistsError
                          ]
                         m
                         ()
@@ -781,7 +763,7 @@ installStackUnpacked :: (MonadLogger m, MonadCatch m, MonadIO m)
              => FilePath      -- ^ Path to the unpacked stack bindist (where the executable resides)
              -> FilePath      -- ^ Path to install to
              -> Maybe Version -- ^ Nothing for isolated installs
-              -> Excepts '[CopyError, FileAlreadyExistsError] m ()
+              -> Excepts '[CopyError] m ()
 installStackUnpacked path inst mver' = do
  lift $ $(logInfo) "Installing stack"
  let stackFile = "stack"
@@ -789,10 +771,7 @@ installStackUnpacked path inst mver' = do
  let destFileName = stackFile
                     <> maybe "" (("-" <>) .  T.unpack . prettyVer) mver'
                     <> exeExt
-      destPath = inst </> destFileName
-
-  liftE $ throwIfFileAlreadyExists destPath
-      
+  let destPath = inst </> destFileName
  handleIO (throwE . CopyError . show) $ liftIO $ copyFile
    (path </> stackFile <> exeExt)
    destPath
@@ -2369,10 +2348,3 @@ whereIsTool tool ver@GHCTargetVersion {..} = do
      liftIO $ canonicalizePath currentRunningExecPath


-throwIfFileAlreadyExists :: ( MonadIO m ) =>
-                            FilePath ->
-                            Excepts '[FileAlreadyExistsError] m ()
-
-throwIfFileAlreadyExists fp = whenM (checkFileAlreadyExists fp)
-                                (throwE $ FileAlreadyExistsError fp)
-
--- a/lib/GHCup/Download.hs
+++ b/lib/GHCup/Download.hs
@@ -57,8 +57,8 @@ import           Data.ByteString                ( ByteString )
 #if defined(INTERNAL_DOWNLOADER)
 import           Data.CaseInsensitive           ( mk )
 #endif
+import           Data.List.Extra
 import           Data.Maybe
-import           Data.List
 import           Data.Time.Clock
 import           Data.Time.Clock.POSIX
 import           Data.Versions
@@ -72,7 +72,6 @@ import           Prelude                 hiding ( abs
                                                , readFile
                                                , writeFile
                                                )
-import           Safe
 import           System.Directory
 import           System.Environment
 import           System.Exit
--- a/lib/GHCup/Errors.hs
+++ b/lib/GHCup/Errors.hs
@@ -50,7 +50,7 @@ instance Pretty NoCompatiblePlatform where
  pPrint (NoCompatiblePlatform str') =
    text ("Could not find a compatible platform. Got: " ++ str')

-- | Unable to find a download for the requested version/distro.
+-- | Unable to find a download for the requested versio/distro.
 data NoDownload = NoDownload
  deriving Show

--- a/lib/GHCup/Platform.hs
+++ b/lib/GHCup/Platform.hs
@@ -138,11 +138,12 @@ getLinuxDistro = do
        | hasWord name ["exherbo"] -> Exherbo
        | hasWord name ["gentoo"]  -> Gentoo
        | hasWord name ["amazonlinux", "Amazon Linux"] -> AmazonLinux
-        | hasWord name ["solus"]   -> Solus
        | otherwise                -> UnknownLinux
  pure (distro, parsedVer)
 where
-  hasWord t = any (\x -> match (regex x) (T.unpack t))
+  hasWord t matches = foldr (\x y -> match (regex x) (T.unpack t) || y)
+                            False
+                            matches
   where
    regex x = makeRegexOpts compIgnoreCase execBlank ([s|\<|] ++ x ++ [s|\>|])

--- a/lib/GHCup/Types.hs
+++ b/lib/GHCup/Types.hs
@@ -152,7 +152,7 @@ data Tag = Latest
         | Recommended
         | Prerelease
         | Base PVP
-         | Old                -- ^ old versions are hidden by default in TUI
+         | Old                -- ^ old version are hidden by default in TUI
         | UnknownTag String  -- ^ used for upwardscompat
         deriving (Ord, Eq, GHC.Generic, Show) -- FIXME: manual JSON instance

@@ -241,7 +241,7 @@ instance NFData LinuxDistro
 distroToString :: LinuxDistro -> String
 distroToString Debian = "debian"
 distroToString Ubuntu = "ubuntu"
-distroToString Mint = "mint"
+distroToString Mint= "mint"
 distroToString Fedora = "fedora"
 distroToString CentOS = "centos"
 distroToString RedHat = "redhat"
--- a/lib/GHCup/Types/JSON.hs
+++ b/lib/GHCup/Types/JSON.hs
@@ -42,7 +42,7 @@ import qualified Text.Megaparsec               as MP
 import qualified Text.Megaparsec.Char          as MPC


-deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''Architecture
+deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } { fieldLabelModifier = removeLensFieldLabel } ''Architecture
 deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''LinuxDistro
 deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''VSep
 deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''VUnit
--- a/lib/GHCup/Utils.hs
+++ b/lib/GHCup/Utils.hs
@@ -58,6 +58,7 @@ import           Data.ByteString                ( ByteString )
 import           Data.Either
 import           Data.Foldable
 import           Data.List
+import           Data.List.Extra
 import           Data.List.NonEmpty             ( NonEmpty( (:|) ))
 import           Data.Maybe
 import           Data.Text                      ( Text )
--- a/lib/GHCup/Utils/File/Common.hs
+++ b/lib/GHCup/Utils/File/Common.hs
@@ -7,6 +7,7 @@ module GHCup.Utils.File.Common where

 import           GHCup.Utils.Prelude

+import           Control.Monad.Extra
 import           Control.Monad.Reader
 import           Data.Maybe
 import           GHC.IO.Exception
@@ -101,6 +102,3 @@ findFiles path regex = do
  contents <- listDirectory path
  pure $ filter (match regex) contents

-
-checkFileAlreadyExists :: (MonadIO m) => FilePath -> m Bool
-checkFileAlreadyExists fp = liftIO $ doesFileExist fp
--- a/lib/GHCup/Utils/File/Posix.hs
+++ b/lib/GHCup/Utils/File/Posix.hs
@@ -131,7 +131,7 @@ execLogged exe args chdir lfile env = do
      pure e

  tee :: Fd -> Fd -> IO ()
-  tee fileFd = readTilEOF lineAction
+  tee fileFd fdIn = readTilEOF lineAction fdIn

   where
    lineAction :: ByteString -> IO ()
--- a/lib/GHCup/Utils/Prelude.hs
+++ b/lib/GHCup/Utils/Prelude.hs
@@ -33,8 +33,7 @@ import           Control.Monad.Reader
 import           Control.Monad.Logger
 import           Data.Bifunctor
 import           Data.ByteString                ( ByteString )
-import           Data.List                      ( nub, intercalate, stripPrefix, isPrefixOf )
-import           Data.Maybe
+import           Data.List                      ( nub, intercalate )
 import           Data.Foldable
 import           Data.String
 import           Data.Text                      ( Text )
@@ -76,9 +75,8 @@ import qualified System.Win32.File             as Win32
 -- >>> import Data.ByteString.Internal (c2w, w2c)
 -- >>> import Test.QuickCheck
 -- >>> import Data.Word8
+-- >>> import Data.Word8
 -- >>> import qualified Data.Text as T
-- >>> import qualified Data.Char as C
-- >>> import Data.List
 -- >>> instance Arbitrary T.Text where arbitrary = T.pack <$> arbitrary


@@ -522,7 +520,7 @@ forFold :: (Foldable t, Applicative m, Monoid b) => t a -> (a -> m b) -> m b
 forFold = \t -> (`traverseFold` t)


-- | Strip @\\r@ and @\\n@ from 'String's
+-- | Strip @\\r@ and @\\n@ from 'ByteString's
 --
 -- >>> stripNewline "foo\n\n\n"
 -- "foo"
@@ -534,10 +532,13 @@ forFold = \t -> (`traverseFold` t)
 -- prop> \t -> stripNewline (t <> "\n") === stripNewline t
 -- prop> \t -> not (any (isNewLine . c2w) t) ==> stripNewline t == t
 stripNewline :: String -> String
-stripNewline = filter (`notElem` "\n\r")
+stripNewline s
+  | null s               = []
+  | head s `elem` "\n\r" = stripNewline (tail s)
+  | otherwise            = head s : stripNewline (tail s)


-- | Strip @\\r@ and @\\n@ from 'Text's
+-- | Strip @\\r@ and @\\n@ from 'ByteString's
 --
 -- >>> stripNewline' "foo\n\n\n"
 -- "foo"
@@ -549,7 +550,10 @@ stripNewline = filter (`notElem` "\n\r")
 -- prop> \t -> stripNewline' (t <> "\n") === stripNewline' t
 -- prop> \t -> not (T.any (isNewLine . c2w) t) ==> stripNewline' t == t
 stripNewline' :: T.Text -> T.Text
-stripNewline' = T.filter (`notElem` "\n\r")
+stripNewline' s
+  | T.null s               = mempty
+  | T.head s `elem` "\n\r" = stripNewline' (T.tail s)
+  | otherwise              = T.singleton (T.head s) <> stripNewline' (T.tail s)


 -- | Is the word8 a newline?
@@ -583,117 +587,3 @@ splitOnPVP c s = case Split.splitOn c s of
    | otherwise -> def
 where
  def = (s, "")
-
-
-
-- | Like 'find', but where the test can be monadic.
--
-- >>> findM (Just . C.isUpper) "teST"
-- Just (Just 'S')
-- >>> findM (Just . C.isUpper) "test"
-- Just Nothing
-- >>> findM (Just . const True) ["x",undefined]
-- Just (Just "x")
-findM :: Monad m => (a -> m Bool) -> [a] -> m (Maybe a)
-findM ~p = foldr (\x -> ifM (p x) (pure $ Just x)) (pure Nothing)
-
-
-- | Drops the given suffix from a list.
--   It returns the original sequence if the sequence doesn't end with the given suffix.
--
-- >>> dropSuffix "!" "Hello World!"
-- "Hello World"
-- >>> dropSuffix "!" "Hello World!!"
-- "Hello World!"
-- >>> dropSuffix "!" "Hello World."
-- "Hello World."
-dropSuffix :: Eq a => [a] -> [a] -> [a]
-dropSuffix a b = fromMaybe b $ stripSuffix a b
-
-- | Return the prefix of the second list if its suffix
--   matches the entire first list.
--
-- >>> stripSuffix "bar" "foobar"
-- Just "foo"
-- >>> stripSuffix ""    "baz"
-- Just "baz"
-- >>> stripSuffix "foo" "quux"
-- Nothing
-stripSuffix :: Eq a => [a] -> [a] -> Maybe [a]
-stripSuffix a b = reverse <$> stripPrefix (reverse a) (reverse b)
-
-
-- | Drops the given prefix from a list.
--   It returns the original sequence if the sequence doesn't start with the given prefix.
--
-- >>> dropPrefix "Mr. " "Mr. Men"
-- "Men"
-- >>> dropPrefix "Mr. " "Dr. Men"
-- "Dr. Men"
-dropPrefix :: Eq a => [a] -> [a] -> [a]
-dropPrefix a b = fromMaybe b $ stripPrefix a b
-
-
-
-- | Break a list into pieces separated by the first
-- list argument, consuming the delimiter. An empty delimiter is
-- invalid, and will cause an error to be raised.
--
-- >>> splitOn "\r\n" "a\r\nb\r\nd\r\ne"
-- ["a","b","d","e"]
-- >>> splitOn "aaa"  "aaaXaaaXaaaXaaa"
-- ["","X","X","X",""]
-- >>> splitOn "x"    "x"
-- ["",""]
-- >>> splitOn "x"    ""
-- [""]
--
-- prop> \s x -> s /= "" ==> intercalate s (splitOn s x) == x
-- prop> \c x -> splitOn [c] x                           == split (==c) x
-splitOn :: Eq a => [a] -> [a] -> [[a]]
-splitOn [] _ = error "splitOn, needle may not be empty"
-splitOn _ [] = [[]]
-splitOn needle haystack = a : if null b then [] else splitOn needle $ drop (length needle) b
-    where (a,b) = breakOn needle haystack
-
-
-- | Splits a list into components delimited by separators,
-- where the predicate returns True for a separator element.  The
-- resulting components do not contain the separators.  Two adjacent
-- separators result in an empty component in the output.
--
-- >>> split (== 'a') "aabbaca"
-- ["","","bb","c",""]
-- >>> split (== 'a') ""
-- [""]
-- >>> split (== ':') "::xyz:abc::123::"
-- ["","","xyz","abc","","123","",""]
-- >>> split (== ',') "my,list,here"
-- ["my","list","here"]
-split :: (a -> Bool) -> [a] -> [[a]]
-split _ [] = [[]]
-split f (x:xs)
-  | f x = [] : split f xs
-  | y:ys <- split f xs = (x:y) : ys
-  | otherwise = [[]]
-
-
-- | Find the first instance of @needle@ in @haystack@.
-- The first element of the returned tuple
-- is the prefix of @haystack@ before @needle@ is matched.  The second
-- is the remainder of @haystack@, starting with the match.
-- If you want the remainder /without/ the match, use 'stripInfix'.
--
-- >>> breakOn "::" "a::b::c"
-- ("a","::b::c")
-- >>> breakOn "/" "foobar"
-- ("foobar","")
--
-- prop> \needle haystack -> let (prefix,match) = breakOn needle haystack in prefix ++ match == haystack
-breakOn :: Eq a => [a] -> [a] -> ([a], [a])
-breakOn needle haystack | needle `isPrefixOf` haystack = ([], haystack)
-breakOn _ [] = ([], [])
-breakOn needle (x:xs) = first (x:) $ breakOn needle xs
-
-
-
--- a/lib/GHCup/Utils/String/QQ.hs
+++ b/lib/GHCup/Utils/String/QQ.hs
@@ -44,14 +44,15 @@ import           Language.Haskell.TH.Quote
 -- The pattern portion is undefined.
 s :: QuasiQuoter
 s = QuasiQuoter
-  (\s' -> case all isAscii s' of
+  (\s' -> case and $ fmap isAscii s' of
    True  -> (\a -> [|fromString a|]) . trimLeadingNewline . removeCRs $ s'
    False -> fail "Not ascii"
  )
-  (error "Cannot use s as a pattern")
-  (error "Cannot use s as a type")
-  (error "Cannot use s as a dec")
+  (error "Cannot use q as a pattern")
+  (error "Cannot use q as a type")
+  (error "Cannot use q as a dec")
 where
  removeCRs = filter (/= '\r')
  trimLeadingNewline ('\n' : xs) = xs
  trimLeadingNewline xs          = xs
+
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-18.2
+resolver: lts-18.7

 packages:
  - .
@@ -6,9 +6,8 @@ packages:
 extra-deps:
  - git: https://github.com/bgamari/terminal-size
    commit: 34ea816bd63f75f800eedac12c6908c6f3736036
-
  - git: https://github.com/hasufell/libarchive
-    commit: 8587aab78dd515928024ecd82c8f215e06db85cd
+    commit: 024a7e8ab7b4d3848dc64dca1e70a04831eedc99

  - brick-0.64@sha256:f03fa14607c22cf48af99e24c44f79a0fb073f7ec229f15e969fed9ff73c93f6,16530
  - IfElse-0.85@sha256:6939b94acc6a55f545f63a168a349dd2fbe4b9a7cca73bf60282db5cc6aa47d2,445
@@ -53,12 +52,6 @@ flags:
  regex-posix:
    _regex-posix-clib: true

-  aeson-pretty:
-    lib-only: true
-
-  cabal-plan:
-    exe: false
-
 ghc-options:
  "$locals": -O2
  streamly: -O2 -fspec-constr-recursive=16 -fmax-worker-args=16
--- a/test/GHCup/ArbitraryTypes.hs
+++ b/test/GHCup/ArbitraryTypes.hs
@@ -66,7 +66,7 @@ instance Arbitrary ByteString where
    ---------------------

 instance Arbitrary Scheme where
-  arbitrary = elements [ Scheme "http", Scheme "https" ]
+  arbitrary = oneof [ pure (Scheme "http"), pure (Scheme "https") ]

 instance Arbitrary Host where
  arbitrary = genericArbitrary
Author	SHA1	Message	Date
Julian Ospald	2d25c865cc	Remove zip dependency	2021-08-25 20:13:17 +02:00
Julian Ospald	ca0c20552e	Merge branch 'remove-string-interpolate'	2021-08-25 20:12:56 +02:00