GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-20 16:42:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

More cabal file cleanup. Remove some more tabs from Haskell source.

Browse Source
This commit is contained in:
John J. Camilleri
2021-07-07 13:04:09 +02:00
parent f2e52d6f2c
commit 0954b4cbab
6 changed files with 52 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
gf.cabal
View File

@@ -41,11 +41,11 @@ data-files:
custom-setup custom-setup
setup-depends: setup-depends:
base, base >= 4.9.1 && < 4.15,
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,
process >=1.0.1.1 process >= 1.0.1.1 && < 1.7
source-repository head source-repository head
type: git type: git
@@ -75,20 +75,23 @@ library
default-language: Haskell2010 default-language: Haskell2010
build-depends: build-depends:
-- GHC 8.0.2 to GHC 8.10.4 -- GHC 8.0.2 to GHC 8.10.4
base >= 4.9.1 && < 4.15,
array >= 0.5.1 && < 0.6, array >= 0.5.1 && < 0.6,
containers >= 0.5.7 && < 0.7, base >= 4.9.1 && < 4.15,
bytestring >= 0.10.8 && < 0.11, bytestring >= 0.10.8 && < 0.11,
utf8-string >= 1.0.1.1 && < 1.1, containers >= 0.5.7 && < 0.7,
random >= 1.1 && < 1.3,
pretty >= 1.1.3 && < 1.2,
mtl >= 2.2.1 && < 2.3,
-- For compatability with GHC < 8
exceptions >= 0.8.3 && < 0.11, exceptions >= 0.8.3 && < 0.11,
fail >= 4.9.0 && < 4.10, ghc-prim >= 0.5.0 && < 0.7,
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 transformers-compat >= 0.6.3, but that is only in newer snapshots where it is redundant. -- We need transformers-compat >= 0.6.3, but that is only in newer snapshots where it is redundant.
transformers-compat >= 0.5.1.4 && < 0.7, transformers-compat >= 0.5.1.4 && < 0.7
ghc-prim >= 0.5.0 && < 0.7
if impl(ghc<8.0)
build-depends:
fail >= 4.9.0 && < 4.10
hs-source-dirs: src/runtime/haskell hs-source-dirs: src/runtime/haskell
other-modules: other-modules:
@@ -152,13 +155,13 @@ library
---- GF compiler as a library: ---- GF compiler as a library:
build-depends: build-depends:
filepath >= 1.4.1 && < 1.5,
directory >= 1.3.0 && < 1.4, directory >= 1.3.0 && < 1.4,
time >= 1.6.0 && < 1.10, filepath >= 1.4.1 && < 1.5,
process >= 1.4.3 && < 1.7,
haskeline >= 0.7.3 && < 0.9, haskeline >= 0.7.3 && < 0.9,
json >= 0.9.1 && < 0.11,
parallel >= 3.2.1.1 && < 3.3, parallel >= 3.2.1.1 && < 3.3,
json >= 0.9.1 && < 0.11 process >= 1.4.3 && < 1.7,
time >= 1.6.0 && < 1.10
hs-source-dirs: src/compiler hs-source-dirs: src/compiler
exposed-modules: exposed-modules:
@@ -292,9 +295,9 @@ library
if flag(server) if flag(server)
build-depends: build-depends:
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 && <2.7
cgi >= 3001.3.0.2 && < 3001.6
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,
@@ -346,8 +349,8 @@ library
Win32 >= 2.3.1.1 && < 2.7 Win32 >= 2.3.1.1 && < 2.7
else else
build-depends: build-depends:
unix >= 2.7.2 && < 2.8, terminfo >=0.4.0 && < 0.5,
terminfo >=0.4.0 && < 0.5 unix >= 2.7.2 && < 2.8
if impl(ghc>=8.2) if impl(ghc>=8.2)
ghc-options: -fhide-source-paths ghc-options: -fhide-source-paths

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

@@ -14,16 +14,18 @@ tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.10.4
library library
default-language: Haskell2010 default-language: Haskell2010
build-depends: build-depends:
base >= 4.9.1 && < 4.15,
array >= 0.5.1 && < 0.6, array >= 0.5.1 && < 0.6,
containers >= 0.5.7 && < 0.7, base >= 4.9.1 && < 4.15,
bytestring >= 0.10.8 && < 0.11, bytestring >= 0.10.8 && < 0.11,
utf8-string >= 1.0.1.1 && < 1.1, containers >= 0.5.7 && < 0.7,
random >= 1.1 && < 1.3,
pretty >= 1.1.3 && < 1.2,
mtl >= 2.2.1 && < 2.3,
ghc-prim >= 0.5.0 && < 0.7, ghc-prim >= 0.5.0 && < 0.7,
-- For compatability with GHC < 8 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
if impl(ghc<8.0)
build-depends:
fail >= 4.9.0 && < 4.10 fail >= 4.9.0 && < 4.10
other-modules: other-modules: