summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinaki <>2019-06-15 17:50:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2019-06-15 17:50:00 (GMT)
commit73ff6bcb296869cbe1daf99badebcdc033b0ffad (patch)
tree0c50b41904e441fc2c423130bca42eeada9fb5c6
parent8cb9ccf21f160489c586106a8859fd849d5460f3 (diff)
version 2.0.212.0.21
-rwxr-xr-xChangeLog.md4
-rwxr-xr-xREADME.md2
-rw-r--r--Setup.hs8
-rw-r--r--gi-gobject.cabal13
4 files changed, 21 insertions, 6 deletions
diff --git a/ChangeLog.md b/ChangeLog.md
index 3198dc7..1df92c0 100755
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,7 @@
+### 2.0.21
+
++ Add support for inherited dependencies
+
### 2.0.20
+ Tighten bounds in haskell-gi(-base)
diff --git a/README.md b/README.md
index 12552c0..8e06ba9 100755
--- 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.20/docs/GI-GObject.html](https://hackage.haskell.org/package/gi-gobject-2.0.20/docs/GI-GObject.html)
+[https://hackage.haskell.org/package/gi-gobject-2.0.21/docs/GI-GObject.html](https://hackage.haskell.org/package/gi-gobject-2.0.21/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/Setup.hs b/Setup.hs
index 0d4dac9..2856d02 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -1,11 +1,15 @@
{-# LANGUAGE OverloadedStrings #-}
-import Data.GI.CodeGen.CabalHooks (setupHaskellGIBinding)
+import Data.GI.CodeGen.CabalHooks (setupBinding, TaggedOverride(..))
+
+import qualified GI.GLib.Config as GLib
+
main :: IO ()
-main = setupHaskellGIBinding name version verbose overridesFile outputDir
+main = setupBinding name version verbose overridesFile inheritedOverrides outputDir
where name = "GObject"
version = "2.0"
overridesFile = Just "GObject.overrides"
verbose = False
outputDir = Nothing
+ inheritedOverrides = [TaggedOverride "inherited:GLib" GLib.overrides]
diff --git a/gi-gobject.cabal b/gi-gobject.cabal
index 8d141f1..9693cb9 100644
--- a/gi-gobject.cabal
+++ b/gi-gobject.cabal
@@ -1,5 +1,5 @@
name: gi-gobject
-version: 2.0.20
+version: 2.0.21
synopsis: GObject bindings
description: Bindings for GObject, autogenerated by haskell-gi.
homepage: https://github.com/haskell-gi/haskell-gi
@@ -16,7 +16,8 @@ extra-source-files: README.md ChangeLog.md stack.yaml GObject.overrides
custom-setup
setup-depends: base >= 4.9 && < 5,
Cabal >= 1.24,
- haskell-gi >= 0.22.0 && < 0.23
+ haskell-gi >= 0.22.5 && < 0.23,
+ gi-glib == 2.0.*
library
default-language: Haskell2010
@@ -27,7 +28,7 @@ library
pkgconfig-depends: gobject-2.0
build-depends: base >= 4.7 && <5,
haskell-gi-base >= 0.22.0 && < 0.23,
- haskell-gi >= 0.22.0 && < 0.23,
+ haskell-gi >= 0.22.5 && < 0.23,
haskell-gi-overloading < 1.1,
gi-glib == 2.0.*,
bytestring >= 0.10 && < 1,
@@ -40,6 +41,12 @@ library
if impl(ghc == 8.2.*)
build-depends: haskell-gi-overloading == 0.0
+ -- Note that the following list of exposed modules and autogen
+ -- modules is for documentation purposes only, so that some
+ -- documentation appears in hackage. The actual list of modules
+ -- to be built will be built at configure time, based on the
+ -- available introspection data.
+
exposed-modules: GI.GObject,
GI.GObject.Callbacks,
GI.GObject.Constants,