Merge pull request #136 from mengwong/ghc9

compiles with GHC 9.0.2
This commit is contained in:
Inari Listenmaa
2022-05-06 03:26:00 +02:00
committed by GitHub
5 changed files with 25 additions and 11 deletions

View File

@@ -66,7 +66,7 @@ jobs:
strategy: strategy:
matrix: matrix:
stack: ["latest"] stack: ["latest"]
ghc: ["7.10.3","8.0.2", "8.2.2", "8.4.4", "8.6.5", "8.8.4", "8.10.7"] ghc: ["7.10.3","8.0.2", "8.2.2", "8.4.4", "8.6.5", "8.8.4", "8.10.7", "9.0.2"]
# ghc: ["8.8.3"] # ghc: ["8.8.3"]
steps: steps:

View File

@@ -11,7 +11,7 @@ description: GF, Grammatical Framework, is a programming language for multilingu
maintainer: John J. Camilleri <john@digitalgrammars.com> maintainer: John J. Camilleri <john@digitalgrammars.com>
homepage: https://www.grammaticalframework.org/ homepage: https://www.grammaticalframework.org/
bug-reports: https://github.com/GrammaticalFramework/gf-core/issues 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 data-dir: src
extra-source-files: extra-source-files:
@@ -46,7 +46,7 @@ data-files:
custom-setup custom-setup
setup-depends: setup-depends:
base >= 4.9.1 && < 4.15, base >= 4.9.1 && < 4.16,
Cabal >= 1.22.0.0, Cabal >= 1.22.0.0,
directory >= 1.3.0 && < 1.4, directory >= 1.3.0 && < 1.4,
filepath >= 1.4.1 && < 1.5, filepath >= 1.4.1 && < 1.5,
@@ -81,11 +81,11 @@ library
build-depends: build-depends:
-- GHC 8.0.2 to GHC 8.10.4 -- GHC 8.0.2 to GHC 8.10.4
array >= 0.5.1 && < 0.6, array >= 0.5.1 && < 0.6,
base >= 4.9.1 && < 4.15, base >= 4.9.1 && < 4.16,
bytestring >= 0.10.8 && < 0.11, bytestring >= 0.10.8 && < 0.11,
containers >= 0.5.7 && < 0.7, containers >= 0.5.7 && < 0.7,
exceptions >= 0.8.3 && < 0.11, 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, 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,
@@ -302,14 +302,14 @@ library
build-depends: build-depends:
cgi >= 3001.3.0.2 && < 3001.6, cgi >= 3001.3.0.2 && < 3001.6,
httpd-shed >= 0.4.0 && < 0.5, httpd-shed >= 0.4.0 && < 0.5,
network>=2.3 && <2.7 network>=2.3 && <3.2
if flag(network-uri) if flag(network-uri)
build-depends: build-depends:
network-uri >= 2.6.1.0 && < 2.7, network-uri >= 2.6.1.0 && < 2.7,
network>=2.6 && <2.7 network>=2.6 && <3.2
else else
build-depends: build-depends:
network >= 2.5 && <2.6 network >= 2.5 && <3.2
cpp-options: -DSERVER_MODE cpp-options: -DSERVER_MODE
other-modules: other-modules:
@@ -400,7 +400,7 @@ test-suite gf-tests
main-is: run.hs main-is: run.hs
hs-source-dirs: testsuite hs-source-dirs: testsuite
build-depends: build-depends:
base >= 4.9.1 && < 4.15, base >= 4.9.1 && < 4.16,
Cabal >= 1.8, Cabal >= 1.8,
directory >= 1.3.0 && < 1.4, directory >= 1.3.0 && < 1.4,
filepath >= 1.4.1 && < 1.5, filepath >= 1.4.1 && < 1.5,

View File

@@ -26,7 +26,7 @@ library
PGF2.Expr, PGF2.Expr,
PGF2.Type PGF2.Type
build-depends: build-depends:
base >= 4.9.1 && < 4.15, base >= 4.9.1 && < 4.16,
containers >= 0.5.7 && < 0.7, containers >= 0.5.7 && < 0.7,
pretty >= 1.1.3 && < 1.2 pretty >= 1.1.3 && < 1.2
default-language: Haskell2010 default-language: Haskell2010

View File

@@ -15,7 +15,7 @@ library
default-language: Haskell2010 default-language: Haskell2010
build-depends: build-depends:
array >= 0.5.1 && < 0.6, array >= 0.5.1 && < 0.6,
base >= 4.9.1 && < 4.15, base >= 4.9.1 && < 4.16,
bytestring >= 0.10.8 && < 0.11, bytestring >= 0.10.8 && < 0.11,
containers >= 0.5.7 && < 0.7, containers >= 0.5.7 && < 0.7,
ghc-prim >= 0.5.0 && < 0.7, ghc-prim >= 0.5.0 && < 0.7,

14
stack-ghc9.0.2.yaml Normal file
View File

@@ -0,0 +1,14 @@
resolver: lts-19.6
extra-deps:
# - network-2.6.3.6
# - httpd-shed-0.4.0.3
# - cgi-3001.5.0.0@sha256:3d1193a328d5f627a021a0ef3927c1ae41dd341e32dba612fed52d0e3a6df056,2990
# - json-0.10@sha256:d9fc6b07ce92b8894825a17d2cf14799856767eb30c8bf55962baa579207d799,3210
# - multipart-0.2.0@sha256:b8770e3ff6089be4dd089a8250894b31287cca671f3d258190a505f9351fa8a9,1084
# flags:
# gf:
# c-runtime: true
# extra-lib-dirs:
# - /usr/local/lib