From 19cf63976925ca64b318857bfabc7cb5a2e27ce1 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 16 Feb 2015 11:55:00 +0200
Subject: [PATCH 01/24] Upper bound for #443

---
 build-constraints.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 76fbc89d..0396bcfe 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -750,6 +750,7 @@ packages:
 
         # https://github.com/fpco/stackage/issues/443
         - exceptions < 0.7
+        - resourcet < 1.1.4
 
         # https://github.com/fpco/stackage/issues/445
         - semigroupoids < 4.3

From e62226e92c9904deb7748469dc414e5653f642d1 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 17 Feb 2015 02:12:21 +0200
Subject: [PATCH 02/24] Remove upper bounds and close #389

---
 build-constraints.yaml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 0396bcfe..c4de7765 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -315,8 +315,9 @@ packages:
 
     "Brent Yorgey <byorgey@gmail.com>":
         - active
-        - BlogLiterately
-        - BlogLiterately-diagrams
+        # Temporarily disabled due to restrictive lens upper bound
+        #- BlogLiterately
+        #- BlogLiterately-diagrams
         - diagrams
         - diagrams-builder
         - diagrams-contrib
@@ -711,10 +712,6 @@ packages:
         # https://github.com/fpco/stackage/issues/291
         - random < 1.0.1.3
 
-        # https://github.com/fpco/stackage/issues/389
-        - lens < 4.7
-        - hsdev < 0.1.3.3
-
         # https://github.com/fpco/stackage/issues/390
         # NOTE: When this issue is resolved, remove the expected test failure
         # for language-ecmascript as well.

From 635fc73f55c71a94676198a0430bbf4d4267211a Mon Sep 17 00:00:00 2001
From: Leon Mergen <leon@solatis.com>
Date: Tue, 17 Feb 2015 12:35:05 +0700
Subject: [PATCH 03/24] Update build-constraints.yaml

---
 build-constraints.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index c4de7765..019851b6 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -703,6 +703,9 @@ packages:
     "Gabríel Arthúr Pétursson gabriel@system.is":
         - sdl2
 
+    "Leon Mergen leon@solatis.com":
+        - network-attoparsec
+
     "Stackage upper bounds":
 
         # Force a specific version that's compatible with transformers 0.3

From 58a621bcbabe1d13133c9ac48e72d718c5fa6d8b Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 17 Feb 2015 07:46:51 +0200
Subject: [PATCH 04/24] Remove no-longer-needed upper bound

---
 build-constraints.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 019851b6..e291aff3 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -750,7 +750,6 @@ packages:
 
         # https://github.com/fpco/stackage/issues/443
         - exceptions < 0.7
-        - resourcet < 1.1.4
 
         # https://github.com/fpco/stackage/issues/445
         - semigroupoids < 4.3

From 4cb98cd9ed782df8711af480ec53dce783a2452a Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 17 Feb 2015 11:58:36 +0200
Subject: [PATCH 05/24] Include some missing system files

---
 debian-bootstrap.sh | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh
index c069dcb1..0beb5273 100755
--- a/debian-bootstrap.sh
+++ b/debian-bootstrap.sh
@@ -18,6 +18,9 @@ apt-get install -y \
     build-essential \
     libncurses-dev \
     git \
+    wget \
+    m4 \
+    texlive-binaries \
     libgmp3c2 \
     libgmp3-dev \
     zlib1g-dev \
@@ -38,7 +41,6 @@ apt-get install -y \
     libpq-dev \
     libicu-dev \
     libssl-dev \
-    nettle-dev \
     libgsl0-dev \
     libblas-dev \
     liblapack-dev \
@@ -50,3 +52,15 @@ apt-get install -y \
     liblzma-dev \
     libsdl2-dev \
     libzmq3-dev
+
+mkdir /tmp/nettle-build
+(
+cd /tmp/nettle-build
+wget https://ftp.gnu.org/gnu/nettle/nettle-2.7.1.tar.gz
+tar zxf nettle-2.7.1.tar.gz
+cd nettle-2.7.1
+./configure
+make
+make install
+)
+rm -rf /tmp/nettle-build

From 613fc07e8e6295520b49da940d6d7fbc9605e950 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 17 Feb 2015 15:41:08 +0200
Subject: [PATCH 06/24] Skip test suite jberryman/directory-tree#4

---
 build-constraints.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index e291aff3..a45cbfe3 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1011,6 +1011,9 @@ expected-test-failures:
     # https://github.com/haskell-distributed/distributed-process-execution/issues/2
     - distributed-process-execution
 
+    # https://github.com/jberryman/directory-tree/issues/4
+    - directory-tree
+
 # Haddocks which are expected to fail. Same concept as expected test failures.
 expected-haddock-failures:
     # https://github.com/acw/bytestring-progress/issues/4

From 4761d55ce4c9646ab48bc232f1a34810583136c1 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 17 Feb 2015 15:41:26 +0200
Subject: [PATCH 07/24] Docker image fixes

---
 build-constraints.yaml | 4 ++++
 debian-bootstrap.sh    | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index a45cbfe3..9c5c2591 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1011,6 +1011,10 @@ expected-test-failures:
     # https://github.com/haskell-distributed/distributed-process-execution/issues/2
     - distributed-process-execution
 
+    # Seems to depend on mtl being installed in user package database, which
+    # isn't always the case (e.g., build server)
+    - mtl
+
     # https://github.com/jberryman/directory-tree/issues/4
     - directory-tree
 
diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh
index 0beb5273..0f296009 100755
--- a/debian-bootstrap.sh
+++ b/debian-bootstrap.sh
@@ -37,6 +37,7 @@ apt-get install -y \
     llvm \
     libbz2-dev \
     libjudy-dev \
+    libsqlite3-dev \
     libmysqlclient-dev \
     libpq-dev \
     libicu-dev \
@@ -51,6 +52,7 @@ apt-get install -y \
     libyaml-dev \
     liblzma-dev \
     libsdl2-dev \
+    libxss-dev \
     libzmq3-dev
 
 mkdir /tmp/nettle-build
@@ -59,7 +61,7 @@ cd /tmp/nettle-build
 wget https://ftp.gnu.org/gnu/nettle/nettle-2.7.1.tar.gz
 tar zxf nettle-2.7.1.tar.gz
 cd nettle-2.7.1
-./configure
+./configure --prefix=/usr
 make
 make install
 )

From 5b72273a9f0fda115514f96589a658c5a25ed74f Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 17 Feb 2015 16:38:07 +0200
Subject: [PATCH 08/24] Remove upper bounds and close #446

---
 build-constraints.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 9c5c2591..0ab5775f 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -709,8 +709,7 @@ packages:
     "Stackage upper bounds":
 
         # Force a specific version that's compatible with transformers 0.3
-        - transformers-compat == 0.3.3.3
-        - mtl-compat < 0.2 # https://github.com/fpco/stackage/issues/446
+        - transformers-compat == 0.4.0.3
 
         # https://github.com/fpco/stackage/issues/291
         - random < 1.0.1.3

From 6c984bde6781febb7535780dd84665125a62cc54 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 18 Feb 2015 06:47:36 +0200
Subject: [PATCH 09/24] Typo

---
 build-constraints.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 0ab5775f..6db0dd3f 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1012,7 +1012,7 @@ expected-test-failures:
 
     # Seems to depend on mtl being installed in user package database, which
     # isn't always the case (e.g., build server)
-    - mtl
+    - happy
 
     # https://github.com/jberryman/directory-tree/issues/4
     - directory-tree

From d4234b84668eed85b18b43191c2faff79ad05e79 Mon Sep 17 00:00:00 2001
From: Timothy Jones <git@zmthy.io>
Date: Thu, 19 Feb 2015 17:13:23 +1300
Subject: [PATCH 10/24] Add http-media and cabal-test-quickcheck

---
 build-constraints.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 6db0dd3f..8eb473f6 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -706,6 +706,10 @@ packages:
     "Leon Mergen leon@solatis.com":
         - network-attoparsec
 
+    "Timothy Jones git@zmthy.io @zmthy":
+        - cabal-test-quickcheck
+        - http-media
+
     "Stackage upper bounds":
 
         # Force a specific version that's compatible with transformers 0.3

From bd6c774c02dfa256480fc7c977bf29bd0c423ae4 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 19 Feb 2015 07:51:43 +0200
Subject: [PATCH 11/24] Expected test failure massysett/multiarg#4

---
 build-constraints.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 6db0dd3f..fb328637 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1017,6 +1017,9 @@ expected-test-failures:
     # https://github.com/jberryman/directory-tree/issues/4
     - directory-tree
 
+    # https://github.com/massysett/multiarg/issues/4
+    - multiarg
+
 # Haddocks which are expected to fail. Same concept as expected test failures.
 expected-haddock-failures:
     # https://github.com/acw/bytestring-progress/issues/4

From 7183cf0f77f66a2463da2fd795654708dc9567ec Mon Sep 17 00:00:00 2001
From: Sebastiaan Visser <code@fvisser.nl>
Date: Thu, 19 Feb 2015 11:41:21 +0100
Subject: [PATCH 12/24] Update build-constraints.yaml

---
 build-constraints.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index fb328637..80e75e4e 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -390,9 +390,12 @@ packages:
         - fay-jquery
         - fay-text
         - fay-uri
-        - fclabels
         - snaplet-fay
 
+    "Sebastiaan Visser <haskell@fvisser.nl>":
+        - clay
+        - fclabels
+
     "Rodrigo Setti <rodrigosetti@gmail.com>":
         - messagepack
         - messagepack-rpc

From fb5e7af5c04cb158cb8cf2e8a6a8ca0ea57dfca3 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 19 Feb 2015 16:02:03 +0200
Subject: [PATCH 13/24] Remove expected failure

---
 build-constraints.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 80e75e4e..4f9fbbb7 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1020,9 +1020,6 @@ expected-test-failures:
     # https://github.com/jberryman/directory-tree/issues/4
     - directory-tree
 
-    # https://github.com/massysett/multiarg/issues/4
-    - multiarg
-
 # Haddocks which are expected to fail. Same concept as expected test failures.
 expected-haddock-failures:
     # https://github.com/acw/bytestring-progress/issues/4

From 4312df025fd5aa4be9972c3c276945c9cfd65515 Mon Sep 17 00:00:00 2001
From: Oleg Grenrus <oleg.grenrus@iki.fi>
Date: Sat, 21 Feb 2015 12:39:02 +0200
Subject: [PATCH 14/24] Add --skip-haddock -flag

---
 Stackage/CompleteBuild.hs |  2 ++
 Stackage/InstallBuild.hs  |  2 ++
 Stackage/PerformBuild.hs  |  3 ++-
 app/stackage.hs           | 10 ++++++++++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/Stackage/CompleteBuild.hs b/Stackage/CompleteBuild.hs
index cf74eef2..341be2b4 100644
--- a/Stackage/CompleteBuild.hs
+++ b/Stackage/CompleteBuild.hs
@@ -33,6 +33,7 @@ import System.IO                 (BufferMode (LineBuffering), hSetBuffering)
 -- | Flags passed in from the command line.
 data BuildFlags = BuildFlags
     { bfEnableTests      :: !Bool
+    , bfEnableHaddock    :: !Bool
     , bfDoUpload         :: !Bool
     , bfEnableLibProfile :: !Bool
     , bfVerbose          :: !Bool
@@ -203,6 +204,7 @@ getPerformBuild buildFlags Settings {..} = PerformBuild
     , pbJobs = 8
     , pbGlobalInstall = False
     , pbEnableTests = bfEnableTests buildFlags
+    , pbEnableHaddock = bfEnableHaddock buildFlags
     , pbEnableLibProfiling = bfEnableLibProfile buildFlags
     , pbVerbose = bfVerbose buildFlags
     , pbAllowNewer = bfSkipCheck buildFlags
diff --git a/Stackage/InstallBuild.hs b/Stackage/InstallBuild.hs
index abe8a14e..a6a6c25f 100644
--- a/Stackage/InstallBuild.hs
+++ b/Stackage/InstallBuild.hs
@@ -28,6 +28,7 @@ data InstallFlags = InstallFlags
     , ifJobs               :: !Int
     , ifGlobalInstall      :: !Bool
     , ifEnableTests        :: !Bool
+    , ifEnableHaddock      :: !Bool
     , ifEnableLibProfiling :: !Bool
     , ifVerbose            :: !Bool
     , ifSkipCheck          :: !Bool
@@ -48,6 +49,7 @@ getPerformBuild plan InstallFlags{..} =
     , pbJobs               = ifJobs
     , pbGlobalInstall      = ifGlobalInstall
     , pbEnableTests        = ifEnableTests
+    , pbEnableHaddock      = ifEnableHaddock
     , pbEnableLibProfiling = ifEnableLibProfiling
     , pbVerbose            = ifVerbose
     , pbAllowNewer         = ifSkipCheck
diff --git a/Stackage/PerformBuild.hs b/Stackage/PerformBuild.hs
index c74b449a..e38f8e62 100644
--- a/Stackage/PerformBuild.hs
+++ b/Stackage/PerformBuild.hs
@@ -62,6 +62,7 @@ data PerformBuild = PerformBuild
     , pbGlobalInstall :: Bool
     -- ^ Register packages in the global database
     , pbEnableTests        :: Bool
+    , pbEnableHaddock      :: Bool
     , pbEnableLibProfiling :: Bool
     , pbVerbose            :: Bool
     , pbAllowNewer         :: Bool
@@ -354,7 +355,7 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =
         -- dependency's haddocks before this finishes
         atomically $ putTMVar (piResult sbPackageInfo) True
 
-        when (pcHaddocks /= Don'tBuild && not (null $ sdModules $ ppDesc $ piPlan sbPackageInfo)) $ do
+        when (pbEnableHaddock && pcHaddocks /= Don'tBuild && not (null $ sdModules $ ppDesc $ piPlan sbPackageInfo)) $ do
             log' $ "Haddocks " ++ namever
             hfs <- readTVarIO sbHaddockFiles
             let hfsOpts = flip map (mapToList hfs) $ \(pkgVer, hf) -> concat
diff --git a/app/stackage.hs b/app/stackage.hs
index 8fdd2833..c8bb4f52 100644
--- a/app/stackage.hs
+++ b/app/stackage.hs
@@ -77,6 +77,11 @@ main =
             (switch
                  (long "skip-tests" <>
                   help "Skip build and running the test suites")) <*>
+        fmap
+            not
+            (switch
+                 (long "skip-haddock" <>
+                  help "Skip generating haddock documentation")) <*>
         fmap
             not
             (switch
@@ -136,6 +141,11 @@ main =
             (switch
                 (long "skip-tests" <>
                  help "Skip build and running the test suites")) <*>
+        fmap
+            not
+            (switch
+                 (long "skip-haddock" <>
+                  help "Skip generating haddock documentation")) <*>
         switch
             (long "enable-library-profiling" <>
              help "Enable profiling when building") <*>

From 4e2260a869ecc2288b927bf11fee67aca6708165 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 22 Feb 2015 07:03:40 +0200
Subject: [PATCH 15/24] Expected test failure zmthy/http-media#11

---
 build-constraints.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 3fc076f6..3318f930 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1024,6 +1024,9 @@ expected-test-failures:
     # https://github.com/jberryman/directory-tree/issues/4
     - directory-tree
 
+    # https://github.com/zmthy/http-media/issues/11
+    - http-media
+
 # Haddocks which are expected to fail. Same concept as expected test failures.
 expected-haddock-failures:
     # https://github.com/acw/bytestring-progress/issues/4

From 79b2b13b0e266e7461e66f5ebb7fd8f2f8068ea1 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 23 Feb 2015 07:09:16 +0200
Subject: [PATCH 16/24] Upper bound for #453

---
 build-constraints.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 3318f930..c9638349 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -760,6 +760,9 @@ packages:
         # https://github.com/fpco/stackage/issues/445
         - semigroupoids < 4.3
 
+        # https://github.com/fpco/stackage/issues/453
+        - descriptive < 0.9
+
 # Package flags are applied to individual packages, and override the values of
 # global-flags
 package-flags:

From c7230cd1dbad30c85d79c5a5819a6a0f9754c552 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 23 Feb 2015 07:10:35 +0200
Subject: [PATCH 17/24] Remove upper bounds and close #445

---
 build-constraints.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index c9638349..1a3ea338 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -757,9 +757,6 @@ packages:
         # https://github.com/fpco/stackage/issues/443
         - exceptions < 0.7
 
-        # https://github.com/fpco/stackage/issues/445
-        - semigroupoids < 4.3
-
         # https://github.com/fpco/stackage/issues/453
         - descriptive < 0.9
 

From 56a37736690957a35eb3fcc1fc137459ef2fc9e1 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 23 Feb 2015 07:11:54 +0200
Subject: [PATCH 18/24] Remove upper bound and close #402

---
 build-constraints.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 1a3ea338..39f6feee 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -726,9 +726,6 @@ packages:
         # for language-ecmascript as well.
         - language-ecmascript < 0.17
 
-        # https://github.com/fpco/stackage/issues/402
-        - vector-space < 0.9
-
         # https://github.com/fpco/stackage/issues/407
         - HStringTemplate < 0.8
 

From 42f96904d72e234e52dbe4761a77c05f1217d1cb Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 23 Feb 2015 08:16:19 +0200
Subject: [PATCH 19/24] Temporary upper bound for byorgey/haxr#7

---
 build-constraints.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 39f6feee..abf1e978 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -757,6 +757,9 @@ packages:
         # https://github.com/fpco/stackage/issues/453
         - descriptive < 0.9
 
+        # https://github.com/byorgey/haxr/issues/7
+        - haxr < 3000.10.4
+
 # Package flags are applied to individual packages, and override the values of
 # global-flags
 package-flags:

From 8a0e3b20aceb61cec6657360c89eba4c54d771c4 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 23 Feb 2015 09:40:21 +0200
Subject: [PATCH 20/24] Add expected test failure ekmett/semigroupoids#18

---
 build-constraints.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index abf1e978..0207887e 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1027,6 +1027,9 @@ expected-test-failures:
     # https://github.com/zmthy/http-media/issues/11
     - http-media
 
+    # https://github.com/ekmett/semigroupoids/issues/18
+    - semigroupoids
+
 # Haddocks which are expected to fail. Same concept as expected test failures.
 expected-haddock-failures:
     # https://github.com/acw/bytestring-progress/issues/4

From 7be69244306fbb86361b775c3046b219357d73a2 Mon Sep 17 00:00:00 2001
From: Chris Done <chrisdone@gmail.com>
Date: Mon, 23 Feb 2015 10:54:42 +0100
Subject: [PATCH 21/24] Fix descriptive upper bound on hindent (fixes #453)

---
 build-constraints.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 0207887e..953e4ef2 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -754,9 +754,6 @@ packages:
         # https://github.com/fpco/stackage/issues/443
         - exceptions < 0.7
 
-        # https://github.com/fpco/stackage/issues/453
-        - descriptive < 0.9
-
         # https://github.com/byorgey/haxr/issues/7
         - haxr < 3000.10.4
 

From 240de346305b902b564954e4c3bd750b72a8706b Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 23 Feb 2015 16:30:34 +0200
Subject: [PATCH 22/24] Remove upper bound for byorgey/haxr#7

---
 build-constraints.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 953e4ef2..8708a3c3 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -754,9 +754,6 @@ packages:
         # https://github.com/fpco/stackage/issues/443
         - exceptions < 0.7
 
-        # https://github.com/byorgey/haxr/issues/7
-        - haxr < 3000.10.4
-
 # Package flags are applied to individual packages, and override the values of
 # global-flags
 package-flags:

From 031ab4e77a0aa25e4856f6ffac8f67e084770c3e Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 23 Feb 2015 16:33:10 +0200
Subject: [PATCH 23/24] Extra #442 upper bounds

---
 build-constraints.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 8708a3c3..b91604c2 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -750,6 +750,8 @@ packages:
 
         # https://github.com/fpco/stackage/issues/442
         - blaze-builder < 0.4
+        - blaze-markup < 0.7
+        - blaze-html < 0.8
 
         # https://github.com/fpco/stackage/issues/443
         - exceptions < 0.7

From b7d0a219db3ec3f813cc8e2ad26e0264d525db2d Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 23 Feb 2015 16:34:47 +0200
Subject: [PATCH 24/24] Extra upper bound for #443

---
 build-constraints.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index b91604c2..123b4e8b 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -755,6 +755,9 @@ packages:
 
         # https://github.com/fpco/stackage/issues/443
         - exceptions < 0.7
+        - rest-client < 0.5
+        - rest-types < 1.13
+        - rest-core < 0.35
 
 # Package flags are applied to individual packages, and override the values of
 # global-flags