GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-08 18:52:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Only include transformers-compat for ghc < 8

Browse Source 
Since that's the only place where it's needed
and we don't have to fight with versions elsewhere
This commit is contained in:
Andreas Källberg
2022-10-04 13:28:06 +02:00
parent 51b7117a3d
commit 0a16b76875
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gf.cabal
View File

@@ -81,12 +81,12 @@ library
mtl >= 2.2.1 && < 2.3, mtl >= 2.2.1 && < 2.3,
pretty >= 1.1.3 && < 1.2, pretty >= 1.1.3 && < 1.2,
random >= 1.1 && < 1.3, 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) if impl(ghc<8.0)
build-depends: 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 fail >= 4.9.0 && < 4.10
hs-source-dirs: src/runtime/haskell hs-source-dirs: src/runtime/haskell

2
src/compiler/GF/Interactive.hs
View File

@@ -38,8 +38,10 @@ import GF.Server(server)
#endif #endif
import GF.Command.Messages(welcome) import GF.Command.Messages(welcome)
#if !(MIN_VERSION_base(4,9,0))
-- Needed to make it compile on GHC < 8 -- Needed to make it compile on GHC < 8
import Control.Monad.Trans.Instances () import Control.Monad.Trans.Instances ()
#endif
-- | Run the GF Shell in quiet mode (@gf -run@). -- | Run the GF Shell in quiet mode (@gf -run@).
mainRunGFI :: Options -> [FilePath] -> IO () mainRunGFI :: Options -> [FilePath] -> IO ()