summaryrefslogtreecommitdiff
path: root/src/runtime/haskell
diff options
context:
space:
mode:
authorKrasimir Angelov <kr.angelov@gmail.com>2018-11-28 14:25:53 +0100
committerKrasimir Angelov <kr.angelov@gmail.com>2018-11-28 14:25:53 +0100
commit69ad1e617ed9e40d52b1ec2c4b383879c5d622f2 (patch)
tree3c2ee73bf27a65828f508012756ff3ac27026251 /src/runtime/haskell
parenteb2774af2b516a37a30fceff96a161f72450a356 (diff)
parent9b28d21b0a6579d5b97367f5bba3181e04500242 (diff)
Merge branch 'master' of https://github.com/GrammaticalFramework/gf-core
Diffstat (limited to 'src/runtime/haskell')
-rw-r--r--src/runtime/haskell/pgf.cabal26
1 files changed, 9 insertions, 17 deletions
diff --git a/src/runtime/haskell/pgf.cabal b/src/runtime/haskell/pgf.cabal
index 8a84dc278..76e12bd2c 100644
--- a/src/runtime/haskell/pgf.cabal
+++ b/src/runtime/haskell/pgf.cabal
@@ -1,5 +1,5 @@
name: pgf
-version: 3.9.1-git
+version: 3.10
cabal-version: >= 1.20
build-type: Simple
@@ -12,11 +12,6 @@ bug-reports: https://github.com/GrammaticalFramework/gf-core/issues
maintainer: Thomas Hallgren
tested-with: GHC==7.6.3, GHC==7.8.3, GHC==7.10.3, GHC==8.0.2
-flag custom-binary
- Description: Use a customised version of the binary package
- Default: True
- Manual: True
-
Library
default-language: Haskell2010
build-depends: base >= 4.6 && <5,
@@ -29,17 +24,14 @@ Library
mtl,
exceptions
- if flag(custom-binary)
- other-modules:
- -- not really part of GF but I have changed the original binary library
- -- and we have to keep the copy for now.
- Data.Binary
- Data.Binary.Put
- Data.Binary.Get
- Data.Binary.Builder
- Data.Binary.IEEE754
- else
- build-depends: binary, data-binary-ieee754
+ other-modules:
+ -- not really part of GF but I have changed the original binary library
+ -- and we have to keep the copy for now.
+ Data.Binary
+ Data.Binary.Put
+ Data.Binary.Get
+ Data.Binary.Builder
+ Data.Binary.IEEE754
--ghc-options: -fwarn-unused-imports
--if impl(ghc>=7.8)