From 00ac53a20d31f4848fe363031f2a9cf00781e768 Mon Sep 17 00:00:00 2001 From: joe9 Date: Mon, 26 Dec 2016 00:25:00 -0700 Subject: [PATCH 1/5] added logger-thread and text-generic-pretty packages --- build-constraints.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 65dd6b09..85359762 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1,6 +1,10 @@ ghc-major-version: "8.0" # Constraints for brand new builds packages: + "Joe M @joe9": + - logger-thread + - text-generic-pretty + "Li-yao Xia @Lysxia": - generic-random - postgresql-orm < 0 From d1fb15f1d72b230b8b5049e36cd58e2b5c11f8e6 Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Tue, 27 Dec 2016 10:00:56 -0800 Subject: [PATCH 2/5] Constrain shakespeare per yesodweb/shakespeare#200 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 85359762..a40a8d6b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2718,6 +2718,9 @@ packages: # https://github.com/fpco/stackage/issues/2163 - cayley-client < 0.3.0 + # https://github.com/yesodweb/shakespeare/issues/200 + - shakespeare < 2.0.12 + # end of packages # Package flags are applied to individual packages, and override the values of From cb366bfe288545a63131ba8773c6a0400c824ed7 Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Tue, 27 Dec 2016 10:01:44 -0800 Subject: [PATCH 3/5] enable hledger-web --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index a40a8d6b..1a86b510 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -723,7 +723,7 @@ packages: - hledger - hledger-lib - hledger-ui - # - hledger-web # https://github.com/fpco/stackage/issues/2164 + - hledger-web - hledger-api # - shelltestrunner # bounds: Diff, HUnit - quickbench From 9409a803b66c1e849770cbb01b41ae1f11431d4f Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Tue, 27 Dec 2016 10:07:54 -0800 Subject: [PATCH 4/5] Expect text-generic-pretty haddocks to fail per #2160 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1a86b510..c20987be 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3140,6 +3140,7 @@ expected-haddock-failures: # "Compilation" errors - MemoTrie # https://github.com/conal/MemoTrie/issues/10 - metrics # https://github.com/iand675/metrics/issues/5 + - text-generic-pretty # https://github.com/fpco/stackage/pull/2160 # Haddock bugs - swagger2 # https://github.com/GetShopTV/swagger2/issues/66 From 63154ac8da05ab5e9270b8b52b9e69e19480a394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20Garc=C3=ADa=20Etxebarria?= Date: Tue, 27 Dec 2016 13:46:15 +0100 Subject: [PATCH 5/5] Remove bounds on gi-* packages The latest versions in hackage should be buildable with both stack and cabal new-build. --- build-constraints.yaml | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c20987be..15429cae 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2418,21 +2418,18 @@ packages: - telegram-api "Iñaki García Etxebarria @garetxe": - # Pinned to versions not using custom-setup, since stack does - # not understand that syntax yet: - # https://github.com/commercialhaskell/stack/issues/2094 - - gi-atk == 2.0.8 - - gi-cairo == 1.0.8 - - gi-gdk == 3.0.8 - - gi-gdkpixbuf == 2.0.8 - - gi-gio == 2.0.8 - - gi-glib == 2.0.8 - - gi-gobject == 2.0.8 - - gi-gtk == 3.0.8 - - gi-pango == 1.0.8 - - gi-soup == 2.4.8 - - gi-javascriptcore == 3.0.8 - - gi-webkit == 3.0.8 + - gi-atk + - gi-cairo + - gi-gdk + - gi-gdkpixbuf + - gi-gio + - gi-glib + - gi-gobject + - gi-gtk + - gi-pango + - gi-soup + - gi-javascriptcore == 3.0.* + - gi-webkit - haskell-gi - haskell-gi-base