summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinaki <>2018-01-10 18:30:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2018-01-10 18:30:00 (GMT)
commit882d384ce45ce1b816ebfef43bbaa4aa68551199 (patch)
tree990150ae2bd8feaacddd0f3a3b4f4326c798518a
parentc7a67cfc7309d974cd86aecd9d826258504e265f (diff)
version 2.0.162.0.16
-rw-r--r--ChangeLog.md4
-rw-r--r--README.md2
-rw-r--r--gi-gobject.cabal24
-rw-r--r--stack.yaml4
4 files changed, 16 insertions, 18 deletions
diff --git a/ChangeLog.md b/ChangeLog.md
index 0427081..47ad142 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,7 @@
+### 2.0.16
+
++ Remove enable-overloading flags, and use instead explicit CPP checks for 'haskell-gi-overloading-1.0', see [how to disable overloading](https://github.com/haskell-gi/haskell-gi/wiki/Overloading\#disabling-overloading).
+
### 2.0.15
+ Generate bindings for [Object.setDataFull](https://hackage.haskell.org/package/gi-gobject/docs/GI-GObject-Objects-Object.html#v:objectSetDataFull).
diff --git a/README.md b/README.md
index f987548..9ef391f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Documentation
Autogenerated documentation for this package can be found at
-[https://hackage.haskell.org/package/gi-gobject-2.0.15/docs/GI-GObject.html](https://hackage.haskell.org/package/gi-gobject-2.0.15/docs/GI-GObject.html)
+[https://hackage.haskell.org/package/gi-gobject-2.0.16/docs/GI-GObject.html](https://hackage.haskell.org/package/gi-gobject-2.0.16/docs/GI-GObject.html)
For general documentation on using [haskell-gi](https://github.com/haskell-gi/haskell-gi) based bindings, see [the project page](https://github.com/haskell-gi/haskell-gi) or [the Wiki](https://github.com/haskell-gi/haskell-gi/wiki).
diff --git a/gi-gobject.cabal b/gi-gobject.cabal
index c4cd6e7..9dadc8e 100644
--- a/gi-gobject.cabal
+++ b/gi-gobject.cabal
@@ -1,5 +1,5 @@
name: gi-gobject
-version: 2.0.15
+version: 2.0.16
synopsis: GObject bindings
description: Bindings for GObject, autogenerated by haskell-gi.
homepage: https://github.com/haskell-gi/haskell-gi
@@ -16,11 +16,7 @@ extra-source-files: README.md ChangeLog.md stack.yaml GObject.overrides
custom-setup
setup-depends: base >= 4.7 && < 5,
Cabal >= 1.24,
- haskell-gi >= 0.20.1 && < 1
-
-Flag enable-overloading
- Description: Enable support for overloaded labels.
- Default: True
+ haskell-gi == 0.21.*
library
default-language: Haskell2010
@@ -28,18 +24,18 @@ library
other-extensions: PatternSynonyms, ViewPatterns
ghc-options: -fno-warn-unused-imports -fno-warn-warnings-deprecations
- if flag(enable-overloading)
- cpp-options: -DENABLE_OVERLOADING
- build-depends: haskell-gi-overloading == 1.0.*
- else
- build-depends: haskell-gi-overloading == 0.0
-
pkgconfig-depends: gobject-2.0
build-depends: base >= 4.7 && <5,
- haskell-gi-base >= 0.20 && < 1,
- haskell-gi >= 0.20.1 && < 1,
+ haskell-gi-base == 0.21.*,
+ haskell-gi == 0.21.*,
+ haskell-gi-overloading < 1.1,
gi-glib == 2.0.*,
bytestring >= 0.10 && < 1,
containers >= 0.5 && < 1,
text >= 1.0 && < 2,
transformers >= 0.4 && < 1
+
+ -- Disable overloading when compiling under GHC 8.2.x
+ -- see https://ghc.haskell.org/trac/ghc/ticket/14382
+ if impl(ghc == 8.2.*)
+ build-depends: haskell-gi-overloading == 0.0
diff --git a/stack.yaml b/stack.yaml
index c44c930..a80f34e 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,5 +1,3 @@
packages:
- '.'
-explicit-setup-deps:
- ! '*': true
-resolver: nightly-2016-12-05
+resolver: lts-9.21