From 8ef19f0825fbf0d67f6c03f7b37385ea6863ff63 Mon Sep 17 00:00:00 2001
From: Julian Ospald <hasufell@posteo.de>
Date: Sat, 11 Jul 2020 22:53:38 +0200
Subject: [PATCH] Allow to build with ghc-8.10.1 and 8.6.5

---
 cabal.project                 | 8 +++++++-
 ghcup.cabal                   | 2 +-
 lib/GHCup.hs                  | 2 --
 lib/GHCup/Utils/Version/QQ.hs | 1 -
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/cabal.project b/cabal.project
index a37dcb5..4cd11a6 100644
--- a/cabal.project
+++ b/cabal.project
@@ -2,6 +2,12 @@ packages: ./ghcup.cabal
 
 optional-packages: ./3rdparty/*/*.cabal
 
+source-repository-package
+    type: git
+    location: https://github.com/haskus/packages.git
+    tag: 80a1c5fc07f7226c424250ec17f674cd4d618f42
+    subdir: haskus-utils-types
+
 optimization: 2
 
 package streamly
@@ -15,4 +21,4 @@ constraints: http-io-streams -brotli
 package libarchive
   flags: static
 
-allow-newer: base
+allow-newer: base ghc-prim template-haskell
diff --git a/ghcup.cabal b/ghcup.cabal
index b7b103d..0b890a9 100644
--- a/ghcup.cabal
+++ b/ghcup.cabal
@@ -173,7 +173,7 @@ common terminal-progress-bar
   build-depends: terminal-progress-bar >=0.4.1
 
 common text
-  build-depends: text >=1.2
+  build-depends: text >=1.2.4.0
 
 common time
   build-depends: time >=1.9.3
diff --git a/lib/GHCup.hs b/lib/GHCup.hs
index 5abdd5b..3e46466 100644
--- a/lib/GHCup.hs
+++ b/lib/GHCup.hs
@@ -106,7 +106,6 @@ installGHCBin bDls ver mpfReq = do
   lift $ $(logDebug) [i|Requested to install GHC with #{ver}|]
   whenM (liftIO $ ghcInstalled tver)
     $ (throwE $ AlreadyInstalled GHC ver)
-  Settings {..}                <- lift ask
   pfreq@(PlatformRequest {..}) <- maybe (liftE $ platformRequest) pure mpfReq
 
   -- download (or use cached version)
@@ -186,7 +185,6 @@ installCabalBin bDls ver mpfReq = do
       )
     $ (throwE $ AlreadyInstalled Cabal ver)
 
-  Settings {..}                <- lift ask
   pfreq@(PlatformRequest {..}) <- maybe (liftE $ platformRequest) pure mpfReq
 
   -- download (or use cached version)
diff --git a/lib/GHCup/Utils/Version/QQ.hs b/lib/GHCup/Utils/Version/QQ.hs
index 0938d1e..eef654c 100644
--- a/lib/GHCup/Utils/Version/QQ.hs
+++ b/lib/GHCup/Utils/Version/QQ.hs
@@ -42,7 +42,6 @@ deriving instance Data VUnit
 
 #if !MIN_VERSION_base(4,13,0)
 deriving instance Lift (NonEmpty Word)
-instance Lift Text
 #endif
 
 qq :: (Text -> Q Exp) -> QuasiQuoter