summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Källberg <anka.213@gmail.com>2022-10-04 13:28:06 +0200
committerAndreas Källberg <anka.213@gmail.com>2022-10-04 13:28:23 +0200
commit0a16b76875fa8d99c81a4e840083faff771b3cda (patch)
treeffa268d361530d907133f6aa8271f75b4b9cab19
parent51b7117a3d0ae56118074112203d1f3f18402d0f (diff)
Only include transformers-compat for ghc < 8
Since that's the only place where it's needed and we don't have to fight with versions elsewhere
-rw-r--r--gf.cabal6
-rw-r--r--src/compiler/GF/Interactive.hs2
2 files changed, 5 insertions, 3 deletions
diff --git a/gf.cabal b/gf.cabal
index 3c3687de2..022cc1e21 100644
--- a/gf.cabal
+++ b/gf.cabal
@@ -81,12 +81,12 @@ 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,
- -- We need this in order for ghc-7.10 to build
- transformers-compat >= 0.6.3 && < 0.7
+ utf8-string >= 1.0.1.1 && < 1.1
if impl(ghc<8.0)
build-depends:
+ -- We need this in order for ghc-7.10 to build
+ transformers-compat >= 0.6.3 && < 0.7,
fail >= 4.9.0 && < 4.10
hs-source-dirs: src/runtime/haskell
diff --git a/src/compiler/GF/Interactive.hs b/src/compiler/GF/Interactive.hs
index a3a02af78..1970533d6 100644
--- a/src/compiler/GF/Interactive.hs
+++ b/src/compiler/GF/Interactive.hs
@@ -38,8 +38,10 @@ import GF.Server(server)
#endif
import GF.Command.Messages(welcome)
+#if !(MIN_VERSION_base(4,9,0))
-- Needed to make it compile on GHC < 8
import Control.Monad.Trans.Instances ()
+#endif
-- | Run the GF Shell in quiet mode (@gf -run@).
mainRunGFI :: Options -> [FilePath] -> IO ()