From 788f2073a0089ed05d3279612b5fa6ac315365fe Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Tue, 6 Jun 2017 16:41:07 +0100
Subject: [PATCH] Add upper bound for Haddock.

This commit is my latest attempt to solve haddock related errors.

At first, I thought the many missing HTML files (see closed tickets
below) were related to each individual package, however, with so many
packages failing, I think it must be related to the Haddock bug.

After testing this change manually with a new nightly build, I'm fairly
confident that this will get us back on the road until a new Haddock
release.

Please see https://github.com/haskell/haddock/issues/634.

Closes https://github.com/fpco/stackage/issues/2563.
Closes https://github.com/sinelaw/xml-to-json-fast/issues/5.
Closes https://github.com/tfausak/autoexporter/issues/4.
---
 build-constraints.yaml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index e313aed6..40b9c8c1 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3234,8 +3234,8 @@ packages:
         - blaze-html < 0.9
         - blaze-markup < 0.8
 
-        # https://github.com/tfausak/autoexporter/issues/4
-        - autoexporter < 1.0
+        # https://github.com/haskell/haddock/issues/634
+        - haddock < 2.17.4
 
 # end of packages
 
@@ -3658,7 +3658,6 @@ expected-test-failures:
     - servant # https://github.com/haskell-servant/servant/issues/698
     - snap-core # https://github.com/snapframework/snap-core/issues/26
     - stm-delay # https://github.com/joeyadams/haskell-stm-delay/issues/5
-    - haddock # https://github.com/haskell/haddock/issues/634
 
 # end of expected-test-failures
 
@@ -3709,8 +3708,6 @@ expected-haddock-failures:
     - 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
-    - dsp # https://github.com/fpco/stackage/issues/2563
-    - xml-to-json-fast # https://github.com/sinelaw/xml-to-json-fast/issues/5
 
     # Haddock bugs
     - swagger2 # https://github.com/GetShopTV/swagger2/issues/66