From 63b361c1e46ce20b41ed8ef751fa1c5a1206f9fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20Garc=C3=ADa=20Etxebarria?= Date: Sun, 18 Mar 2018 21:58:16 +0100 Subject: [PATCH 1/2] Re-add gi-gtk, gi-gio, and remove bound on haskell-gi-overloading These were removed due to a bug in GHC 8.2.1, and work fine with GHC 8.4.1. See https://github.com/fpco/stackage/issues/3186 and https://github.com/haskell-gi/haskell-gi/issues/113 for further context. --- build-constraints.yaml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c5870b11..f0ed7d64 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2562,16 +2562,18 @@ packages: - sum-type-boilerplate "Iñaki García Etxebarria @garetxe": + - haskell-gi + - haskell-gi-base - gi-atk - gi-cairo - gi-glib + - gi-gio - gi-gobject + - gi-gtk + - gi-gtk-hs + - gi-gtksource - gi-javascriptcore - - haskell-gi - - haskell-gi-base - # - gi-gtk-hs # gi-gio fails to build with ghc-8.2 - # - gi-gtksource # gi-gio fails to build with ghc-8.2 - # - gi-webkit2 # gi-gio fails to build with ghc-8.2 + - gi-webkit2 "Brandon Simmons @jberryman": - directory-tree @@ -4123,9 +4125,6 @@ packages: # https://github.com/fpco/stackage/issues/3183 - criterion < 1.4 - # https://github.com/fpco/stackage/issues/3186 - - haskell-gi-overloading < 1 - # https://github.com/fpco/stackage/issues/3337 - aeson < 1.3 From d4d9d7402d301a5035421e5b38c345d071b0de5c Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Sun, 18 Mar 2018 19:34:47 -0700 Subject: [PATCH 2/2] Remove gi-gtk-hs per its constraint: base < 4.11 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9a779a86..71748538 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2571,7 +2571,7 @@ packages: - gi-gio - gi-gobject - gi-gtk - - gi-gtk-hs + # - gi-gtk-hs # GHC 8.4 via base-4.11.0.0 - gi-gtksource - gi-javascriptcore - gi-webkit2