Allow to build with ghc-8.10.1 and 8.6.5
This commit is contained in:
parent
c1e29a8f16
commit
8ef19f0825
@ -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
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user