GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-22 11:19:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into lpgf

Browse Source 
# Conflicts:
#	gf.cabal
#	src/compiler/GF/Grammar/Canonical.hs
This commit is contained in:
John J. Camilleri
2021-07-07 09:42:44 +02:00
parent 2be54ffb12 f2e52d6f2c
commit 045def61d8
33 changed files with 867 additions and 834 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime/haskell-bind/pgf2.cabal
View File

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

2
src/runtime/haskell/pgf.cabal
View File

@@ -14,7 +14,7 @@ tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.10.4
library
default-language: Haskell2010
build-depends:
base >= 4.9.1 && <4.15,
base >= 4.9.1 && < 4.15,
array >= 0.5.1 && < 0.6,
containers >= 0.5.7 && < 0.7,
bytestring >= 0.10.8 && < 0.11,