From 51b7117a3d0ae56118074112203d1f3f18402d0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=C3=A4llberg?= Date: Tue, 4 Oct 2022 13:05:57 +0200 Subject: [PATCH] Restore build with ghc-7.10.3 --- gf.cabal | 4 +++- src/compiler/GF/Interactive.hs | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gf.cabal b/gf.cabal index da54010d1..3c3687de2 100644 --- a/gf.cabal +++ b/gf.cabal @@ -81,7 +81,9 @@ library mtl >= 2.2.1 && < 2.3, pretty >= 1.1.3 && < 1.2, random >= 1.1 && < 1.3, - utf8-string >= 1.0.1.1 && < 1.1 + utf8-string >= 1.0.1.1 && < 1.1, + -- We need this in order for ghc-7.10 to build + transformers-compat >= 0.6.3 && < 0.7 if impl(ghc<8.0) build-depends: diff --git a/src/compiler/GF/Interactive.hs b/src/compiler/GF/Interactive.hs index 676511680..a3a02af78 100644 --- a/src/compiler/GF/Interactive.hs +++ b/src/compiler/GF/Interactive.hs @@ -38,6 +38,8 @@ import GF.Server(server) #endif import GF.Command.Messages(welcome) +-- Needed to make it compile on GHC < 8 +import Control.Monad.Trans.Instances () -- | Run the GF Shell in quiet mode (@gf -run@). mainRunGFI :: Options -> [FilePath] -> IO ()