From 519ef830ca543d9aeac3674f4cedd80bf3b53087 Mon Sep 17 00:00:00 2001
From: Sven Heyll <sven.heyll@gmail.com>
Date: Mon, 13 Mar 2017 23:49:24 +0100
Subject: [PATCH 01/76] Add mediabus

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 011eaaea..b57fdacf 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1706,6 +1706,9 @@ packages:
         - b9
         - type-spec
         - pretty-types
+        - mediabus
+        - mediabus-fdk-aac
+        - mediabus-rtp
 
     # "Will Thompson <will@willthompson.co.uk> @wjt":
         # - bustle # build failure against haskell-src-exts https://github.com/vasylp/hgettext/issues/10
diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh
index c0925f57..b1828b89 100755
--- a/debian-bootstrap.sh
+++ b/debian-bootstrap.sh
@@ -51,6 +51,7 @@ apt-get install -y \
     libdevil-dev \
     libedit-dev \
     libedit2 \
+    libfdk-aac-dev \
     libfftw3-dev \
     libflac-dev \
     libfreenect-dev \

From 876ea253c90647d0725b0da2c00b1d15bd300834 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Thu, 30 Mar 2017 11:07:22 +0900
Subject: [PATCH 02/76] debian-bootstrap.sh: also remove libfdk-aac-dev on
 nightly

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

diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh
index 63c1a6a8..d9b8b8c5 100755
--- a/debian-bootstrap.sh
+++ b/debian-bootstrap.sh
@@ -53,7 +53,6 @@ apt-get install -y \
     libdevil-dev \
     libedit-dev \
     libedit2 \
-    libfdk-aac-dev \
     libfftw3-dev \
     libflac-dev \
     libfreenect-dev \

From 5bff7a47d63f1ed4a187807a15f99089ee6ce43f Mon Sep 17 00:00:00 2001
From: Alexey Kuleshevich <alexey@fpcomplete.com>
Date: Mon, 10 Apr 2017 20:27:29 +0300
Subject: [PATCH 03/76] Re-enable wai-middleware-auth, since
 fpco/wai-middleware-auth#3 was fixed

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index c904df4f..77dc9ddb 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2848,8 +2848,7 @@ packages:
         - printcess
 
     "Alexey Kuleshevich <lehins@yandex.ru> @lehins":
-        []
-        # - wai-middleware-auth # https://github.com/fpco/wai-middleware-auth/issues/3
+        - wai-middleware-auth
         # - hip # via repa: bounds: vector
 
     "Hans-Peter Deifel <hpd@hpdeifel.de> @hpdeifel":

From 14fcbe083d28e9be984fca79ccacbfaf208c1391 Mon Sep 17 00:00:00 2001
From: Pepe Iborra <pepeiborra@gmail.com>
Date: Wed, 26 Apr 2017 08:57:18 +0100
Subject: [PATCH 04/76] Add clr-inline stack

Note that I am in the maintainer group for clr-host and clr-marshal.
Note that clr-host requires mono-complete
---
 build-constraints.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index ac1f258a..7a4d02d9 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1,6 +1,11 @@
 ghc-major-version: "8.0"
 # Constraints for brand new builds
 packages:
+    "Jose Iborra <pepeiborra@gmail.com> @pepeiborra": 
+        - clr-marshal
+        - clr-host
+        - clr-inline
+        
     "Joshua Koike <jkoike2013@gmail.com> @jano017":
         - discord-hs
 

From 278d282517e7b6723e147ff4db807219ac3e58cf Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Wed, 26 Apr 2017 17:17:12 +0900
Subject: [PATCH 05/76] Revert "cryptonite < 0.23 (#2469)"

with fixed revision

This reverts commit a4f6c58abb81a52008fd9da128d4c1b5ba03b5c8.
---
 build-constraints.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index ac1f258a..438433da 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3110,9 +3110,6 @@ packages:
 
         # https://github.com/xtendo-org/rawfilepath/issues/3
         - rawfilepath < 0.2.1
-
-        # https://github.com/fpco/stackage/issues/2469
-        - cryptonite < 0.23
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of

From 1be82f516d5c3c4f276c8119bbae018034a42b25 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 26 Apr 2017 11:20:53 +0300
Subject: [PATCH 06/76] Add experimental no-revisions field

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 438433da..11a4fe0b 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3975,3 +3975,8 @@ hide:
 - cryptohash-md5
 - cryptohash-sha1
 - cryptohash-sha256
+
+# Experimental: packages where Hackage cabal file revisions should be ignored.
+# Always use the cabal file shipped with the sdist tarball instead.
+no-revisions:
+- tls

From 8ab2f4dcf864104c8c62486ac0641f5701d8b303 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Wed, 26 Apr 2017 17:32:32 +0900
Subject: [PATCH 07/76] re-instate cryptonite < 0.23 (#2469)

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 11a4fe0b..8fcf592a 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3110,6 +3110,9 @@ packages:
 
         # https://github.com/xtendo-org/rawfilepath/issues/3
         - rawfilepath < 0.2.1
+
+        # https://github.com/fpco/stackage/issues/2469
+        - cryptonite < 0.23
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of

From 3704487a6087d2cc2246d3cc43abac66955ce5a3 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Wed, 26 Apr 2017 17:37:33 +0900
Subject: [PATCH 08/76] rawfilepath < 0.2.0

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 8fcf592a..9eaace11 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3109,7 +3109,7 @@ packages:
         - traverse-with-class < 1.0.0.0
 
         # https://github.com/xtendo-org/rawfilepath/issues/3
-        - rawfilepath < 0.2.1
+        - rawfilepath < 0.2.0
 
         # https://github.com/fpco/stackage/issues/2469
         - cryptonite < 0.23

From 9b7b75416e6d65535aafa29fa208202584761c4f Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Wed, 26 Apr 2017 17:44:11 +0900
Subject: [PATCH 09/76] lens-4.15.2 breaks active and transitively diagrams
 (diagrams/active#20)

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 9eaace11..5bcca5c7 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3113,6 +3113,9 @@ packages:
 
         # https://github.com/fpco/stackage/issues/2469
         - cryptonite < 0.23
+
+        # https://github.com/diagrams/active/issues/20
+        - lens < 4.15.2
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of

From abf5972879d7f84e5a8484e883b3864b1517e5f4 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Wed, 26 Apr 2017 18:00:46 +0900
Subject: [PATCH 10/76] Revert "re-instate cryptonite < 0.23 (#2469)"

fixed with avers revision

This reverts commit 8ab2f4dcf864104c8c62486ac0641f5701d8b303.
---
 build-constraints.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 5bcca5c7..1be9eaf8 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3111,9 +3111,6 @@ packages:
         # https://github.com/xtendo-org/rawfilepath/issues/3
         - rawfilepath < 0.2.0
 
-        # https://github.com/fpco/stackage/issues/2469
-        - cryptonite < 0.23
-
         # https://github.com/diagrams/active/issues/20
         - lens < 4.15.2
 # end of packages

From 56c1fda8f2e67f7a0a8552940a232c709158b061 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Wed, 26 Apr 2017 11:09:09 +0100
Subject: [PATCH 11/76] Add reactive-banana

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 1be9eaf8..30b1bf1c 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1845,6 +1845,7 @@ packages:
         # - socket-io # bounds: aeson, via: engine-io
         - tasty-rerun
         - logging-effect
+        - reactive-banana
 
     "Antoni Silvestre <antoni.silvestre@gmail.com> @asilvestre":
         # Test suite needs a running neo4j server with auth disabled

From 7e95304823575c351873cd716ad08032b3d44eb1 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Thu, 27 Apr 2017 09:39:03 +0900
Subject: [PATCH 12/76] Revert "lens-4.15.2 breaks active and transitively
 diagrams (diagrams/active#20)"

active revised

This reverts commit 9b7b75416e6d65535aafa29fa208202584761c4f.
---
 build-constraints.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 1be9eaf8..cbb94ae6 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3110,9 +3110,6 @@ packages:
 
         # https://github.com/xtendo-org/rawfilepath/issues/3
         - rawfilepath < 0.2.0
-
-        # https://github.com/diagrams/active/issues/20
-        - lens < 4.15.2
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of

From 2cf2e14751758e00b8c044adc744778830699db3 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Thu, 27 Apr 2017 09:55:14 +0900
Subject: [PATCH 13/76] Revert "Revert "lens-4.15.2 breaks active and
 transitively diagrams (diagrams/active#20)""

revision was lens<4.15.2

This reverts commit 7e95304823575c351873cd716ad08032b3d44eb1.
---
 build-constraints.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index cbb94ae6..1be9eaf8 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3110,6 +3110,9 @@ packages:
 
         # https://github.com/xtendo-org/rawfilepath/issues/3
         - rawfilepath < 0.2.0
+
+        # https://github.com/diagrams/active/issues/20
+        - lens < 4.15.2
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of

From 5bcea53905f58a5a9c825f1b7f85bd41fc975344 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Thu, 27 Apr 2017 09:59:06 +0900
Subject: [PATCH 14/76] Revert "Disable nvim-hs per build failure #2457"

This reverts commit e97aa12928b33eff71b18f85e231dd4977b66a8b.
---
 build-constraints.yaml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 1be9eaf8..25a7c185 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3010,10 +3010,9 @@ packages:
         - uri-bytestring-aeson
 
     "Sebastian Witte <woozletoff@gmail.com> @saep":
-        []
-        # - nvim-hs # build failure https://github.com/fpco/stackage/pull/2457
-        # - nvim-hs-contrib # per nvim-hs
-        # - nvim-hs-ghcid # per nvim-hs
+        - nvim-hs
+        - nvim-hs-contrib
+        - nvim-hs-ghcid
 
     # If you stop maintaining a package you can move it here.
     # It will then be disabled if it starts causing problems.

From 75efb70e0507e772451a2ac1290d3971a4df56ae Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Thu, 27 Apr 2017 10:28:42 +0900
Subject: [PATCH 15/76] Revert "Revert "Disable nvim-hs per build failure
 #2457""

testsuite fails

This reverts commit 5bcea53905f58a5a9c825f1b7f85bd41fc975344.
---
 build-constraints.yaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 91a031a8..30b1bf1c 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3011,9 +3011,10 @@ packages:
         - uri-bytestring-aeson
 
     "Sebastian Witte <woozletoff@gmail.com> @saep":
-        - nvim-hs
-        - nvim-hs-contrib
-        - nvim-hs-ghcid
+        []
+        # - nvim-hs # build failure https://github.com/fpco/stackage/pull/2457
+        # - nvim-hs-contrib # per nvim-hs
+        # - nvim-hs-ghcid # per nvim-hs
 
     # If you stop maintaining a package you can move it here.
     # It will then be disabled if it starts causing problems.

From f20df8c57dc7fa7509ab8fbf8b54018023db4e4f Mon Sep 17 00:00:00 2001
From: Pavel Krajcevski <Krajcevski@gmail.com>
Date: Wed, 26 Apr 2017 22:32:19 -0700
Subject: [PATCH 16/76] Add freetype2

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index ade023f1..4dce8690 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -918,6 +918,7 @@ packages:
         - netwire-input
         - netwire-input-glfw
         - yoga
+        - freetype2
 
     "Emanuel Borsboom <manny@fpcomplete.com> @borsboom":
         - BoundedChan

From 12b578a2620143fd52fd4dc7ce741abeb7b27ffa Mon Sep 17 00:00:00 2001
From: Pepe Iborra <pepeiborra@gmail.com>
Date: Thu, 27 Apr 2017 10:01:14 +0100
Subject: [PATCH 17/76] Update debian-bootstrap.sh

Added mono-complete for clr-host
---
 debian-bootstrap.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh
index 4de888b5..4e7b9ea6 100755
--- a/debian-bootstrap.sh
+++ b/debian-bootstrap.sh
@@ -111,6 +111,7 @@ apt-get install -y \
     llvm-3.7 \
     locales \
     m4 \
+    mono-complete \
     nettle-dev \
     nodejs \
     npm \

From 1586e6f75b04de856d617a9e7c0986b50936dd28 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Fri, 28 Apr 2017 10:32:45 +0900
Subject: [PATCH 18/76] folds-0.7.3 should fix testsuite (ekmett/folds#12)

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index d1dd8453..9b27658c 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3486,7 +3486,6 @@ expected-test-failures:
     - ListLike # No issue tracker, e-mail sent to maintainer
     - commutative # https://github.com/athanclark/commutative/issues/4
     - dbus # 0.10.12 No issue tracker, e-mail sent to maintainer
-    - folds # https://github.com/ekmett/folds/issues/12
     - hspec-expectations-pretty-diff # GHC 8 issue not reported upstream since issue tracker disabled
     - language-lua2 # https://github.com/mitchellwrosen/language-lua2/issues/4
     - picosat # https://github.com/fpco/stackage/pull/2382

From 14aaee1e1b9aeca28e44cf6c71fad97bad5040a9 Mon Sep 17 00:00:00 2001
From: koepket <timo.koepke@lindenbaum.eu>
Date: Fri, 28 Apr 2017 16:13:51 +0200
Subject: [PATCH 19/76] add koepket's hinterface package

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 9b27658c..7b1ab7b2 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1,6 +1,9 @@
 ghc-major-version: "8.0"
 # Constraints for brand new builds
 packages:
+    "Timo Koepke <timo.koepke@gmail.com> @koepket":
+        - hinterface
+
     "Jose Iborra <pepeiborra@gmail.com> @pepeiborra": 
         - clr-marshal
         - clr-host

From 00ad6969516e0be6cce9a6134566217987df05c1 Mon Sep 17 00:00:00 2001
From: Daniel Mendler <mail@daniel-mendler.de>
Date: Fri, 28 Apr 2017 18:02:10 +0200
Subject: [PATCH 20/76] add ihs

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 9b27658c..ec9d4071 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2769,6 +2769,7 @@ packages:
         - tasty-auto
         - tasty-stats
         - colorful-monoids
+        - ihs
 
     "Taras Serduke <taras.serduke@gmail.com> @tserduke":
         - do-list

From 5a7912d90865670f0e18cd212889af2b59808917 Mon Sep 17 00:00:00 2001
From: tobbebex <tobias_bexelius@hotmail.com>
Date: Fri, 28 Apr 2017 21:54:35 +0200
Subject: [PATCH 21/76] Readding GPipe and GPipe-GLFW

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 9b27658c..25e443cb 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2045,12 +2045,10 @@ packages:
         - yi-snippet
 
     "Tobias Bexelius <tobias_bexelius@hotmail.com> @tobbebex":
-        []
-        # - GPipe # BLOCKED directory 1.3 via gl
+        - GPipe
 
     "Patrick Redmond <plredmond@gmail.com> @plredmond":
-        []
-        # - GPipe-GLFW # BLOCKED directory 1.3 via GPipe and gl
+        - GPipe-GLFW
 
     # "Csaba Hruska <csaba.hruska@gmail.com> @csabahruska":
         # - lambdacube-ir # bounds: aeson

From d20fe968ac170077e53050c1f8d177f1ab9b1ecf Mon Sep 17 00:00:00 2001
From: Neil Mitchell <ndmitchell@gmail.com>
Date: Fri, 28 Apr 2017 21:38:41 +0100
Subject: [PATCH 22/76] Add "weeder" package

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 9b27658c..b8f41f18 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -295,7 +295,7 @@ packages:
         - timelens
         - non-empty-sequence
 
-    "Neil Mitchell @ndmitchell":
+    "Neil Mitchell <ndmitchell@gmail.com> @ndmitchell":
         - hlint
         - hoogle
         - shake
@@ -310,6 +310,7 @@ packages:
         - bake
         - ghcid
         - hexml
+        - weeder
 
     "Alan Zimmerman @alanz":
         - hjsmin

From ef1bdd81e54f7b614204641c02c7e9217196bfa6 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Mon, 3 Apr 2017 17:39:07 +0900
Subject: [PATCH 23/76] set idris ffi flag

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 9b27658c..9e409d64 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3148,6 +3148,9 @@ package-flags:
     hpio:
         test-hlint: false
 
+    idris:
+        ffi: true
+
     minio-hs:
         live-test: false
 

From b2dd7651e4afd0341138fed1a00043b07e1a3b69 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Sat, 29 Apr 2017 20:46:59 +0900
Subject: [PATCH 24/76] intervals < 0.8 (#2477)

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 9e409d64..6ee86a4a 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3120,6 +3120,9 @@ packages:
 
         # https://github.com/diagrams/active/issues/20
         - lens < 4.15.2
+
+        # https://github.com/fpco/stackage/issues/2477
+        - intervals < 0.8
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of

From f674ff02e28d422e62fdd49309b636aa9b5ce3b6 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Sat, 29 Apr 2017 20:50:50 +0900
Subject: [PATCH 25/76] generics-sop < 0.3.0.0 (#2478)

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 6ee86a4a..5649bfaf 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3123,6 +3123,9 @@ packages:
 
         # https://github.com/fpco/stackage/issues/2477
         - intervals < 0.8
+
+        # https://github.com/fpco/stackage/issues/2478
+        - generics-sop < 0.3.0.0
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of

From 33ba706a09483812aaf318a358d49a260cc3043a Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Sat, 29 Apr 2017 21:04:38 +0900
Subject: [PATCH 26/76] transformers-lift < 0.2.0.0 (#2479)

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 5649bfaf..036c7125 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3126,6 +3126,10 @@ packages:
 
         # https://github.com/fpco/stackage/issues/2478
         - generics-sop < 0.3.0.0
+
+        # https://github.com/fpco/stackage/issues/2479
+        - ether < 0.5.0.0
+        - transformers-lift < 0.2.0.0
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of

From fef9826016df0032f2c071ba504b26f7840cb261 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Sat, 29 Apr 2017 22:00:41 +0900
Subject: [PATCH 27/76] hopefully mono-mcs is sufficient for clr-host (#2470)

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

diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh
index 4e7b9ea6..fee40da3 100755
--- a/debian-bootstrap.sh
+++ b/debian-bootstrap.sh
@@ -111,7 +111,7 @@ apt-get install -y \
     llvm-3.7 \
     locales \
     m4 \
-    mono-complete \
+    mono-mcs \
     nettle-dev \
     nodejs \
     npm \

From f3bc78f55260d0aee30273b9cd475fc3dafeda0c Mon Sep 17 00:00:00 2001
From: Sebastian Witte <woozletoff@gmail.com>
Date: Sat, 29 Apr 2017 16:33:49 +0200
Subject: [PATCH 28/76] Reenable nvim-hs nvim-hs-contrib nvim-hs-ghcid

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 652d5ee7..d400fa1b 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3017,10 +3017,9 @@ packages:
         - uri-bytestring-aeson
 
     "Sebastian Witte <woozletoff@gmail.com> @saep":
-        []
-        # - nvim-hs # build failure https://github.com/fpco/stackage/pull/2457
-        # - nvim-hs-contrib # per nvim-hs
-        # - nvim-hs-ghcid # per nvim-hs
+        - nvim-hs
+        - nvim-hs-contrib
+        - nvim-hs-ghcid
 
     # If you stop maintaining a package you can move it here.
     # It will then be disabled if it starts causing problems.

From a9dcaab868ff34c2086ed1aeb38cf979b2a669eb Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Sun, 30 Apr 2017 09:00:02 +0900
Subject: [PATCH 29/76] megaparsec < 5.3.0 (#2481)

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 652d5ee7..87b40c5c 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3130,6 +3130,9 @@ packages:
         # https://github.com/fpco/stackage/issues/2479
         - ether < 0.5.0.0
         - transformers-lift < 0.2.0.0
+
+        # https://github.com/fpco/stackage/issues/2481
+        - megaparsec < 5.3.0
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of

From 8c95b2ee4b39e29d7abfb54c6e677a2068bee337 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Mon, 1 May 2017 01:00:36 +0900
Subject: [PATCH 30/76] disable clr packages again since docker image failing
 to build (#2470)

docker build is failing on llvm-4.0 for some reason
(maybe the upstream repo changed)
---
 build-constraints.yaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 87b40c5c..362875f0 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2,9 +2,10 @@ ghc-major-version: "8.0"
 # Constraints for brand new builds
 packages:
     "Jose Iborra <pepeiborra@gmail.com> @pepeiborra": 
-        - clr-marshal
-        - clr-host
-        - clr-inline
+        []
+        #- clr-marshal
+        #- clr-host
+        #- clr-inline
         
     "Joshua Koike <jkoike2013@gmail.com> @jano017":
         - discord-hs

From 0dd592c3f46ea8a177f251c8b0350093cf0303bf Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Mon, 1 May 2017 01:09:56 +0900
Subject: [PATCH 31/76] disable clr packages again since docker image failing
 to build (#2470)

docker image failing due to llvm-4.0 repo
---
 build-constraints.yaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 87b40c5c..bd425e81 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2,9 +2,10 @@ ghc-major-version: "8.0"
 # Constraints for brand new builds
 packages:
     "Jose Iborra <pepeiborra@gmail.com> @pepeiborra": 
-        - clr-marshal
-        - clr-host
-        - clr-inline
+        []
+        # - clr-marshal
+        # - clr-host
+        # - clr-inline
         
     "Joshua Koike <jkoike2013@gmail.com> @jano017":
         - discord-hs

From b790977c57d59e22174552fee10fd96f73887ad5 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 30 Apr 2017 21:07:40 +0300
Subject: [PATCH 32/76] Add mime-mail to no-revisions

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index bd425e81..aded329e 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -4006,3 +4006,4 @@ hide:
 # Always use the cabal file shipped with the sdist tarball instead.
 no-revisions:
 - tls
+- mime-mail

From b7d45e8cbefb8aa4feffece051b858861a3916b6 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Mon, 1 May 2017 12:12:04 +0900
Subject: [PATCH 33/76] debian-bootstrap.sh: disable broken llvm-4.0 repo

The following packages have unmet dependencies:

 llvm-4.0 : Depends: llvm-4.0-runtime (= 1:4.0~svn301550-1~exp1) but it is not going to be installed
            Depends: libllvm4.0 (>= 1:4.0-3~) but it is not going to be installed
            Recommends: llvm-4.0-dev but it is not going to be installed
---
 debian-bootstrap.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh
index fee40da3..f3669aa5 100755
--- a/debian-bootstrap.sh
+++ b/debian-bootstrap.sh
@@ -178,11 +178,12 @@ cd /tmp \
 echo "/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/" > /etc/ld.so.conf.d/openjdk.conf \
     && ldconfig
 
-# llvm-4.0 for llvm-hs (separate since it needs wget)
-wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
-    && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" \
-    && apt-get update \
-    && apt-get install -y llvm-4.0
+# currently the repo seems broken
+# # llvm-4.0 for llvm-hs (separate since it needs wget)
+# wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
+#     && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" \
+#     && apt-get update \
+#     && apt-get install -y llvm-4.0
 
 ## non-free repo for mediabus-fdk-aac
 #apt-add-repository multiverse \

From 344398255753587740410e39434bfc249413c21e Mon Sep 17 00:00:00 2001
From: Sam Protas <smprts@gmail.com>
Date: Sun, 30 Apr 2017 23:42:46 -0400
Subject: [PATCH 34/76] add triplesec

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 06ae820a..31f1e534 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3022,6 +3022,9 @@ packages:
         - nvim-hs-contrib
         - nvim-hs-ghcid
 
+    "Sam Protas <sam.protas@gmail.com> @SamProtas":
+        - triplesec
+
     # If you stop maintaining a package you can move it here.
     # It will then be disabled if it starts causing problems.
     # See https://github.com/fpco/stackage/issues/1056

From cd4b7fc4f5ad7816659496dca578004468eb0bc0 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Mon, 1 May 2017 12:12:04 +0900
Subject: [PATCH 35/76] debian-bootstrap.sh: disable broken llvm-4.0 repo

The following packages have unmet dependencies:

 llvm-4.0 : Depends: llvm-4.0-runtime (= 1:4.0~svn301550-1~exp1) but it is not going to be installed
            Depends: libllvm4.0 (>= 1:4.0-3~) but it is not going to be installed
            Recommends: llvm-4.0-dev but it is not going to be installed
---
 debian-bootstrap.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh
index fee40da3..f3669aa5 100755
--- a/debian-bootstrap.sh
+++ b/debian-bootstrap.sh
@@ -178,11 +178,12 @@ cd /tmp \
 echo "/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/" > /etc/ld.so.conf.d/openjdk.conf \
     && ldconfig
 
-# llvm-4.0 for llvm-hs (separate since it needs wget)
-wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
-    && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" \
-    && apt-get update \
-    && apt-get install -y llvm-4.0
+# currently the repo seems broken
+# # llvm-4.0 for llvm-hs (separate since it needs wget)
+# wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
+#     && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" \
+#     && apt-get update \
+#     && apt-get install -y llvm-4.0
 
 ## non-free repo for mediabus-fdk-aac
 #apt-add-repository multiverse \

From d13e89a56331939acf74e2a16cbadd39a18725b3 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Mon, 1 May 2017 12:14:51 +0900
Subject: [PATCH 36/76] Revert "disable clr packages again since docker image
 failing to build (#2470)"

This reverts commit 0dd592c3f46ea8a177f251c8b0350093cf0303bf.
---
 build-constraints.yaml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 289ed29f..dcba1a5c 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -5,10 +5,9 @@ packages:
         - hinterface
 
     "Jose Iborra <pepeiborra@gmail.com> @pepeiborra": 
-        []
-        # - clr-marshal
-        # - clr-host
-        # - clr-inline
+        - clr-marshal
+        - clr-host
+        - clr-inline
         
     "Joshua Koike <jkoike2013@gmail.com> @jano017":
         - discord-hs

From de6f8ba7e8ddb54edce3e3e20f0dc07e29c4d764 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Mon, 1 May 2017 12:28:32 +0900
Subject: [PATCH 37/76] add juhp/stackage-query

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index dcba1a5c..dd57c0c6 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1087,6 +1087,7 @@ packages:
 
     "Jens Petersen <juhpetersen@gmail.com> @juhp":
         - cabal-rpm
+        - stackage-query
         # - cabal-sort # BLOCKED directory 1.3
         - idris # bounds: safe
         - libffi

From a75a7c029502792b88ca1e1379b9bfe24551f5b8 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Mon, 1 May 2017 17:19:16 +0900
Subject: [PATCH 38/76] debian-bootstrap.sh: clr-host needs libmono-2.0-dev
 (#2470)

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

diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh
index f3669aa5..db413754 100755
--- a/debian-bootstrap.sh
+++ b/debian-bootstrap.sh
@@ -75,6 +75,7 @@ apt-get install -y \
     libmagickcore-dev \
     libmagickwand-dev \
     libmarkdown2-dev \
+    libmono-2.0-dev \
     libmp3lame-dev \
     libmpfr-dev \
     libmysqlclient-dev \

From 551980c23fe041bf401156449d269ab00c27808d Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Mon, 1 May 2017 18:04:49 +0900
Subject: [PATCH 39/76] debian-bootstrap.sh: clr-inline testsuite needs fsharp

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

diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh
index db413754..116cb76b 100755
--- a/debian-bootstrap.sh
+++ b/debian-bootstrap.sh
@@ -34,6 +34,7 @@ apt-get install -y \
     sudo \
     curl \
     freeglut3-dev \
+    fsharp \
     git \
     gradle \
     libadns1-dev \

From 82f051cbac356f27095ece4134876d282c004fe3 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Mon, 1 May 2017 19:41:52 +0900
Subject: [PATCH 40/76] disable clr-inline due to testsuite failure (#2470)

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index dd57c0c6..a3f8f534 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -7,7 +7,7 @@ packages:
     "Jose Iborra <pepeiborra@gmail.com> @pepeiborra": 
         - clr-marshal
         - clr-host
-        - clr-inline
+        # - clr-inline # https://github.com/fpco/stackage/pull/2470
         
     "Joshua Koike <jkoike2013@gmail.com> @jano017":
         - discord-hs

From 512b23cf5110999c3b900698f89a063bb8e7ec87 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Tue, 2 May 2017 16:50:48 +0900
Subject: [PATCH 41/76] remove idris comment

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index a3f8f534..136a8fcd 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1089,7 +1089,7 @@ packages:
         - cabal-rpm
         - stackage-query
         # - cabal-sort # BLOCKED directory 1.3
-        - idris # bounds: safe
+        - idris
         - libffi
         - xmonad-contrib
         - shelly

From 9a76396dcc875c85a45becd9cfbb9494c4349f70 Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Thu, 4 May 2017 23:04:28 +0100
Subject: [PATCH 42/76] Add upper bounds for #2487 (graphviz).

Also remove some rogue white space.
---
 build-constraints.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 136a8fcd..eda22869 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -4,11 +4,11 @@ packages:
     "Timo Koepke <timo.koepke@gmail.com> @koepket":
         - hinterface
 
-    "Jose Iborra <pepeiborra@gmail.com> @pepeiborra": 
+    "Jose Iborra <pepeiborra@gmail.com> @pepeiborra":
         - clr-marshal
         - clr-host
         # - clr-inline # https://github.com/fpco/stackage/pull/2470
-        
+
     "Joshua Koike <jkoike2013@gmail.com> @jano017":
         - discord-hs
 
@@ -3138,6 +3138,10 @@ packages:
 
         # https://github.com/fpco/stackage/issues/2481
         - megaparsec < 5.3.0
+
+        # https://github.com/fpco/stackage/issues/2487
+        - graphviz < 2999.19
+
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of

From 53c5fcb9e0451a932908a6cc9a8e8c4ce55a3084 Mon Sep 17 00:00:00 2001
From: Sibi Prabakaran <sibi@psibi.in>
Date: Wed, 3 May 2017 15:20:35 +0530
Subject: [PATCH 43/76] Add package: sysinfo

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index eda22869..27ce84de 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -349,6 +349,7 @@ packages:
         - yesod-auth-fb
         - hourglass-orphans
         - wai-slack-middleware
+        - sysinfo
 
     "haskell-openal":
         - OpenAL

From 3cda9cbcbfd55d3329ea6c67f25cb59f2b5135a8 Mon Sep 17 00:00:00 2001
From: Anton Ekblad <anton@ekblad.cc>
Date: Thu, 4 May 2017 01:19:34 +0200
Subject: [PATCH 44/76] Add selda, selda-sqlite, selda-postgresql

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 27ce84de..41793a6b 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3028,6 +3028,11 @@ packages:
     "Sam Protas <sam.protas@gmail.com> @SamProtas":
         - triplesec
 
+    "Anton Ekblad <anton@ekblad.cc> @valderman":
+        - selda
+        - selda-sqlite
+        - selda-postgresql
+
     # If you stop maintaining a package you can move it here.
     # It will then be disabled if it starts causing problems.
     # See https://github.com/fpco/stackage/issues/1056

From d0b495b0fe3840ed406dcd30b38ed8209a3b0cae Mon Sep 17 00:00:00 2001
From: Thilo Uttendorfer <tlo@sengaya.de>
Date: Thu, 4 May 2017 22:24:42 +0200
Subject: [PATCH 45/76] Enable twitter-conduit again

Version 0.2.2 of twitter-conduit has now working dependencies to http-conduit and http-client
---
 build-constraints.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 41793a6b..8d9cd051 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2218,7 +2218,7 @@ packages:
 
     "Takahiro Himura <himuratk421@gmail.com> @thimura":
         - lens-regex
-        # - twitter-conduit # bounds: http-conduit 2.2 # via: twitter-types, twitter-types-lens
+        - twitter-conduit
         - twitter-types
         - twitter-types-lens
 

From 138154f379ad90b4446e188b31c09273b6faf49a Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Fri, 5 May 2017 16:34:51 +0100
Subject: [PATCH 46/76] Add upper bounds for #2489.

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 8d9cd051..e9b1f407 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3148,6 +3148,9 @@ packages:
         # https://github.com/fpco/stackage/issues/2487
         - graphviz < 2999.19
 
+        # https://github.com/fpco/stackage/issues/2489
+        - haskell-src-meta < 0.8
+
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of

From fbd84b3c461b0f59a29943d8a82fe6d4f9c8557e Mon Sep 17 00:00:00 2001
From: Dennis Gosnell <cdep.illabout@gmail.com>
Date: Fri, 5 May 2017 21:05:11 +0900
Subject: [PATCH 47/76] Add servant-checked-exceptions package

This adds the servant-checked-exceptions package:

https://hackage.haskell.org/package/servant-checked-exceptions
---
 build-constraints.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index e9b1f407..381eecb7 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2014,6 +2014,7 @@ packages:
         - opaleye-trans
         - pretty-simple
         - read-env-var
+        - servant-checked-exceptions
         - servant-static-th
         - xml-html-qq
         - xml-indexed-cursor

From 952dd3d87da9ac00abca7677300ec4e6e5863223 Mon Sep 17 00:00:00 2001
From: Daishi Nakajima <nakaji.dayo@gmail.com>
Date: Wed, 3 May 2017 19:13:21 +0900
Subject: [PATCH 48/76] Add yesod-job-queue and api-field-json-th packages

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 381eecb7..ce3eb0f2 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2582,8 +2582,9 @@ packages:
         - repline
         - picosat
 
-    # "Daishi Nakajima <nakaji.dayo@gmail.com> @nakaji_dayo":
-        # - yesod-job-queue # build failure https://github.com/nakaji-dayo/yesod-job-queue/issues/10
+    "Daishi Nakajima <nakaji.dayo@gmail.com> @nakaji_dayo":
+        - api-field-json-th
+        - yesod-job-queue
 
     # "Braden Walters <vc@braden-walters.info> @meoblast001":
         # - hakyll-sass # compilation failure

From c3f965176c60c9c03059c1f5aa431bca81202dc2 Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Sat, 6 May 2017 08:51:17 +0100
Subject: [PATCH 49/76] Add packunused.

Following the new release https://github.com/hvr/packunused/issues/24#issuecomment-299516472.
---
 build-constraints.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index ce3eb0f2..8fc70ca4 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -123,6 +123,7 @@ packages:
     "Luke Murphy <lukewm@riseup.net> @lwm":
         - tasty-discover
         - lentil
+        - packunused
 
     "Marco Zocca @ocramz":
         - sparse-linear-algebra

From f667eb1417e4b9c391a4a31ec762ce59bfd91e24 Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Sun, 7 May 2017 22:18:53 +0100
Subject: [PATCH 50/76] Add upper bounds for dictionaries 0.2.

Please see https://github.com/zohl/dictionaries/issues/3.
---
 build-constraints.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 8fc70ca4..a7b95d4d 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3154,6 +3154,9 @@ packages:
         # https://github.com/fpco/stackage/issues/2489
         - haskell-src-meta < 0.8
 
+        # https://github.com/zohl/dictionaries/issues/3
+        - dictionaries < 0.2
+
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of

From 74ef289b09b64fa280d9b5692b3edf59677ef971 Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Sun, 7 May 2017 22:22:25 +0100
Subject: [PATCH 51/76] Block newly re-enabled package for build failure.

Please see https://github.com/nakaji-dayo/yesod-job-queue/issues/12.
---
 build-constraints.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index a7b95d4d..a63dd92d 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2585,7 +2585,7 @@ packages:
 
     "Daishi Nakajima <nakaji.dayo@gmail.com> @nakaji_dayo":
         - api-field-json-th
-        - yesod-job-queue
+        # - yesod-job-queue # compilation failure: nakaji-dayo/yesod-job-queue/issues/12
 
     # "Braden Walters <vc@braden-walters.info> @meoblast001":
         # - hakyll-sass # compilation failure

From 5c0d9493f1bf00b19692c74a3c4a744865809323 Mon Sep 17 00:00:00 2001
From: Piyush P Kurur <ppk@cse.iitk.ac.in>
Date: Mon, 8 May 2017 14:40:01 +0530
Subject: [PATCH 52/76] added the naqsha package

Git: https://github.com/naqsha/naqsha
---
 build-constraints.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index a63dd92d..5975d8e7 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -778,6 +778,8 @@ packages:
 
     "Piyush P Kurur <ppk@cse.iitk.ac.in> @piyush-kurur":
         - raaz
+	- naqsha
+
     "Joey Hess <id@joeyh.name> @joeyh":
         # - git-annex # bounds: bloomfilter, [...] # via: aws, esqueleto, [...] #
         # - github-backup # bounds: github

From c8ca5a0dfd377623ee4f17ef1b033b63478d6ecb Mon Sep 17 00:00:00 2001
From: Piyush P Kurur <ppk@cse.iitk.ac.in>
Date: Mon, 8 May 2017 16:41:51 +0530
Subject: [PATCH 53/76] untabify.

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 5975d8e7..88359684 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -778,7 +778,7 @@ packages:
 
     "Piyush P Kurur <ppk@cse.iitk.ac.in> @piyush-kurur":
         - raaz
-	- naqsha
+        - naqsha
 
     "Joey Hess <id@joeyh.name> @joeyh":
         # - git-annex # bounds: bloomfilter, [...] # via: aws, esqueleto, [...] #

From 9e78aba2779d2a5dfe0f1ff52e7abc6958f32bbe Mon Sep 17 00:00:00 2001
From: mrkkrp <markkarpov@opmbx.org>
Date: Mon, 8 May 2017 22:54:13 +0300
Subject: [PATCH 54/76] =?UTF-8?q?Exclude=20Mark=20Karpov=20from=20?=
 =?UTF-8?q?=E2=80=98stackbuilders=E2=80=99=20group?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Soon I'll stop working for Stack Builders thus I remove myself from the ‘stackbuilders’ group. I still would like to be notified about ‘stache’-related issues, so I add that under my own name.
---
 build-constraints.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index a63dd92d..6f33b7f8 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2169,6 +2169,7 @@ packages:
         - lame
         - path
         - forma
+        - stache
 
     # "Thomas Bereknyei <tomberek@gmail.com>":
         # - multiplate # bounds: transformers
@@ -3902,7 +3903,6 @@ github-users:
         - sestrella
         - jsl
         - jsantos17
-        - mrkkrp
     scotty-web:
         - RyanGlScott
         - xich

From a9aa80bc70120af383d6fe5622fc3102e825caac Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Mon, 8 May 2017 23:15:24 +0100
Subject: [PATCH 55/76] Remove upper bound for zohl/dictionaries/issues/3.

Please see
https://github.com/zohl/dictionaries/issues/3#issuecomment-299838947.
---
 build-constraints.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index a63dd92d..769c43fb 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3154,9 +3154,6 @@ packages:
         # https://github.com/fpco/stackage/issues/2489
         - haskell-src-meta < 0.8
 
-        # https://github.com/zohl/dictionaries/issues/3
-        - dictionaries < 0.2
-
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of

From 9f0f02efe0db6a88bf269ecb66c06f39efd7cbd1 Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Mon, 8 May 2017 23:40:14 +0100
Subject: [PATCH 56/76] Add upper bounds for #2494.

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 769c43fb..0fd374d0 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3154,6 +3154,9 @@ packages:
         # https://github.com/fpco/stackage/issues/2489
         - haskell-src-meta < 0.8
 
+        # https://github.com/fpco/stackage/issues/2494
+        - websockets-simple < 0.0.2.1
+
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of

From 6bbe6b3a1e86c1b1958ef564de090dc3616595df Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Tue, 9 May 2017 00:51:50 +0100
Subject: [PATCH 57/76] Add upper bounds for websockets-rpc for #2494 too.

websockets-simple/rpc latest versions both mandate
websockets >= 0.11 but we've placed an upper bound to
stop 0.11 being available (#245).
---
 build-constraints.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 0fd374d0..6408927b 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3155,7 +3155,9 @@ packages:
         - haskell-src-meta < 0.8
 
         # https://github.com/fpco/stackage/issues/2494
+        # Indirectly blocked on fpco/stackage/issues/245
         - websockets-simple < 0.0.2.1
+        - websockets-rpc < 0.4.1
 
 # end of packages
 

From 8d0db6da77335fa78945e949f002d1dca415b65f Mon Sep 17 00:00:00 2001
From: Pepe Iborra <pepeiborra@gmail.com>
Date: Tue, 9 May 2017 10:35:27 +0100
Subject: [PATCH 58/76] Add threepenny-editors

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 6408927b..7d24517f 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -7,6 +7,7 @@ packages:
     "Jose Iborra <pepeiborra@gmail.com> @pepeiborra":
         - clr-marshal
         - clr-host
+        - threepenny-editors
         # - clr-inline # https://github.com/fpco/stackage/pull/2470
 
     "Joshua Koike <jkoike2013@gmail.com> @jano017":

From a70985174a0fb27d7972a55e0947bdc613e5a193 Mon Sep 17 00:00:00 2001
From: Adam Bergmark <adam@bergmark.nl>
Date: Tue, 9 May 2017 19:02:05 +0200
Subject: [PATCH 59/76] Note that we no longer accept curator applications

---
 become-a-curator.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/become-a-curator.md b/become-a-curator.md
index 77bd9310..80559efc 100644
--- a/become-a-curator.md
+++ b/become-a-curator.md
@@ -1,3 +1,5 @@
+## We are no longer accepting applications, please wait until next time
+
 We are looking to expand the stackage curator team!
 
 As a stackage curator you will help the community by curating and
@@ -37,6 +39,6 @@ helped us iron out and document the process further.
 
 You can read the curator documentation here: https://github.com/fpco/stackage/blob/master/CURATORS.md
 
-To apply, please fill in this form: https://goo.gl/forms/eD6lTLtuyyHAIcfC2
+To apply, please fill in this form: [REDACTED]
 
 If you applied last time, we encourage you to do so again!

From b7dd28857f5043685fb230cf5d6dd4077406db97 Mon Sep 17 00:00:00 2001
From: Mihai Maruseac <mihai.maruseac@gmail.com>
Date: Tue, 9 May 2017 19:00:39 -0700
Subject: [PATCH 60/76] Attempt a fix of lens

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index dd57c0c6..c258804b 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3521,6 +3521,7 @@ expected-test-failures:
     - yesod-auth-basic # https://github.com/creichert/yesod-auth-basic/issues/1
 
     # Stackage upper bounds, re-enable these when their upper bound is removed
+    - lens # doctest failure in 4.15.1, fixed in 4.15.2 but lens has an upper bound
 
 
     # Recursive deps https://github.com/fpco/stackage/issues/1818
@@ -3584,7 +3585,7 @@ expected-haddock-failures:
     - gtk
     - gtk3
 
-    # Intermittent failures or unreliable. These tay pass when
+    # Intermittent failures or unreliable. These may pass when
     # re-enabled, but will eventually fail again. Only remove these
     # from expected-haddock-failures if we know a fix has been released.
     - gi-gtk # Uses all memory
@@ -3948,6 +3949,8 @@ tell-me-when-its-released:
 - terminal-progress-bar-0.1.1 # Unskip test suite
 - req-0.2.0 # Remove from expected-test-failures https://github.com/mrkkrp/req/issues/14#issuecomment-287562784
 - vivid-0.2.0.5 # Re-enable package (disabed per MonadRandom < 0.5) https://github.com/fpco/stackage/issues/2180
+- lens-4.15.2 # Test failures in lens-4.15.1 https://github.com/fpco/stackage/issues/2496
+- active-0.2.0.12 # Will likely contain fix for the lens-4.15.2 https://github.com/fpco/stackage/issues/2496
 
 # Packages which should be hidden after registering, to avoid module name
 # conflicts. This is intended for at least two use cases:

From e91bfb19346a785c740f2cc2325e59e3b7957c31 Mon Sep 17 00:00:00 2001
From: Mihai Maruseac <mihai.maruseac@gmail.com>
Date: Tue, 9 May 2017 19:00:39 -0700
Subject: [PATCH 61/76] Attempt a fix of lens

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 6408927b..76051122 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3542,6 +3542,7 @@ expected-test-failures:
     - yesod-auth-basic # https://github.com/creichert/yesod-auth-basic/issues/1
 
     # Stackage upper bounds, re-enable these when their upper bound is removed
+    - lens # doctest failure in 4.15.1, fixed in 4.15.2 but lens has an upper bound
 
 
     # Recursive deps https://github.com/fpco/stackage/issues/1818
@@ -3605,7 +3606,7 @@ expected-haddock-failures:
     - gtk
     - gtk3
 
-    # Intermittent failures or unreliable. These tay pass when
+    # Intermittent failures or unreliable. These may pass when
     # re-enabled, but will eventually fail again. Only remove these
     # from expected-haddock-failures if we know a fix has been released.
     - gi-gtk # Uses all memory
@@ -3969,6 +3970,8 @@ tell-me-when-its-released:
 - terminal-progress-bar-0.1.1 # Unskip test suite
 - req-0.2.0 # Remove from expected-test-failures https://github.com/mrkkrp/req/issues/14#issuecomment-287562784
 - vivid-0.2.0.5 # Re-enable package (disabed per MonadRandom < 0.5) https://github.com/fpco/stackage/issues/2180
+- lens-4.15.2 # Test failures in lens-4.15.1 https://github.com/fpco/stackage/issues/2496
+- active-0.2.0.12 # Will likely contain fix for the lens-4.15.2 https://github.com/fpco/stackage/issues/2496
 
 # Packages which should be hidden after registering, to avoid module name
 # conflicts. This is intended for at least two use cases:

From 6daac8d8059dc7d5d6c470fab8a2d2c5a42827af Mon Sep 17 00:00:00 2001
From: Mihai Maruseac <mihai.maruseac@gmail.com>
Date: Tue, 9 May 2017 21:27:32 -0700
Subject: [PATCH 62/76] Bounds for #2498

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index c258804b..ac4f1f09 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3138,6 +3138,14 @@ packages:
 
         # https://github.com/fpco/stackage/issues/2481
         - megaparsec < 5.3.0
+
+        # https://github.com/fpco/stackage/issues/2498
+        - graphviz < 2999.19.0.0
+        - haskell-src-meta < 0.8
+        - io-streams < 1.4.0.0
+        - websockets < 0.11.0.0
+        - websockets-rpc < 0.4.1
+        - websockets-simple < 0.0.2.1
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of

From ebf52265cb4afa716c86eff38c3af77ceee01bc9 Mon Sep 17 00:00:00 2001
From: Mihai Maruseac <mihai.maruseac@gmail.com>
Date: Tue, 9 May 2017 21:39:26 -0700
Subject: [PATCH 63/76] Bounds for #2499

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 76051122..71c3a6c0 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3159,6 +3159,9 @@ packages:
         - websockets-simple < 0.0.2.1
         - websockets-rpc < 0.4.1
 
+        # https://github.com/fpco/stackage/issues/2499
+        - io-streams < 1.4.0.0
+
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of

From 857f0791b18658e349dc7f5337326923b5761007 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 10 May 2017 16:39:16 +0300
Subject: [PATCH 64/76] Revert "debian-bootstrap.sh: disable broken llvm-4.0
 repo"

This reverts commit cd4b7fc4f5ad7816659496dca578004468eb0bc0.
---
 debian-bootstrap.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh
index 116cb76b..747e1c5d 100755
--- a/debian-bootstrap.sh
+++ b/debian-bootstrap.sh
@@ -180,12 +180,11 @@ cd /tmp \
 echo "/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/" > /etc/ld.so.conf.d/openjdk.conf \
     && ldconfig
 
-# currently the repo seems broken
-# # llvm-4.0 for llvm-hs (separate since it needs wget)
-# wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
-#     && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" \
-#     && apt-get update \
-#     && apt-get install -y llvm-4.0
+# llvm-4.0 for llvm-hs (separate since it needs wget)
+wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
+    && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" \
+    && apt-get update \
+    && apt-get install -y llvm-4.0
 
 ## non-free repo for mediabus-fdk-aac
 #apt-add-repository multiverse \

From 94d7dd5becf8535e5a494a83154a79d6c72a6d29 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 10 May 2017 16:47:04 +0300
Subject: [PATCH 65/76] Describe local Docker image build

---
 CURATORS.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/CURATORS.md b/CURATORS.md
index 874fcc76..909e2ed1 100644
--- a/CURATORS.md
+++ b/CURATORS.md
@@ -223,6 +223,26 @@ rm -r nightly/work/builds/nightly/
 ```
 This should also be done when moving the Nightly docker image to a new version of Ubuntu.
 
+If you're impatient and would like to build the Docker image on the
+build server instead of waiting for Docker Hub, you can run the
+following command:
+
+```
+DIR=$(mktemp -d)
+(cd $DIR \
+  && git clone https://github.com/fpco/stackage \
+  && cd stackage \
+  && docker build --tag snoyberg/stackage:nightly .)
+rm -rf $DIR
+```
+
+Note that we do a clean clone of the `stackage` repo instead of using
+the existing checkout because of how `docker build` works: it will
+send the entire local directory contents as context to the Docker
+daemon, which in the case of the build tree is a _lot_ of content. (We
+can discuss the wisdom&mdash;or lack thereof&mdash;of Docker's
+approach separately.)
+
 ## stackage-build server
 
 You'll need to get your SSH public key added to the machine. ~/.ssh/config info:

From 94be100beb0fb4403d8039412b5ad2b830a171cc Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 10 May 2017 16:55:29 +0300
Subject: [PATCH 66/76] Upper bound for #2501

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 71c3a6c0..d3adb328 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3162,6 +3162,9 @@ packages:
         # https://github.com/fpco/stackage/issues/2499
         - io-streams < 1.4.0.0
 
+        # https://github.com/fpco/stackage/issues/2501
+        - hsemail < 2
+
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of

From e08087e687dc9a3b2df66ea239c5fcb09d1251b6 Mon Sep 17 00:00:00 2001
From: Mihai Maruseac <mihai@leapyear.io>
Date: Wed, 10 May 2017 09:16:59 -0700
Subject: [PATCH 67/76] Disable tests which failed in the previous nightly

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index d3adb328..8d838cea 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3417,6 +3417,7 @@ expected-test-failures:
     - pandoc-citeproc # https://github.com/jgm/pandoc-citeproc/issues/172
     - spdx # https://github.com/phadej/spdx/issues/8
     - statistics # https://github.com/bos/statistics/issues/42
+    - courier # https://github.com/hargettp/courier/issues/18
 
     # Timeouts
     # These tests sometimes take too long and hit the stackage build
@@ -3550,7 +3551,6 @@ expected-test-failures:
     # Stackage upper bounds, re-enable these when their upper bound is removed
     - lens # doctest failure in 4.15.1, fixed in 4.15.2 but lens has an upper bound
 
-
     # Recursive deps https://github.com/fpco/stackage/issues/1818
     - clock # 0.7.2 clock:test => tasty:lib => clock:lib
     - options
@@ -3561,6 +3561,7 @@ expected-test-failures:
     # these if we want them fixed
     - stack # Permissions failure when creating /home/stackage/.stack.
     - skein # openfile: does not exist https://github.com/fpco/stackage/issues/1187
+    - haskell-tools-daemon # openFile: permission denied https://github.com/fpco/stackage/issues/2502
 
     # Doctests require hidden Glob package
     - multiset

From 4cf1e74d06b7669e845c93e066ca56da3cdb98f6 Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Thu, 11 May 2017 08:38:21 +0100
Subject: [PATCH 68/76] Remove upper bound for rawfilepath.

Related:
  * https://github.com/xtendo-org/rawfilepath/issues/3
  * https://github.com/fpco/stackage/issues/2497
---
 build-constraints.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 8d838cea..aaa1b206 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2845,6 +2845,7 @@ packages:
 
     "XT <e@xtendo.org> @xtendo-org":
         - rawfilepath
+
     "Konstantin Zudov <co@zudov.me> @zudov":
         - html-email-validate
 
@@ -3129,9 +3130,6 @@ packages:
         # https://github.com/fpco/stackage/issues/2464
         - traverse-with-class < 1.0.0.0
 
-        # https://github.com/xtendo-org/rawfilepath/issues/3
-        - rawfilepath < 0.2.0
-
         # https://github.com/diagrams/active/issues/20
         - lens < 4.15.2
 

From 6c6a0ff56023b99009dab1482bbdb014867e9895 Mon Sep 17 00:00:00 2001
From: Mihai Maruseac <mihai.maruseac@gmail.com>
Date: Thu, 11 May 2017 21:02:15 -0400
Subject: [PATCH 69/76] Prepare for nightly 11th May

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 8d838cea..989fbda6 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3162,8 +3162,11 @@ packages:
         # https://github.com/fpco/stackage/issues/2499
         - io-streams < 1.4.0.0
 
-        # https://github.com/fpco/stackage/issues/2501
-        - hsemail < 2
+        # https://github.com/fpco/stackage/issues/2504
+        - statistics < 0.14
+
+        # https://github.com/fpco/stackage/issues/2505
+        - one-liner < 0.9
 
 # end of packages
 

From 6550a2332aa7d9eddd7f4922a4bc2185e2bce4f3 Mon Sep 17 00:00:00 2001
From: Vladislav Zavialov <vlad.z.4096@gmail.com>
Date: Fri, 12 May 2017 14:43:07 +0300
Subject: [PATCH 70/76] Allow new 'transformers-lift' and 'ether'

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 989fbda6..79e32ba4 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3141,10 +3141,6 @@ packages:
         # https://github.com/fpco/stackage/issues/2478
         - generics-sop < 0.3.0.0
 
-        # https://github.com/fpco/stackage/issues/2479
-        - ether < 0.5.0.0
-        - transformers-lift < 0.2.0.0
-
         # https://github.com/fpco/stackage/issues/2481
         - megaparsec < 5.3.0
 

From 5247a6cd24b41716059ee5daa42a52ed0a483963 Mon Sep 17 00:00:00 2001
From: Mihai Maruseac <mihai.maruseac@gmail.com>
Date: Fri, 12 May 2017 20:09:31 -0400
Subject: [PATCH 71/76] Close #2413

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 0c714365..52daeec2 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1226,9 +1226,9 @@ packages:
         - waitra
 
         # scrive/log
-        # - log # via bloodhound: bounds: vector
+        - log # via bloodhound: bounds: vector
         - log-base
-        # - log-elasticsearch # via bloodhound: bounds: vector
+        - log-elasticsearch # via bloodhound: bounds: vector
         - log-postgres
 
         # Not a maintainer

From 62be9a2472162c116203104dbf35fd7d7f5cd24a Mon Sep 17 00:00:00 2001
From: Mihai Maruseac <mihai.maruseac@gmail.com>
Date: Fri, 12 May 2017 20:12:05 -0400
Subject: [PATCH 72/76] Bounds for #2507

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 52daeec2..b408e80d 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3166,6 +3166,9 @@ packages:
         # https://github.com/fpco/stackage/issues/2505
         - one-liner < 0.9
 
+        # https://github.com/fpco/stackage/issues/2507
+        - concurrent-output < 1.9
+
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of

From a35be3ad0093fb33c5d278b893b19e8cc0e6a6db Mon Sep 17 00:00:00 2001
From: Mihai Maruseac <mihai.maruseac@gmail.com>
Date: Fri, 12 May 2017 20:14:37 -0400
Subject: [PATCH 73/76] Bounds for #2507

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index b408e80d..59b98935 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3167,7 +3167,7 @@ packages:
         - one-liner < 0.9
 
         # https://github.com/fpco/stackage/issues/2507
-        - concurrent-output < 1.9
+        - concurrent-output < 1.8
 
 # end of packages
 

From 3db4a4e9fc629c0698162284f8e96c40a7bdb084 Mon Sep 17 00:00:00 2001
From: Mihai Maruseac <mihai.maruseac@gmail.com>
Date: Fri, 12 May 2017 18:58:26 -0700
Subject: [PATCH 74/76] Handle https://github.com/greydot/hdaemonize/issues/5

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 59b98935..cae3b59a 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3169,6 +3169,9 @@ packages:
         # https://github.com/fpco/stackage/issues/2507
         - concurrent-output < 1.8
 
+        # breaks hdaemonize: https://github.com/greydot/hdaemonize/issues/5
+        - hsyslog < 5
+
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of
@@ -3982,6 +3985,7 @@ tell-me-when-its-released:
 - vivid-0.2.0.5 # Re-enable package (disabed per MonadRandom < 0.5) https://github.com/fpco/stackage/issues/2180
 - lens-4.15.2 # Test failures in lens-4.15.1 https://github.com/fpco/stackage/issues/2496
 - active-0.2.0.12 # Will likely contain fix for the lens-4.15.2 https://github.com/fpco/stackage/issues/2496
+- hdaemonize-0.5.2 # Handles the build failure from https://github.com/greydot/hdaemonize/issues/5
 
 # Packages which should be hidden after registering, to avoid module name
 # conflicts. This is intended for at least two use cases:

From b81b32c72953efe15165bfe74468237ac8932186 Mon Sep 17 00:00:00 2001
From: Mihai Maruseac <mihai.maruseac@gmail.com>
Date: Fri, 12 May 2017 22:08:38 -0400
Subject: [PATCH 75/76] Also notify of the failure from
 https://github.com/fpco/monad-logger-syslog/issues/6

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index cae3b59a..c9efb6bd 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3170,6 +3170,7 @@ packages:
         - concurrent-output < 1.8
 
         # breaks hdaemonize: https://github.com/greydot/hdaemonize/issues/5
+        # also breaks monad-logger-syslog: https://github.com/fpco/monad-logger-syslog/issues/6
         - hsyslog < 5
 
 # end of packages
@@ -3986,6 +3987,7 @@ tell-me-when-its-released:
 - lens-4.15.2 # Test failures in lens-4.15.1 https://github.com/fpco/stackage/issues/2496
 - active-0.2.0.12 # Will likely contain fix for the lens-4.15.2 https://github.com/fpco/stackage/issues/2496
 - hdaemonize-0.5.2 # Handles the build failure from https://github.com/greydot/hdaemonize/issues/5
+- monad-logger-syslog-0.1.3.0 # Handles the build failure from https://github.com/fpco/monad-logger-syslog/issues/6
 
 # Packages which should be hidden after registering, to avoid module name
 # conflicts. This is intended for at least two use cases:

From 2aa87f758038aad73c4c5561bfdc319cbba66594 Mon Sep 17 00:00:00 2001
From: Mihai Maruseac <mihai.maruseac@gmail.com>
Date: Fri, 12 May 2017 22:18:21 -0400
Subject: [PATCH 76/76] Skip tests of ersatz, for now

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index c9efb6bd..c0bb9c51 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3399,6 +3399,9 @@ skipped-tests:
     # criterion
     - store
 
+    # requires custom setup?
+    - ersatz # https://github.com/fpco/stackage/issues/2508
+
 # end of skipped-tests
 
 # Tests which we should build and run, but which are expected to fail. We