From 20453193fe0a5bd4cfa1c506674e2d5a297e318d Mon Sep 17 00:00:00 2001 From: Meng Weng Wong Date: Sun, 20 Feb 2022 22:15:32 +0800 Subject: add compilation support for ghc 9.0.2 --- gf.cabal | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gf.cabal') diff --git a/gf.cabal b/gf.cabal index b4dcf81a0..c8386d3a8 100644 --- a/gf.cabal +++ b/gf.cabal @@ -11,7 +11,7 @@ description: GF, Grammatical Framework, is a programming language for multilingu maintainer: John J. Camilleri homepage: https://www.grammaticalframework.org/ bug-reports: https://github.com/GrammaticalFramework/gf-core/issues -tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.10.4 +tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.10.4, GHC==9.0.2 data-dir: src extra-source-files: @@ -46,7 +46,7 @@ data-files: custom-setup setup-depends: - base >= 4.9.1 && < 4.15, + base >= 4.9.1 && < 4.16, Cabal >= 1.22.0.0, directory >= 1.3.0 && < 1.4, filepath >= 1.4.1 && < 1.5, @@ -81,11 +81,11 @@ library build-depends: -- GHC 8.0.2 to GHC 8.10.4 array >= 0.5.1 && < 0.6, - base >= 4.9.1 && < 4.15, + base >= 4.9.1 && < 4.16, bytestring >= 0.10.8 && < 0.11, containers >= 0.5.7 && < 0.7, exceptions >= 0.8.3 && < 0.11, - ghc-prim >= 0.5.0 && < 0.7, + ghc-prim >= 0.5.0 && < 0.7.1, mtl >= 2.2.1 && < 2.3, pretty >= 1.1.3 && < 1.2, random >= 1.1 && < 1.3, @@ -302,14 +302,14 @@ library build-depends: cgi >= 3001.3.0.2 && < 3001.6, httpd-shed >= 0.4.0 && < 0.5, - network>=2.3 && <2.7 + network>=2.3 && <3.2 if flag(network-uri) build-depends: network-uri >= 2.6.1.0 && < 2.7, - network>=2.6 && <2.7 + network>=2.6 && <3.2 else build-depends: - network >= 2.5 && <2.6 + network >= 2.5 && <3.2 cpp-options: -DSERVER_MODE other-modules: -- cgit v1.2.3 From 862aeb5d9bbd04feade6dccef3a98e3187f89999 Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Sat, 5 Mar 2022 13:41:45 +0800 Subject: Update base <4.15 to <4.16 for tests + pgf*.cabal --- gf.cabal | 2 +- src/runtime/haskell-bind/pgf2.cabal | 2 +- src/runtime/haskell/pgf.cabal | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'gf.cabal') diff --git a/gf.cabal b/gf.cabal index c8386d3a8..53548cd40 100644 --- a/gf.cabal +++ b/gf.cabal @@ -400,7 +400,7 @@ test-suite gf-tests main-is: run.hs hs-source-dirs: testsuite build-depends: - base >= 4.9.1 && < 4.15, + base >= 4.9.1 && < 4.16, Cabal >= 1.8, directory >= 1.3.0 && < 1.4, filepath >= 1.4.1 && < 1.5, diff --git a/src/runtime/haskell-bind/pgf2.cabal b/src/runtime/haskell-bind/pgf2.cabal index 1d5f61991..83c990bf3 100644 --- a/src/runtime/haskell-bind/pgf2.cabal +++ b/src/runtime/haskell-bind/pgf2.cabal @@ -26,7 +26,7 @@ library PGF2.Expr, PGF2.Type build-depends: - base >= 4.9.1 && < 4.15, + base >= 4.9.1 && < 4.16, containers >= 0.5.7 && < 0.7, pretty >= 1.1.3 && < 1.2 default-language: Haskell2010 diff --git a/src/runtime/haskell/pgf.cabal b/src/runtime/haskell/pgf.cabal index 41e67f6ae..cb5841a1c 100644 --- a/src/runtime/haskell/pgf.cabal +++ b/src/runtime/haskell/pgf.cabal @@ -15,7 +15,7 @@ library default-language: Haskell2010 build-depends: array >= 0.5.1 && < 0.6, - base >= 4.9.1 && < 4.15, + base >= 4.9.1 && < 4.16, bytestring >= 0.10.8 && < 0.11, containers >= 0.5.7 && < 0.7, ghc-prim >= 0.5.0 && < 0.7, -- cgit v1.2.3