From b76b19a31e9edfcadb9738171d22661ff1b970ee Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sat, 28 Mar 2015 20:48:55 +0300
Subject: [PATCH 01/77] Upper bound for #497

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 34ec41ca..84668fac 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -854,6 +854,9 @@ packages:
         # https://github.com/fpco/stackage/issues/494
         - criterion < 1.1
 
+        # https://github.com/fpco/stackage/issues/497
+        - primitive < 0.6
+
 # Package flags are applied to individual packages, and override the values of
 # global-flags
 package-flags:

From 5540c316ab6c9f7dae327f5f1b44864e904e324f Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sat, 28 Mar 2015 20:52:40 +0300
Subject: [PATCH 02/77] GHC 7.8/Haddocks upper bounds

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 84668fac..4550e18c 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -819,6 +819,10 @@ packages:
         - maximal-cliques
 
     "Stackage upper bounds":
+        # GHC 7.8 uppdate bound
+        - haddock-api < 2.16
+        - haddock-library < 1.2
+        - hdocs < 0.4.2
 
         # Force a specific version that's compatible with transformers 0.3
         - transformers-compat == 0.4.0.3

From ba52b3776e31a09313ef71d0a922829987ffa744 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sat, 28 Mar 2015 21:01:42 +0300
Subject: [PATCH 03/77] Upper bound for Daniel-Diaz/binary-list#2

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 4550e18c..49d6c9e6 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -861,6 +861,9 @@ packages:
         # https://github.com/fpco/stackage/issues/497
         - primitive < 0.6
 
+        # https://github.com/Daniel-Diaz/binary-list/issues/2
+        - binary-list < 1.1
+
 # Package flags are applied to individual packages, and override the values of
 # global-flags
 package-flags:

From 511b2366b0961626579de82ad1a0ba97601f7ebe Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 29 Mar 2015 00:34:21 +0300
Subject: [PATCH 04/77] Expected test failure for nsis

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 49d6c9e6..b45456a5 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1152,6 +1152,9 @@ expected-test-failures:
     # Requires locally running services
     - network-anonymous-i2p
 
+    # Tests not reliable on non-Windows systems
+    - nsis
+
 # Haddocks which are expected to fail. Same concept as expected test failures.
 expected-haddock-failures:
     # https://github.com/acw/bytestring-progress/issues/4

From 3dea63fd625939c349dc5b2854d363f1f25507df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20D=C3=ADaz?= <dhelta.diaz@gmail.com>
Date: Sun, 29 Mar 2015 00:32:20 +0100
Subject: [PATCH 05/77] binary-list upper bound should no longer be necessary.

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index b45456a5..e08a4e40 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -861,9 +861,6 @@ packages:
         # https://github.com/fpco/stackage/issues/497
         - primitive < 0.6
 
-        # https://github.com/Daniel-Diaz/binary-list/issues/2
-        - binary-list < 1.1
-
 # Package flags are applied to individual packages, and override the values of
 # global-flags
 package-flags:

From c49dfb95e6d9ff61ae1aaa81a1db923a6bf2dc55 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 29 Mar 2015 09:24:44 +0300
Subject: [PATCH 06/77] Upper bound for jgm/pandoc#2036

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index e08a4e40..5e39e88c 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -861,6 +861,9 @@ packages:
         # https://github.com/fpco/stackage/issues/497
         - primitive < 0.6
 
+        # https://github.com/jgm/pandoc/issues/2036
+        - highlighting-kate < 0.5.14
+
 # Package flags are applied to individual packages, and override the values of
 # global-flags
 package-flags:

From 2a2c651c1a76f75b2ec86e8b35c0079223f363e3 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 29 Mar 2015 09:33:16 +0300
Subject: [PATCH 07/77] More restrictive upper bound @lierdakil

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 5e39e88c..62f2b31c 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -862,7 +862,7 @@ packages:
         - primitive < 0.6
 
         # https://github.com/jgm/pandoc/issues/2036
-        - highlighting-kate < 0.5.14
+        - highlighting-kate < 0.5.13
 
 # Package flags are applied to individual packages, and override the values of
 # global-flags

From 1dd1e33b47042a69977f93d4d9735f49ea26cbc7 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 29 Mar 2015 12:49:00 +0300
Subject: [PATCH 08/77] Remove upper bounds and close #424

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 62f2b31c..d6fe2455 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -830,9 +830,6 @@ packages:
         # https://github.com/fpco/stackage/issues/415
         - hackage-db < 1.12
 
-        # https://github.com/fpco/stackage/issues/424
-        - control-monad-free < 0.6
-
         # https://github.com/fpco/stackage/issues/442
         - blaze-builder < 0.4
 

From 8276274632cd06b12524e6b245d311b55cd30e88 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 29 Mar 2015 12:50:19 +0300
Subject: [PATCH 09/77] Remove upper bounds and close ekmett/linear#70

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index d6fe2455..8cf32d6e 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -843,9 +843,6 @@ packages:
         # https://github.com/fpco/stackage/issues/476
         - vector-space < 0.10
 
-        # https://github.com/ekmett/linear/issues/70
-        - linear < 1.18
-
         # https://github.com/fpco/stackage/issues/479
         - QuickCheck < 2.8
 

From 858fa9e0fbb5ad32603a1e5bfca0be8339aa0186 Mon Sep 17 00:00:00 2001
From: Alexander Bondarenko <aenor.realm@gmail.com>
Date: Sun, 29 Mar 2015 13:03:07 +0300
Subject: [PATCH 10/77] Register soap-*

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 8cf32d6e..74854d56 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -818,6 +818,11 @@ packages:
         - cubicspline
         - maximal-cliques
 
+    "Alexander Bondarenko <aenor.realm@gmail.com> @wiz":
+        - soap
+        - soap-tls
+        - soap-openssl
+
     "Stackage upper bounds":
         # GHC 7.8 uppdate bound
         - haddock-api < 2.16

From 165f8a8768faa79ad97ebb25165addde47682144 Mon Sep 17 00:00:00 2001
From: Gabriel Gonzalez <Gabriel439@gmail.com>
Date: Sun, 29 Mar 2015 09:39:29 -0500
Subject: [PATCH 11/77] Add `turtle` to Stackage

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 74854d56..ea6fec5c 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -386,6 +386,7 @@ packages:
         - pipes-parse
         - pipes-concurrency
         - pipes-safe
+        - turtle
 
     "Chris Allen <cma@bitemyapp.com>":
         - bloodhound

From f416811d4ac1ccdab51da679885a2e40ef011fd2 Mon Sep 17 00:00:00 2001
From: agocorona <agocorona@gmail.com>
Date: Sun, 29 Mar 2015 20:42:24 +0200
Subject: [PATCH 12/77] Reintroduced Alberto G. Corona packages

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index ea6fec5c..6d951c09 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -217,12 +217,11 @@ packages:
         # requires old haddock currently - haskell-docs
         # TODO: Add structured-haskell-mode once they've been ported to HSE 1.16.
 
-    # GHC 7.6
-    # "Alberto G. Corona <agocorona@gmail.com>":
-    #    - RefSerialize
-    #    - TCache
-    #    - Workflow
-    #    - MFlow
+    "Alberto G. Corona <agocorona@gmail.com>":
+        - RefSerialize
+        - TCache
+        - Workflow
+        - MFlow
 
     "Edward Kmett <ekmett@gmail.com>":
         - ad

From ee4e58d3ef9486ccea50a129a976475eed1bafbb Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 29 Mar 2015 23:11:05 +0300
Subject: [PATCH 13/77] Remove upper bounds and close #341

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 6d951c09..4f7a2a7a 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -435,10 +435,7 @@ packages:
         - amqp
         - curl
         - generics-sop
-
-        # https://github.com/fpco/stackage/issues/341
-        - haskell-names < 0.5
-
+        - haskell-names
         - haskell-packages
         - heredoc
         - hse-cpp

From f31e09dc98c0dfc883748b98e8364d66269a9941 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20D=C3=ADaz?= <dhelta.diaz@gmail.com>
Date: Sun, 29 Mar 2015 22:19:17 +0200
Subject: [PATCH 14/77] Yet another package from Daniel Diaz.

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 4f7a2a7a..f85bf874 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -379,6 +379,7 @@ packages:
         - binary-list
         - haskintex
         - post-mess-age
+        - include-file
 
     "Gabriel Gonzalez <Gabriel439@gmail.com>":
         - pipes

From c6be261fbc529fda7e240727c7640000e4bbf262 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 29 Mar 2015 23:22:43 +0300
Subject: [PATCH 15/77] Upper bound for bos/mwc-random#45

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 4f7a2a7a..abf13c51 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -860,6 +860,9 @@ packages:
         # https://github.com/jgm/pandoc/issues/2036
         - highlighting-kate < 0.5.13
 
+        # https://github.com/bos/mwc-random/issues/45
+        - mwc-random < 0.13.3.1
+
 # Package flags are applied to individual packages, and override the values of
 # global-flags
 package-flags:

From eed98f0be4cfb4926ad31e9249f2d88e9cf4189a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mario=20Bla=C5=BEevi=C4=87?= <blamario@yahoo.com>
Date: Sun, 29 Mar 2015 19:37:20 -0400
Subject: [PATCH 16/77] Adding picoparsec to Stackage.

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 08077dab..1e18f24c 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -307,6 +307,7 @@ packages:
         - monad-coroutine
         - incremental-parser
         - monoid-subclasses
+        - picoparsec
 
     "Brent Yorgey <byorgey@gmail.com>":
         - active

From f63402751a798ea7ee7f1c032e16c0df463d73a9 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 30 Mar 2015 08:01:57 +0300
Subject: [PATCH 17/77] Add foldl to Gabriel #497

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index abf13c51..7b2971ee 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -386,6 +386,7 @@ packages:
         - pipes-concurrency
         - pipes-safe
         - turtle
+        - foldl
 
     "Chris Allen <cma@bitemyapp.com>":
         - bloodhound

From 49075486cd933d8b0d1c47a21aeeee8669f57e98 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 30 Mar 2015 08:08:36 +0300
Subject: [PATCH 18/77] Remove upper bound for bos/mwc-random#45

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 36847602..c02ec054 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -863,9 +863,6 @@ packages:
         # https://github.com/jgm/pandoc/issues/2036
         - highlighting-kate < 0.5.13
 
-        # https://github.com/bos/mwc-random/issues/45
-        - mwc-random < 0.13.3.1
-
 # Package flags are applied to individual packages, and override the values of
 # global-flags
 package-flags:

From 31044dc760c2967676703aedf592d1684cb36be2 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 30 Mar 2015 13:43:21 +0300
Subject: [PATCH 19/77] Add ide-backend

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index c02ec054..5a7441b4 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -121,6 +121,10 @@ packages:
 
         - kure
 
+        - ide-backend
+        - ide-backend-server
+        - ide-backend-rts
+
     "Omari Norman <omari@smileystation.com>":
         - rainbow
         - multiarg

From 01b7812913385d359b83f3abbff9af5591edd1b7 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 30 Mar 2015 13:46:10 +0300
Subject: [PATCH 20/77] Extra upper bound on cabal-test-quickcheck for #479
 @zmthy

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 5a7441b4..0ce75a7b 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -854,6 +854,7 @@ packages:
 
         # https://github.com/fpco/stackage/issues/479
         - QuickCheck < 2.8
+        - cabal-test-quickcheck < 0.1.6
 
         # https://github.com/fpco/stackage/issues/483
         - rethinkdb-client-driver < 0.0.15

From e0835eb000489badc09fd075620b9fb2ee99fedc Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 30 Mar 2015 13:47:38 +0300
Subject: [PATCH 21/77] Stricter upper bound

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 0ce75a7b..91281d7a 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -854,7 +854,7 @@ packages:
 
         # https://github.com/fpco/stackage/issues/479
         - QuickCheck < 2.8
-        - cabal-test-quickcheck < 0.1.6
+        - cabal-test-quickcheck < 0.1.5
 
         # https://github.com/fpco/stackage/issues/483
         - rethinkdb-client-driver < 0.0.15

From 97b12686dce61586b94675b73da9b4e98baf051b Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 30 Mar 2015 14:41:30 +0300
Subject: [PATCH 22/77] Cabal-ide-backend: expected test failure

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 91281d7a..ff7d3568 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1159,6 +1159,9 @@ expected-test-failures:
     # Tests not reliable on non-Windows systems
     - nsis
 
+    # Just a temporary package with a flimsy, inherited test suite
+    - Cabal-ide-backend
+
 # Haddocks which are expected to fail. Same concept as expected test failures.
 expected-haddock-failures:
     # https://github.com/acw/bytestring-progress/issues/4

From 60eccf72afd00226583f95b459b7bfcb42abe495 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Mon, 30 Mar 2015 06:41:33 -0700
Subject: [PATCH 23/77] add hledger-web

I don't really know a better to add this than submit a PR and hope the buildbots are kind. Tips welcome.
---
 build-constraints.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 4036dc18..a44926d4 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -527,6 +527,7 @@ packages:
 
     "Simon Michael <simon@joyful.com>":
         - hledger
+        - hledger-web
 
     "Mihai Maruseac <mihai.maruseac@gmail.com>":
         - io-manager

From 02398985d269530ef96c575b9c8f4772a4869613 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Mon, 30 Mar 2015 06:48:42 -0700
Subject: [PATCH 24/77] add shelltestrunner

A tool for testing command-line programs.
---
 build-constraints.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 4036dc18..e9a869ea 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -527,6 +527,7 @@ packages:
 
     "Simon Michael <simon@joyful.com>":
         - hledger
+        - shelltestrunner
 
     "Mihai Maruseac <mihai.maruseac@gmail.com>":
         - io-manager

From cc58922a05804cf47ccc1f9710e2b971bde2454a Mon Sep 17 00:00:00 2001
From: Andres Loeh <andres@well-typed.com>
Date: Mon, 30 Mar 2015 16:07:53 +0200
Subject: [PATCH 25/77] Change maintainer for generics-sop.

Explanation:

  - I am the actual maintainer of the package.
  - Roman registered it before because he needed it.
  - I've confirmed with Roman that he's ok with this change.
---
 build-constraints.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index ff7d3568..d7cdf91f 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -441,7 +441,6 @@ packages:
         - action-permutations
         - amqp
         - curl
-        - generics-sop
         - haskell-names
         - haskell-packages
         - heredoc
@@ -827,6 +826,9 @@ packages:
         - soap-tls
         - soap-openssl
 
+    "Andres Löh <andres@well-typed.com> @kosmikus":
+        - generics-sop
+
     "Stackage upper bounds":
         # GHC 7.8 uppdate bound
         - haddock-api < 2.16

From bdb4afc0ff8016d0d057e320e2fed45311902e91 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 30 Mar 2015 17:48:27 +0300
Subject: [PATCH 26/77] Upper bound for #509

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 2bf77bed..dc2f7812 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -871,6 +871,9 @@ packages:
         # https://github.com/jgm/pandoc/issues/2036
         - highlighting-kate < 0.5.13
 
+        # https://github.com/fpco/stackage/issues/509
+        - srcloc < 0.5
+
 # Package flags are applied to individual packages, and override the values of
 # global-flags
 package-flags:

From c7ba37cf496fd6f7b4c51ae0f6df225c8f3108c9 Mon Sep 17 00:00:00 2001
From: Oleg Grenrus <oleg.grenrus@iki.fi>
Date: Mon, 30 Mar 2015 20:14:06 +0300
Subject: [PATCH 27/77] Add edit-distance and lattice

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 81d05f53..a2010115 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -748,6 +748,8 @@ packages:
         - string-conversions
 
     "Oleg Grenrus oleg.grenrus@iki.fi @phadej":
+        - edit-distance
+        - lattices
         - waitra
 
     "Adam C. Foltzer acfoltzer@galois.com @acfoltzer":

From 106638d32b705e9ee56e794d6c88baf9fabd7b58 Mon Sep 17 00:00:00 2001
From: Vivian McPhail <haskell.vivian.mcphail@gmail.com>
Date: Tue, 31 Mar 2015 06:29:25 +1300
Subject: [PATCH 28/77] Update build-constraints.yaml

Added Vivian McPhail's projects to `build-constraints.yaml`.
---
 build-constraints.yaml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 81d05f53..7bc74d1d 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -831,6 +831,16 @@ packages:
     "Andres Löh <andres@well-typed.com> @kosmikus":
         - generics-sop
 
+    "Vivian McPhail <haskell.vivian.mcphail@gmail.com>":
+        - hmatrix-gsl-stats
+        - hstatistics
+        - hsignal
+        - plot
+        - plot-gtk
+        - plot-gtk3
+        - vector-buffer
+        - hmatrix-repa
+        
     "Stackage upper bounds":
         # GHC 7.8 uppdate bound
         - haddock-api < 2.16

From 94a49a22a112dc02118c6513fc65c84b4c5190d0 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 30 Mar 2015 21:15:11 +0300
Subject: [PATCH 29/77] Add extra system dependency (pinging @manny-fp)

---
 debian-bootstrap.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh
index 827e8460..2f158306 100755
--- a/debian-bootstrap.sh
+++ b/debian-bootstrap.sh
@@ -53,6 +53,7 @@ apt-get install -y \
     liblzma-dev \
     libsdl2-dev \
     libxss-dev \
+    libgtk-3-dev \
     libzmq3-dev
 
 mkdir /tmp/nettle-build

From 024beb30098e0be18363c477799fbc11462b0d48 Mon Sep 17 00:00:00 2001
From: Noam Lewis <jones.noamle@gmail.com>
Date: Tue, 31 Mar 2015 00:14:26 +0300
Subject: [PATCH 30/77] add xml-to-json and xml-to-json-fast

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 10fd195b..914683f8 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -843,6 +843,10 @@ packages:
         - vector-buffer
         - hmatrix-repa
         
+    "Noam Lewis <jones.noamle@gmail.com> @sinelaw":
+        - xml-to-json
+        - xml-to-json-fast
+        
     "Stackage upper bounds":
         # GHC 7.8 uppdate bound
         - haddock-api < 2.16

From 03e5c9149a38c81c423283c63443193ae77a8d38 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 31 Mar 2015 10:29:30 +0300
Subject: [PATCH 31/77] Add some new packages (pinging @dysinger)

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 914683f8..a948e6ea 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -125,6 +125,11 @@ packages:
         - ide-backend-server
         - ide-backend-rts
 
+        - hackage-mirror
+        - wai-middleware-consul
+        - monad-logger-json
+        - monad-logger-syslog
+
     "Omari Norman <omari@smileystation.com>":
         - rainbow
         - multiarg

From 888dddfd6fc435cdde82bd3aea510608bacc7b8e Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 31 Mar 2015 16:39:37 +0300
Subject: [PATCH 32/77] Upper bound for #514

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index a948e6ea..1b190bb5 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -896,6 +896,9 @@ packages:
         # https://github.com/fpco/stackage/issues/509
         - srcloc < 0.5
 
+        # https://github.com/fpco/stackage/issues/514
+        - tasty-golden < 2.3
+
 # Package flags are applied to individual packages, and override the values of
 # global-flags
 package-flags:

From c0b2b91dcbf8293427a162c274016fbe2a793d02 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 31 Mar 2015 20:14:04 +0300
Subject: [PATCH 33/77] Remove upper bounds and close #514

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 1b190bb5..a948e6ea 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -896,9 +896,6 @@ packages:
         # https://github.com/fpco/stackage/issues/509
         - srcloc < 0.5
 
-        # https://github.com/fpco/stackage/issues/514
-        - tasty-golden < 2.3
-
 # Package flags are applied to individual packages, and override the values of
 # global-flags
 package-flags:

From 70ee24425755d29397adfada07c1f8a83afcf968 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 1 Apr 2015 07:28:53 +0300
Subject: [PATCH 34/77] Temporarily blocking ede due to #487

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index a948e6ea..afe3ad0d 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -811,7 +811,8 @@ packages:
         - amazonka-sts
         - amazonka-support
         - amazonka-swf
-        - ede
+        # https://github.com/fpco/stackage/issues/487
+        # - ede Temporary block: trifecta uses blaze-markup < 0.7
         - pagerduty
         - semver
         - text-manipulate
@@ -867,10 +868,6 @@ packages:
         # https://github.com/fpco/stackage/issues/442
         - blaze-builder < 0.4
 
-        # https://github.com/fpco/stackage/issues/487
-        - blaze-markup < 0.7
-        - blaze-html < 0.8
-
         # https://github.com/fpco/stackage/issues/467
         - lens < 4.8
 

From 4b66f128be1ff786daa2c38de5a946ee901c6981 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 1 Apr 2015 07:42:45 +0300
Subject: [PATCH 35/77] Expected test failure for consul-haskell

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index afe3ad0d..93130166 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1187,6 +1187,9 @@ expected-test-failures:
     # Just a temporary package with a flimsy, inherited test suite
     - Cabal-ide-backend
 
+    # Requires running server
+    - consul-haskell
+
 # Haddocks which are expected to fail. Same concept as expected test failures.
 expected-haddock-failures:
     # https://github.com/acw/bytestring-progress/issues/4

From 3358e498c2acc62350a97ab2863a572cec31aa0e Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 1 Apr 2015 08:05:05 +0300
Subject: [PATCH 36/77] Add back ede and close #487

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 93130166..8d27343c 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -811,8 +811,7 @@ packages:
         - amazonka-sts
         - amazonka-support
         - amazonka-swf
-        # https://github.com/fpco/stackage/issues/487
-        # - ede Temporary block: trifecta uses blaze-markup < 0.7
+        - ede
         - pagerduty
         - semver
         - text-manipulate

From 7d55a8b9fc9859cf9ce4e3b7eba3dac6e47366e9 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 1 Apr 2015 08:12:57 +0300
Subject: [PATCH 37/77] Remove deprecated process-conduit

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 8d27343c..c4c682de 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -19,7 +19,6 @@ packages:
         - persistent-postgresql
         - persistent-sqlite
         - persistent-template
-        - process-conduit
         - random-shuffle
         - sphinx
         - stm-conduit

From 9e67fd7c3b2ff614b9368cbf798445e091bbc2a1 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 1 Apr 2015 11:10:07 +0300
Subject: [PATCH 38/77] Temporarily disable codex #415

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index c4c682de..17889606 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -693,7 +693,8 @@ packages:
         - unbound-generics
 
     "Alois Cochard alois.cochard@gmail.com @aloiscochard":
-        - codex
+        # https://github.com/fpco/stackage/issues/415
+        # - codex
         - machines-directory
         - machines-io
         - machines-process
@@ -860,9 +861,6 @@ packages:
         # Force a specific version that's compatible with transformers 0.3
         - transformers-compat == 0.4.0.3
 
-        # https://github.com/fpco/stackage/issues/415
-        - hackage-db < 1.12
-
         # https://github.com/fpco/stackage/issues/442
         - blaze-builder < 0.4
 

From f97b52b42189c3bb7c66fd5a679d3107806025c9 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 1 Apr 2015 11:15:49 +0300
Subject: [PATCH 39/77] Block some benchmarks #494

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 17889606..e01d2f02 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -877,9 +877,6 @@ packages:
         # https://github.com/fpco/stackage/issues/483
         - rethinkdb-client-driver < 0.0.15
 
-        # https://github.com/fpco/stackage/issues/494
-        - criterion < 1.1
-
         # https://github.com/fpco/stackage/issues/497
         - primitive < 0.6
 
@@ -1230,6 +1227,11 @@ skipped-benchmarks:
     # https://github.com/fpco/stackage/issues/488
     - uuid-types
 
+    # https://github.com/fpco/stackage/issues/494
+    - case-insensitive
+    - postgresql-binary
+    - scientific
+
 skipped-profiling:
     # https://github.com/nomeata/ghc-heap-view/commit/8d198eb8fbbad2ce0c4527c781659f35b8909c04#diff-8288955e209cfbead5b318a8598be9c0R10
     - ghc-heap-view

From ffbafa6c9746b3cf8b09da532c6a888fb91e0559 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 1 Apr 2015 20:13:22 +0300
Subject: [PATCH 40/77] Remove upper bounds and close #442

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index e01d2f02..946fa3fc 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -861,9 +861,6 @@ packages:
         # Force a specific version that's compatible with transformers 0.3
         - transformers-compat == 0.4.0.3
 
-        # https://github.com/fpco/stackage/issues/442
-        - blaze-builder < 0.4
-
         # https://github.com/fpco/stackage/issues/467
         - lens < 4.8
 

From e2f151cffebafafecc7ffb0d5f5540a7a5d5d849 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 1 Apr 2015 22:55:18 +0300
Subject: [PATCH 41/77] Upper bounds for #515

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 946fa3fc..d27bda92 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -883,6 +883,9 @@ packages:
         # https://github.com/fpco/stackage/issues/509
         - srcloc < 0.5
 
+        # https://github.com/fpco/stackage/issues/515
+        - exception-transformers < 0.4
+
 # Package flags are applied to individual packages, and override the values of
 # global-flags
 package-flags:

From e92405f5f6121f9910e45430acaa11f08c969a7f Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 1 Apr 2015 23:08:16 +0300
Subject: [PATCH 42/77] Extra upper bound for #515

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index d27bda92..59dd99fa 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -885,6 +885,7 @@ packages:
 
         # https://github.com/fpco/stackage/issues/515
         - exception-transformers < 0.4
+        - exception-mtl < 0.4
 
 # Package flags are applied to individual packages, and override the values of
 # global-flags

From 7ab03059d0c3067c9216cd2e7e4846ef00d89231 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 1 Apr 2015 21:15:13 +0300
Subject: [PATCH 43/77] Remove upper bounds and close #497

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 59dd99fa..e2ba76f2 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -874,9 +874,6 @@ packages:
         # https://github.com/fpco/stackage/issues/483
         - rethinkdb-client-driver < 0.0.15
 
-        # https://github.com/fpco/stackage/issues/497
-        - primitive < 0.6
-
         # https://github.com/jgm/pandoc/issues/2036
         - highlighting-kate < 0.5.13
 

From 534f27fbf386c865d87a25d6a90685f860d05c0b Mon Sep 17 00:00:00 2001
From: Tim Baumann <tim@timbaumann.info>
Date: Wed, 1 Apr 2015 22:56:02 +0200
Subject: [PATCH 44/77] Add 'aeson-schema'

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index e2ba76f2..768dad92 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -851,6 +851,9 @@ packages:
     "Noam Lewis <jones.noamle@gmail.com> @sinelaw":
         - xml-to-json
         - xml-to-json-fast
+    
+    "Tim Baumann <tim@timbaumann.info> @timjb":
+        - aeson-schema
         
     "Stackage upper bounds":
         # GHC 7.8 uppdate bound

From f5aa9ce4176f594dd440918afab10e232c3000ac Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 2 Apr 2015 10:16:32 +0300
Subject: [PATCH 45/77] Remove upper bounds and close #483

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 768dad92..09fba0e1 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -874,9 +874,6 @@ packages:
         - QuickCheck < 2.8
         - cabal-test-quickcheck < 0.1.5
 
-        # https://github.com/fpco/stackage/issues/483
-        - rethinkdb-client-driver < 0.0.15
-
         # https://github.com/jgm/pandoc/issues/2036
         - highlighting-kate < 0.5.13
 

From b7e6a300a3e87f21864d053219f709e8b76c9689 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 2 Apr 2015 10:18:58 +0300
Subject: [PATCH 46/77] Expected test failure timjb/aeson-schema#9

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 09fba0e1..b0320850 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1181,6 +1181,9 @@ expected-test-failures:
     # Requires running server
     - consul-haskell
 
+    # https://github.com/timjb/aeson-schema/issues/9
+    - aeson-schema
+
 # Haddocks which are expected to fail. Same concept as expected test failures.
 expected-haddock-failures:
     # https://github.com/acw/bytestring-progress/issues/4

From fce37161f3978215492419b79c2479e6aeb2aaed Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 2 Apr 2015 14:14:18 +0300
Subject: [PATCH 47/77] Remove skipped test timjb/aeson-schema#9

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index b0320850..09fba0e1 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1181,9 +1181,6 @@ expected-test-failures:
     # Requires running server
     - consul-haskell
 
-    # https://github.com/timjb/aeson-schema/issues/9
-    - aeson-schema
-
 # Haddocks which are expected to fail. Same concept as expected test failures.
 expected-haddock-failures:
     # https://github.com/acw/bytestring-progress/issues/4

From 5ff22f4ffc5509a61d8178702af682e57ba41e31 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 2 Apr 2015 15:49:52 +0300
Subject: [PATCH 48/77] Properly reference #517

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 09fba0e1..268db100 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -298,8 +298,7 @@ packages:
         - gl
         - lens-aeson
         - zlib-lens
-        # Temporary upper bound for some of the above packages
-        - generic-deriving < 1.7
+        - generic-deriving
         # hyperloglog
 
     "Andrew Farmer <afarmer@ittc.ku.edu>":
@@ -884,6 +883,9 @@ packages:
         - exception-transformers < 0.4
         - exception-mtl < 0.4
 
+        # https://github.com/fpco/stackage/issues/517
+        - generic-deriving < 1.7
+
 # Package flags are applied to individual packages, and override the values of
 # global-flags
 package-flags:

From 48235773915793f4aad78e6f66de4a4fc0d6da6e Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 2 Apr 2015 16:07:38 +0300
Subject: [PATCH 49/77] Add back hyperloglog

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 268db100..5bd3f513 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -299,7 +299,7 @@ packages:
         - lens-aeson
         - zlib-lens
         - generic-deriving
-        # hyperloglog
+        - hyperloglog
 
     "Andrew Farmer <afarmer@ittc.ku.edu>":
         - scotty

From c56b1b56ad5c3e70fe8cdfe9c3776a097cc54f91 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 2 Apr 2015 19:05:42 +0300
Subject: [PATCH 50/77] Turn on old-locale for arbtt

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 5bd3f513..65c05960 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -947,6 +947,9 @@ package-flags:
     jose-jwt:
         doctest: false
 
+    arbtt:
+        old-locale: true
+
 # By skipping a test suite, we do not pull in the build dependencies
 skipped-tests:
     - ReadArgs # old version of hspec

From 7feb2c05651cf6dea2ed202c152ad28c80c368cb Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 2 Apr 2015 20:19:00 +0300
Subject: [PATCH 51/77] Docker: install sudo

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 095bdc4a..59d14682 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@ ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh
 RUN DEBIAN_FRONTEND=noninteractive bash /tmp/debian-bootstrap.sh
 RUN rm /tmp/debian-bootstrap.sh
 
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y cabal-install-1.20 ghc-7.8.4 alex-3.1.3 happy-1.19.4
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y cabal-install-1.20 ghc-7.8.4 alex-3.1.3 happy-1.19.4 sudo
 
 ENV PATH /home/stackage/.cabal/bin:/usr/local/sbin:/usr/local/bin:/opt/ghc/7.8.4/bin:/opt/cabal/1.20/bin:/opt/alex/3.1.3/bin:/opt/happy/1.19.4/bin:/usr/sbin:/usr/bin:/sbin:/bin
 

From 24079e50b58fb7cd7157317e14273807aede3c48 Mon Sep 17 00:00:00 2001
From: David Fox <dsf@seereason.com>
Date: Thu, 2 Apr 2015 11:19:51 -0700
Subject: [PATCH 52/77] Add debian and cabal-debian

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 65c05960..a80627f1 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -853,7 +853,11 @@ packages:
     
     "Tim Baumann <tim@timbaumann.info> @timjb":
         - aeson-schema
-        
+
+    "David Fox <dsf@seereason.com> @ddssff"
+        - debian
+        - cabal-debian
+
     "Stackage upper bounds":
         # GHC 7.8 uppdate bound
         - haddock-api < 2.16

From d938e5c9f6f0b4d1e5767097aa4cd55dd6799e82 Mon Sep 17 00:00:00 2001
From: David Fox <dsf@seereason.com>
Date: Thu, 2 Apr 2015 11:30:55 -0700
Subject: [PATCH 53/77] Fix syntax error in debian/cabal-debian entry

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index a80627f1..71622a3d 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -854,7 +854,7 @@ packages:
     "Tim Baumann <tim@timbaumann.info> @timjb":
         - aeson-schema
 
-    "David Fox <dsf@seereason.com> @ddssff"
+    "David Fox <dsf@seereason.com> @ddssff":
         - debian
         - cabal-debian
 

From 0b597df2b0963aeb311f8a26b857a00856211864 Mon Sep 17 00:00:00 2001
From: David Fox <dsf@seereason.com>
Date: Thu, 2 Apr 2015 14:23:11 -0700
Subject: [PATCH 54/77] Diagnosing why pretty>=1.1.2 dependency is being forced

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 71622a3d..926da243 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -954,6 +954,11 @@ package-flags:
     arbtt:
         old-locale: true
 
+    debian:
+        pretty-new: false
+    cabal-debian:
+        pretty-112: false
+
 # By skipping a test suite, we do not pull in the build dependencies
 skipped-tests:
     - ReadArgs # old version of hspec

From 8541f1c4f260af610231f8505a2aa345cf18b5c5 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 3 Apr 2015 05:28:12 +0300
Subject: [PATCH 55/77] Upper bound for #521

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 65c05960..4613281b 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -886,6 +886,9 @@ packages:
         # https://github.com/fpco/stackage/issues/517
         - generic-deriving < 1.7
 
+        # https://github.com/fpco/stackage/issues/521
+        - tagged < 0.8
+
 # Package flags are applied to individual packages, and override the values of
 # global-flags
 package-flags:

From b4ac928041745a39c28baf246923b7124bd6dec3 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 3 Apr 2015 09:20:38 +0300
Subject: [PATCH 56/77] Upper bounds for #524

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index ea96f239..94644dfb 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -893,6 +893,9 @@ packages:
         # https://github.com/fpco/stackage/issues/521
         - tagged < 0.8
 
+        # https://github.com/fpco/stackage/issues/524
+        - repa < 3.4
+
 # Package flags are applied to individual packages, and override the values of
 # global-flags
 package-flags:

From dab30803a01af196bad1a5f65b99d5834854365e Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 3 Apr 2015 13:14:42 +0300
Subject: [PATCH 57/77] Extra repa upper bounds

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 94644dfb..2de49e1b 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -895,6 +895,8 @@ packages:
 
         # https://github.com/fpco/stackage/issues/524
         - repa < 3.4
+        - repa-algorithms < 3.4
+        - repa-io < 3.4
 
 # Package flags are applied to individual packages, and override the values of
 # global-flags

From e1dffa2d88cf3309d5b870ae1fe98055e8c65165 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 3 Apr 2015 13:32:01 +0300
Subject: [PATCH 58/77] Remove upper bound and close #521

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 2de49e1b..a5bb0435 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -890,9 +890,6 @@ packages:
         # https://github.com/fpco/stackage/issues/517
         - generic-deriving < 1.7
 
-        # https://github.com/fpco/stackage/issues/521
-        - tagged < 0.8
-
         # https://github.com/fpco/stackage/issues/524
         - repa < 3.4
         - repa-algorithms < 3.4

From 80f2365c6a9222b0b4043dad8eb6d2005462934b Mon Sep 17 00:00:00 2001
From: Joachim Breitner <mail@joachim-breitner.de>
Date: Fri, 3 Apr 2015 21:36:00 +0200
Subject: [PATCH 59/77] Add list-fusion-probe

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index a5bb0435..5480ed0b 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -480,6 +480,7 @@ packages:
         - ghc-heap-view
         - tttool
         - gipeda
+        - list-fusion-probe
 
     "Aditya Bhargava <adit@adit.io":
         - HandsomeSoup

From 1aa24ea2054ca129e481b4c96d11cc774bc0835f Mon Sep 17 00:00:00 2001
From: Joachim Breitner <mail@joachim-breitner.de>
Date: Sat, 4 Apr 2015 23:37:51 +0200
Subject: [PATCH 60/77] Add haskell-spacegoo

(minor package, but having it in stackage avoids bitrot.)
---
 build-constraints.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 5480ed0b..fdebbe0f 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -481,6 +481,7 @@ packages:
         - tttool
         - gipeda
         - list-fusion-probe
+        - haskell-spacegoo
 
     "Aditya Bhargava <adit@adit.io":
         - HandsomeSoup

From 4e30926a8287a601cf38c80873c1c6692f60e83a Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 5 Apr 2015 10:58:48 +0300
Subject: [PATCH 61/77] Upper bound for Happstack/happstack-server#6

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index fdebbe0f..45ca8cb8 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -897,6 +897,9 @@ packages:
         - repa-algorithms < 3.4
         - repa-io < 3.4
 
+        # https://github.com/Happstack/happstack-server/issues/6
+        - happstack-server < 7.4.3
+
 # Package flags are applied to individual packages, and override the values of
 # global-flags
 package-flags:

From 9136b6ca4df898145a144a31c87128480b2497f3 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 5 Apr 2015 11:29:53 +0300
Subject: [PATCH 62/77] Upper bound for mgajda/json-autotype#5

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 45ca8cb8..70614e34 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -900,6 +900,9 @@ packages:
         # https://github.com/Happstack/happstack-server/issues/6
         - happstack-server < 7.4.3
 
+        # https://github.com/mgajda/json-autotype/issues/5
+        - json-autotype < 0.4
+
 # Package flags are applied to individual packages, and override the values of
 # global-flags
 package-flags:

From 0217ba42ab2aa247bbd63a1813c303f08b6b3c62 Mon Sep 17 00:00:00 2001
From: Stefan Saasen <stefan@saasen.me>
Date: Sun, 5 Apr 2015 21:21:42 +1000
Subject: [PATCH 63/77] Add 'jwt'

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 70614e34..c7961b0b 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -860,6 +860,9 @@ packages:
         - debian
         - cabal-debian
 
+    "Stefan Saasen <stefan@saasen.me>":
+        - jwt
+
     "Stackage upper bounds":
         # GHC 7.8 uppdate bound
         - haddock-api < 2.16

From 0e947550a722d3aef4fe2c020105fe4f158555e1 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 5 Apr 2015 16:03:17 +0300
Subject: [PATCH 64/77] Add monad-unlift

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index c7961b0b..5530a5b0 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -49,6 +49,7 @@ packages:
         - lzma-conduit
         - mutable-containers
         - hpc-coveralls
+        - monad-unlift
 
     "FP Complete michael@fpcomplete.com @snoyberg":
         - alex

From 578fcbdc31ddce5f664c50c68f67fbec76a60872 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 5 Apr 2015 21:57:30 +0300
Subject: [PATCH 65/77] Remove skipped benchmark and close #488

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 5530a5b0..8177b0b3 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1253,9 +1253,6 @@ skipped-benchmarks:
     # sometimes falls out-of-sync on hasql-postgres
     - hasql
 
-    # https://github.com/fpco/stackage/issues/488
-    - uuid-types
-
     # https://github.com/fpco/stackage/issues/494
     - case-insensitive
     - postgresql-binary

From b7f9effd7d2c4630a9a338a6d461739d52e65693 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 6 Apr 2015 16:52:59 +0300
Subject: [PATCH 66/77] Upgrade to Ubuntu 14.04

---
 Dockerfile          | 2 +-
 debian-bootstrap.sh | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 59d14682..ca916c3e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:12.04
+FROM ubuntu:14.04
 
 ENV HOME /home/stackage
 ENV LANG en_US.UTF-8
diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh
index 2f158306..15a1bec7 100755
--- a/debian-bootstrap.sh
+++ b/debian-bootstrap.sh
@@ -10,9 +10,6 @@
 # instructions, see:
 #    http://www.stackage.org/install
 
-add-apt-repository -y ppa:chris-lea/zeromq
-add-apt-repository -y ppa:floe/libtisch
-add-apt-repository -y ppa:zoogie/sdl2-snapshots
 apt-get update
 apt-get install -y \
     build-essential \
@@ -21,7 +18,6 @@ apt-get install -y \
     wget \
     m4 \
     texlive-full \
-    libgmp3c2 \
     libgmp3-dev \
     zlib1g-dev \
     libedit2 \

From e8a432d97d3361a577761fcc7ff1cdc122d01ff8 Mon Sep 17 00:00:00 2001
From: Kritzefitz <sven.bartscher@weltraumschlangen.de>
Date: Mon, 6 Apr 2015 21:28:07 +0200
Subject: [PATCH 67/77] Add setlocale

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 8177b0b3..033798ab 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -863,6 +863,9 @@ packages:
 
     "Stefan Saasen <stefan@saasen.me>":
         - jwt
+        
+    "Sven Bartscher sven.bartscher@weltraumschlangen.de @kritzefitz":
+        - setlocale
 
     "Stackage upper bounds":
         # GHC 7.8 uppdate bound

From 9be64048ebd060dd2bf79afdd40d2cd4a49a7fc1 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 6 Apr 2015 22:43:46 +0300
Subject: [PATCH 68/77] Upper bound for #529

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 033798ab..da51ffdf 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -910,6 +910,9 @@ packages:
         # https://github.com/mgajda/json-autotype/issues/5
         - json-autotype < 0.4
 
+        # https://github.com/fpco/stackage/issues/529
+        - fixed-vector < 0.8
+
 # Package flags are applied to individual packages, and override the values of
 # global-flags
 package-flags:

From 46c7bb0710beb142b54cfa921052c5b93704e3d6 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 7 Apr 2015 10:01:51 +0300
Subject: [PATCH 69/77] Remove json-autotype upper bound

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index da51ffdf..50198e2c 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -907,9 +907,6 @@ packages:
         # https://github.com/Happstack/happstack-server/issues/6
         - happstack-server < 7.4.3
 
-        # https://github.com/mgajda/json-autotype/issues/5
-        - json-autotype < 0.4
-
         # https://github.com/fpco/stackage/issues/529
         - fixed-vector < 0.8
 

From a078ebab2830297a10d717c6eed6e33e7eb0dd4f Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 7 Apr 2015 10:01:59 +0300
Subject: [PATCH 70/77] Add back sdl2 PPA

---
 debian-bootstrap.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh
index 15a1bec7..8064d9b3 100755
--- a/debian-bootstrap.sh
+++ b/debian-bootstrap.sh
@@ -10,6 +10,8 @@
 # instructions, see:
 #    http://www.stackage.org/install
 
+add-apt-repository -y ppa:zoogie/sdl2-snapshots
+
 apt-get update
 apt-get install -y \
     build-essential \

From c5f6a32f40ad3cdc99353f6cae6d518bed0f2f12 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 7 Apr 2015 11:25:23 +0300
Subject: [PATCH 71/77] Expected Haddock failure: Cabal-ide-backend

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 50198e2c..399ad4a1 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1230,6 +1230,9 @@ expected-haddock-failures:
     # builds. Could consider special-casing this requirement.
     - gtk
 
+    # Not sure why, but it's a temporary package anyway
+    - Cabal-ide-backend
+
 # Benchmarks which should not be built. Note that Stackage does *not* generally
 # build benchmarks. The difference here will be whether dependencies for these
 # benchmarks are included or not.

From 18500d3685e1a8e7e3d2731894c0de7ebea66173 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 8 Apr 2015 08:22:13 +0300
Subject: [PATCH 72/77] old-locale for hledger

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 399ad4a1..58652bfc 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -979,6 +979,13 @@ package-flags:
     cabal-debian:
         pretty-112: false
 
+    hledger:
+        old-locale: true
+    hledger-lib:
+        old-locale: true
+    hledger-web:
+        old-locale: true
+
 # By skipping a test suite, we do not pull in the build dependencies
 skipped-tests:
     - ReadArgs # old version of hspec

From 4daee956eeb1428a98957d5fcac55ef823a79af7 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 8 Apr 2015 09:36:28 +0300
Subject: [PATCH 73/77] Expected test failure jaspervdj/hakyll#345

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 58652bfc..40bd4411 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1222,6 +1222,9 @@ expected-test-failures:
     # Requires running server
     - consul-haskell
 
+    # https://github.com/jaspervdj/hakyll/issues/345
+    - hakyll
+
 # Haddocks which are expected to fail. Same concept as expected test failures.
 expected-haddock-failures:
     # https://github.com/acw/bytestring-progress/issues/4

From 2b715658ab6409300ad5573f4d90b1dfcc939bf1 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 8 Apr 2015 17:08:35 +0300
Subject: [PATCH 74/77] Don't expect test failure jaspervdj/hakyll#345

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 40bd4411..58652bfc 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1222,9 +1222,6 @@ expected-test-failures:
     # Requires running server
     - consul-haskell
 
-    # https://github.com/jaspervdj/hakyll/issues/345
-    - hakyll
-
 # Haddocks which are expected to fail. Same concept as expected test failures.
 expected-haddock-failures:
     # https://github.com/acw/bytestring-progress/issues/4

From ac7a7c7a842e1616d1cfd40a9554ca26dfc41b2b Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 8 Apr 2015 17:16:50 +0300
Subject: [PATCH 75/77] Docker: install newest cabal-install

Otherwise, old Cabal and Cabal-ide-backend (based on newer Cabal) seem
to get completely confused about custom package databases... yay broken
software!
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index ca916c3e..ca33effa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y cabal-install-1.20 ghc-7.8
 ENV PATH /home/stackage/.cabal/bin:/usr/local/sbin:/usr/local/bin:/opt/ghc/7.8.4/bin:/opt/cabal/1.20/bin:/opt/alex/3.1.3/bin:/opt/happy/1.19.4/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 RUN cabal update
-RUN cabal install hscolour cabal-install --constraint "Cabal < 1.22" && cp $HOME/.cabal/bin/* /usr/local/bin && rm -rf $HOME/.cabal $HOME/.ghc /tmp/stackage
+RUN cabal install hscolour cabal-install && cp $HOME/.cabal/bin/* /usr/local/bin && rm -rf $HOME/.cabal $HOME/.ghc /tmp/stackage
 RUN wget https://s3.amazonaws.com/stackage-travis/stackage-curator/stackage-curator.bz2 && bunzip2 stackage-curator.bz2 && chmod +x stackage-curator && mv stackage-curator /usr/local/bin
 
 RUN cd /home/stackage && cabal update && stackage-curator check

From a752fbe75b59b0d60cd9c1a7fa4483d2522ee129 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 12 Apr 2015 12:11:58 +0300
Subject: [PATCH 76/77] Remove upper bounds and close #529

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 58652bfc..3ea76982 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -907,9 +907,6 @@ packages:
         # https://github.com/Happstack/happstack-server/issues/6
         - happstack-server < 7.4.3
 
-        # https://github.com/fpco/stackage/issues/529
-        - fixed-vector < 0.8
-
 # Package flags are applied to individual packages, and override the values of
 # global-flags
 package-flags:

From 54eba2076ec76038619e90860858ea8c72aed42b Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 12 Apr 2015 12:12:54 +0300
Subject: [PATCH 77/77] Upper bound for #531

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 3ea76982..18077cf1 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -907,6 +907,9 @@ packages:
         # https://github.com/Happstack/happstack-server/issues/6
         - happstack-server < 7.4.3
 
+        # https://github.com/fpco/stackage/issues/531
+        - sbv < 4.3
+
 # Package flags are applied to individual packages, and override the values of
 # global-flags
 package-flags: