From de8a73c5fbfd0ed784ce9fb04b1ee958c2cee970 Mon Sep 17 00:00:00 2001
From: Tomas Carnecky <tomas.carnecky@gmail.com>
Date: Fri, 28 Sep 2018 22:08:06 +0200
Subject: [PATCH 01/92] Reenable avers-api

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 4f41a662..20e4d3bd 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1307,7 +1307,7 @@ packages:
 
     "Tomas Carnecky @wereHamster":
         - avers
-        # - avers-api # cryptonite 0.25
+        - avers-api
         # - avers-server # cryptonite 0.25
         - css-syntax
         # - etcd # https://github.com/wereHamster/etcd-hs/issues/5

From 88703c5487fb3504618c849b096db6557fea3759 Mon Sep 17 00:00:00 2001
From: Dan Burton <danburton.email@gmail.com>
Date: Mon, 22 Oct 2018 13:00:22 -0400
Subject: [PATCH 02/92] Unblock avers and rethinkdb-client-driver

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index f542f0db..2715f5f4 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3832,7 +3832,6 @@ packages:
         - atom-conduit < 0
         - authenticate-oauth < 0
         - autoexporter < 0
-        - avers < 0
         - avwx < 0
         - axel < 0
         - bank-holidays-england < 0
@@ -4210,7 +4209,6 @@ packages:
         - req-url-extra < 0
         - require < 0
         - rerebase < 0
-        - rethinkdb-client-driver < 0
         - rhine < 0
         - rhine-gloss < 0
         - rollbar-hs < 0

From 870a11b2a976c017f93a8fb1f7f6abc6f8f2bd48 Mon Sep 17 00:00:00 2001
From: Dan Burton <danburton.email@gmail.com>
Date: Mon, 22 Oct 2018 13:01:31 -0400
Subject: [PATCH 03/92] Unblock avers-api, see #4005

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 2715f5f4..dc6b8eb3 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1320,7 +1320,7 @@ packages:
 
     "Tomas Carnecky @wereHamster":
         - avers
-        # - avers-api # avers, GHC 8.6
+        - avers-api
         # - avers-server # cryptonite 0.25
         - css-syntax
         # - etcd # https://github.com/wereHamster/etcd-hs/issues/5

From d7d410d07d58527650c5f2acedd7c8fc963aee7a Mon Sep 17 00:00:00 2001
From: Dan Burton <danburton.email@gmail.com>
Date: Mon, 22 Oct 2018 13:12:55 -0400
Subject: [PATCH 04/92] Unblock yesod* and deps

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index dc6b8eb3..0b22c7f5 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3876,7 +3876,6 @@ packages:
         - clash-ghc < 0
         - clash-lib < 0
         - clash-prelude < 0
-        - classy-prelude-yesod < 0
         - classyplate < 0
         - closed < 0
         - code-builder < 0
@@ -3895,8 +3894,6 @@ packages:
         - crypto-pubkey-types < 0
         - cryptocipher < 0
         - cryptocompare < 0
-        - cryptohash-cryptoapi < 0
-        - cryptonite-conduit < 0
         - cryptonite-openssl < 0
         - csg < 0
         - cue-sheet < 0
@@ -3931,7 +3928,6 @@ packages:
         - edit < 0
         - ekg-core < 0
         - ekg-statsd < 0
-        - email-validate < 0
         - emd < 0
         - enummapset < 0
         - envy < 0
@@ -3944,7 +3940,6 @@ packages:
         - fay < 0
         - fay-base < 0
         - fay-dom < 0
-        - fb < 0
         - feed < 0
         - file-modules < 0
         - filecache < 0
@@ -4046,7 +4041,6 @@ packages:
         - hsx-jmacro < 0
         - hsyslog-udp < 0
         - http-client-openssl < 0
-        - http-reverse-proxy < 0
         - http-streams < 0
         - hunit-dejafu < 0
         - hw-json < 0
@@ -4326,7 +4320,6 @@ packages:
         - wai-middleware-travisci < 0
         - wai-slack-middleware < 0
         - wai-transformers < 0
-        - wai-websockets < 0
         - warp-tls-uid < 0
         - wave < 0
         - web-plugins < 0
@@ -4348,27 +4341,7 @@ packages:
         - xml-html-qq < 0
         - xmonad-contrib < 0
         - xmonad-extras < 0
-        - yesod < 0
-        - yesod-alerts < 0
-        - yesod-auth < 0
-        - yesod-auth-fb < 0
         - yesod-auth-hashdb < 0
-        - yesod-bin < 0
-        - yesod-csp < 0
-        - yesod-eventsource < 0
-        - yesod-fb < 0
-        - yesod-form < 0
-        - yesod-form-bootstrap4 < 0
-        - yesod-gitrepo < 0
-        - yesod-newsfeed < 0
-        - yesod-paginator < 0
-        - yesod-persistent < 0
-        - yesod-recaptcha2 < 0
-        - yesod-sitemap < 0
-        - yesod-static < 0
-        - yesod-test < 0
-        - yesod-text-markdown < 0
-        - yesod-websockets < 0
 
         # failed to build
         - ClustalParser < 0

From 1786d960d2f86bdbd983ca72cd0676ea6a230657 Mon Sep 17 00:00:00 2001
From: Dan Burton <danburton.email@gmail.com>
Date: Mon, 22 Oct 2018 13:37:45 -0400
Subject: [PATCH 05/92] Block yesod-auth-fb per psibi/yesod-auth-fb#4

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 0b22c7f5..b7cb257b 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -535,7 +535,7 @@ packages:
         - tldr
         - fb
         - yesod-fb
-        - yesod-auth-fb
+        - yesod-auth-fb < 0 # https://github.com/psibi/yesod-auth-fb/issues/4
         - hourglass-orphans
         - wai-slack-middleware
         - sysinfo

From cc88a214d4cc4ac6c87f612fb49227286abc486e Mon Sep 17 00:00:00 2001
From: Dan Burton <danburton.email@gmail.com>
Date: Mon, 22 Oct 2018 16:04:59 -0400
Subject: [PATCH 06/92] Restore amazonka*

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index b7cb257b..015b85f4 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3726,96 +3726,6 @@ packages:
         - aeson-typescript < 0
         - alarmclock < 0
         - algebra < 0
-        - amazonka < 0
-        - amazonka-apigateway < 0
-        - amazonka-application-autoscaling < 0
-        - amazonka-appstream < 0
-        - amazonka-athena < 0
-        - amazonka-autoscaling < 0
-        - amazonka-budgets < 0
-        - amazonka-certificatemanager < 0
-        - amazonka-cloudformation < 0
-        - amazonka-cloudfront < 0
-        - amazonka-cloudhsm < 0
-        - amazonka-cloudsearch < 0
-        - amazonka-cloudsearch-domains < 0
-        - amazonka-cloudtrail < 0
-        - amazonka-cloudwatch < 0
-        - amazonka-cloudwatch-events < 0
-        - amazonka-cloudwatch-logs < 0
-        - amazonka-codebuild < 0
-        - amazonka-codecommit < 0
-        - amazonka-codedeploy < 0
-        - amazonka-codepipeline < 0
-        - amazonka-cognito-identity < 0
-        - amazonka-cognito-idp < 0
-        - amazonka-cognito-sync < 0
-        - amazonka-config < 0
-        - amazonka-core < 0
-        - amazonka-datapipeline < 0
-        - amazonka-devicefarm < 0
-        - amazonka-directconnect < 0
-        - amazonka-discovery < 0
-        - amazonka-dms < 0
-        - amazonka-ds < 0
-        - amazonka-dynamodb < 0
-        - amazonka-dynamodb-streams < 0
-        - amazonka-ec2 < 0
-        - amazonka-ecr < 0
-        - amazonka-ecs < 0
-        - amazonka-efs < 0
-        - amazonka-elasticache < 0
-        - amazonka-elasticbeanstalk < 0
-        - amazonka-elasticsearch < 0
-        - amazonka-elastictranscoder < 0
-        - amazonka-elb < 0
-        - amazonka-elbv2 < 0
-        - amazonka-emr < 0
-        - amazonka-gamelift < 0
-        - amazonka-glacier < 0
-        - amazonka-health < 0
-        - amazonka-iam < 0
-        - amazonka-importexport < 0
-        - amazonka-inspector < 0
-        - amazonka-iot < 0
-        - amazonka-iot-dataplane < 0
-        - amazonka-kinesis < 0
-        - amazonka-kinesis-analytics < 0
-        - amazonka-kinesis-firehose < 0
-        - amazonka-kms < 0
-        - amazonka-lambda < 0
-        - amazonka-lightsail < 0
-        - amazonka-marketplace-analytics < 0
-        - amazonka-marketplace-metering < 0
-        - amazonka-ml < 0
-        - amazonka-opsworks < 0
-        - amazonka-opsworks-cm < 0
-        - amazonka-pinpoint < 0
-        - amazonka-polly < 0
-        - amazonka-rds < 0
-        - amazonka-redshift < 0
-        - amazonka-rekognition < 0
-        - amazonka-route53 < 0
-        - amazonka-route53-domains < 0
-        - amazonka-s3 < 0
-        - amazonka-sdb < 0
-        - amazonka-servicecatalog < 0
-        - amazonka-ses < 0
-        - amazonka-shield < 0
-        - amazonka-sms < 0
-        - amazonka-snowball < 0
-        - amazonka-sns < 0
-        - amazonka-sqs < 0
-        - amazonka-ssm < 0
-        - amazonka-stepfunctions < 0
-        - amazonka-storagegateway < 0
-        - amazonka-sts < 0
-        - amazonka-support < 0
-        - amazonka-swf < 0
-        - amazonka-test < 0
-        - amazonka-waf < 0
-        - amazonka-workspaces < 0
-        - amazonka-xray < 0
         - amqp < 0
         - antiope-athena < 0
         - antiope-core < 0

From 0c3982815ebaf3d18c75b973d0b3d1825a2c0174 Mon Sep 17 00:00:00 2001
From: Dan Burton <danburton.email@gmail.com>
Date: Tue, 23 Oct 2018 14:14:48 -0400
Subject: [PATCH 07/92] Attempt to restore mpi-hs, see #4068

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 015b85f4..544aedf2 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -9,7 +9,7 @@ cabal-format-version: "2.2"
 packages:
 
     "Erik Schnetter <schnetter@gmail.com> @eschnett": 
-        - mpi-hs < 0 # https://github.com/commercialhaskell/stackage/issues/4068
+        - mpi-hs
 
     "Yang Bo <pop.atry@gmail.com> @Atry":
         - control-dsl

From 66a9cc0c876daade36c4c13e344d08fb3760d592 Mon Sep 17 00:00:00 2001
From: Dan Burton <danburton.email@gmail.com>
Date: Tue, 23 Oct 2018 14:22:03 -0400
Subject: [PATCH 08/92] Re-block mpi-hs per #4068

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 544aedf2..015b85f4 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -9,7 +9,7 @@ cabal-format-version: "2.2"
 packages:
 
     "Erik Schnetter <schnetter@gmail.com> @eschnett": 
-        - mpi-hs
+        - mpi-hs < 0 # https://github.com/commercialhaskell/stackage/issues/4068
 
     "Yang Bo <pop.atry@gmail.com> @Atry":
         - control-dsl

From ce47a6d4659d75f2811342020f2586e52dcb21fd Mon Sep 17 00:00:00 2001
From: Artyom Kazak <yom@artyom.me>
Date: Wed, 24 Oct 2018 00:08:35 +0200
Subject: [PATCH 09/92] 'fmt' builds with GHC 8.6 now

As well as some other packages that depend on haskell-src-meta.
---
 build-constraints.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 015b85f4..91c0ab6f 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3857,7 +3857,6 @@ packages:
         - flac < 0
         - flac-picture < 0
         - flow < 0
-        - fmt < 0
         - fold-debounce-conduit < 0
         - friday < 0
         - friday-juicypixels < 0
@@ -3898,7 +3897,6 @@ packages:
         - haskell-lsp < 0
         - haskell-lsp-types < 0
         - haskell-spacegoo < 0
-        - haskell-src-meta < 0
         - haskell-tools-ast < 0
         - haskell-tools-backend-ghc < 0
         - haskell-tools-builtin-refactorings < 0
@@ -3969,7 +3967,6 @@ packages:
         - influxdb < 0
         - inline-java < 0
         - inliterate < 0
-        - interpolate < 0
         - interpolatedstring-perl6 < 0
         - invertible < 0
         - invertible-grammar < 0

From 18e835b63a9d64e57d0b73e4ffbc36fe6238cf2b Mon Sep 17 00:00:00 2001
From: Dan Burton <danburton.email@gmail.com>
Date: Tue, 23 Oct 2018 18:52:08 -0400
Subject: [PATCH 10/92] Unconstrain hsinstall, closes #4067

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 015b85f4..9be1dd21 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -4327,9 +4327,6 @@ packages:
         # https://github.com/commercialhaskell/stackage/issues/4066
         - generics-sop < 0.4.0.0
 
-        # https://github.com/commercialhaskell/stackage/issues/4067
-        - hsinstall < 2
-
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of

From 4c25f11eda7521d32902f413af091cf8914d6635 Mon Sep 17 00:00:00 2001
From: Artyom Kazak <yom@artyom.me>
Date: Wed, 24 Oct 2018 11:38:19 +0200
Subject: [PATCH 11/92] Mark haskell-src-meta as "don't build tests"

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 91c0ab6f..1900c0f2 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -4530,6 +4530,7 @@ skipped-tests:
     - ed25519 # QuickCheck, hlint and more
     - hackage-security # QuickCheck
     - haddock-library # base-compat-0.10.1, hspec-2.5.1
+    - haskell-src-meta # GHC 8.6, template-haskell
     - http-streams # via snap-server-1.1.0.0
     - indents # tasty 0.12 and tasty-hunit 0.10
     - ip # hspec 2.5 https://github.com/andrewthad/haskell-ip/issues/33

From 7b808cb8c0ae12f2b599ef2da56165da4a49efb8 Mon Sep 17 00:00:00 2001
From: Emanuel Borsboom <manny@fpcomplete.com>
Date: Wed, 24 Oct 2018 10:42:31 -0700
Subject: [PATCH 12/92] Unblock hpack

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index eb215a56..7a6eb1c5 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3936,7 +3936,6 @@ packages:
         - hoogle < 0
         - hoopl < 0
         - hopenpgp-tools < 0
-        - hpack < 0
         - hpqtypes < 0
         - hquantlib < 0
         - hsebaysdk < 0

From af52fdf905392b06743a54c445ed70021ae79d9e Mon Sep 17 00:00:00 2001
From: Naushadh <naushadh@protonmail.com>
Date: Wed, 24 Oct 2018 18:32:12 -0400
Subject: [PATCH 13/92] Re-enable `persistent-mysql-haskell` with its deps.

- `mysql-haskell` and `tcp-streams` are required dependencies.
- latest version of all 3 packages run ok with: `stack build --resolver nightly --haddock --test --bench --no-run-benchmarks`
---
 build-constraints.yaml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 7a6eb1c5..8fed10ce 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -8,7 +8,7 @@ cabal-format-version: "2.2"
 # Constraints for brand new builds
 packages:
 
-    "Erik Schnetter <schnetter@gmail.com> @eschnett": 
+    "Erik Schnetter <schnetter@gmail.com> @eschnett":
         - mpi-hs < 0 # https://github.com/commercialhaskell/stackage/issues/4068
 
     "Yang Bo <pop.atry@gmail.com> @Atry":
@@ -4034,7 +4034,6 @@ packages:
         - morte < 0
         - multipart < 0
         - mwc-probability-transition < 0
-        - mysql-haskell < 0
         - mysql-haskell-nem < 0
         - mysql-haskell-openssl < 0
         - named < 0
@@ -4064,7 +4063,6 @@ packages:
         - parallel-io < 0
         - partial-order < 0
         - perf < 0
-        - persistent-mysql-haskell < 0
         - persistent-refs < 0
         - picosat < 0
         - pier < 0
@@ -4180,7 +4178,6 @@ packages:
         - swish < 0
         - tasty-dejafu < 0
         - tasty-stats < 0
-        - tcp-streams < 0
         - tcp-streams-openssl < 0
         - tdigest < 0
         - telegram-bot-simple < 0
@@ -4532,7 +4529,6 @@ skipped-tests:
     - ip # hspec 2.5 https://github.com/andrewthad/haskell-ip/issues/33
     - language-ecmascript # testing-feat 1.1.0.0
     - makefile # GHC 8.2
-    - mysql-haskell # tasty
     - next-ref # hspec 2.3
     - partial-order # HUnit 1.6
     - serialise

From 2fe731bf49aab2c2232e651307e10b18878361b3 Mon Sep 17 00:00:00 2001
From: Iris Ward <aditu.venyhandottir@gmail.com>
Date: Thu, 25 Oct 2018 01:05:33 +0100
Subject: [PATCH 14/92] Restore typenums

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 7a6eb1c5..082ed728 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -4275,7 +4275,6 @@ packages:
         - o-clock < 0
         - stm-stats < 0
         - teardown < 0
-        - typenums < 0
         - typography-geometry < 0
         - universe-instances-extended < 0
         - vivid < 0

From 0c7ccb03c2ff5acf93dd22861fa4f7487d07362f Mon Sep 17 00:00:00 2001
From: Dan Burton <danburton.email@gmail.com>
Date: Thu, 25 Oct 2018 01:36:16 -0400
Subject: [PATCH 15/92] Add constraint "pretty-show < 1.9" per #4073

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 7a6eb1c5..8ddb4f99 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -4323,6 +4323,9 @@ packages:
         # https://github.com/commercialhaskell/stackage/issues/4066
         - generics-sop < 0.4.0.0
 
+        # https://github.com/commercialhaskell/stackage/issues/4073
+        - pretty-show < 1.9
+
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of

From 1df41e9c21be2c617ef097f736c987586fa837d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20B=C3=A4renz?= <programming@manuelbaerenz.de>
Date: Fri, 26 Oct 2018 18:47:44 +0200
Subject: [PATCH 16/92] Add dunai-core

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index f581f5b3..5f5be6e3 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -57,6 +57,7 @@ packages:
         - dunai
         - rhine
         - rhine-gloss
+        - dunai-core
 
     "Paul Johnson <paul@cogito.org.uk> @PaulJohnson":
         - geodetics

From 1b5a7ce03200dbbabab6e9a2187ef932baa9c146 Mon Sep 17 00:00:00 2001
From: Tomas Carnecky <tomas.carnecky@gmail.com>
Date: Fri, 26 Oct 2018 18:54:27 +0200
Subject: [PATCH 17/92] Reenable avers-server

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index f581f5b3..ca72186e 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1321,7 +1321,7 @@ packages:
     "Tomas Carnecky @wereHamster":
         - avers
         - avers-api
-        # - avers-server # cryptonite 0.25
+        - avers-server
         - css-syntax
         # - etcd # https://github.com/wereHamster/etcd-hs/issues/5
         - github-types

From e87de0e07123677520ba0bfb8e694101ed9fdc59 Mon Sep 17 00:00:00 2001
From: tomjaguarpaw <tom-github.com@jaguarpaw.co.uk>
Date: Fri, 26 Oct 2018 18:24:19 +0100
Subject: [PATCH 18/92] Re-enable opaleye and product-profunctors

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index f581f5b3..690e0a47 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1218,8 +1218,8 @@ packages:
         - ghcjs-perch < 0 # build failure with GHC 8.4
 
     "Tom Ellis <tom-stackage@jaguarpaw.co.uk> @tomjaguarpaw":
-        - opaleye < 0 # aeson 1.3
-        - product-profunctors < 0 # via contravariant-1.5
+        - opaleye
+        - product-profunctors
 
     "Samplecount stefan@samplecount.com @kaoskorobase":
         - shake-language-c

From e813ed3ef5b746c659d137e31d500823410a44c9 Mon Sep 17 00:00:00 2001
From: Dan Burton <danburton.email@gmail.com>
Date: Fri, 26 Oct 2018 18:36:28 -0400
Subject: [PATCH 19/92] docker image: snoyberg -> commercialhaskell

---
 CURATORS.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/CURATORS.md b/CURATORS.md
index 534942d1..c7ef6262 100644
--- a/CURATORS.md
+++ b/CURATORS.md
@@ -230,7 +230,7 @@ docker rm $(docker ps -a -q)
 docker rmi $(docker images -q)
 ```
 
-but `docker pull snoyberg/stackage:nightly` can also be run instead just to update the nightly image say.
+but `docker pull commercialhaskell/stackage:nightly` can also be run instead just to update the nightly image say.
 
 For a new GHC version you should also delete the cache directories on the stackage-build server to
 force all packages to be rebuilt. See: [issue#746](https://github.com/commercialhaskell/stackage/issues/746). Eg:
@@ -241,14 +241,16 @@ This should also be done when moving the Nightly docker image to a new version o
 
 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:
+following command (replacing `BRANCH=nightly` if the image for a different branch is desired):
 
 ```
+BRANCH=nightly
 DIR=$(mktemp -d)
 (cd $DIR \
   && git clone https://github.com/commercialhaskell/stackage \
   && cd stackage \
-  && docker build --tag snoyberg/stackage:nightly .)
+  && git checkout $BRANCH
+  && docker build --tag commercialhaskell/stackage:$BRANCH .)
 rm -rf $DIR
 ```
 

From 0d3b73ad189df12659b552a9ff2045778135897c Mon Sep 17 00:00:00 2001
From: MATSUBARA Nobutada <t12307043@gunma-u.ac.jp>
Date: Sun, 28 Oct 2018 15:43:11 +0900
Subject: [PATCH 20/92] Reenable servant-kotlin

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 6a77dd65..1eafec3a 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -4134,7 +4134,6 @@ packages:
         - servant-elm < 0
         - servant-exceptions < 0
         - servant-github-webhook < 0
-        - servant-kotlin < 0
         - servant-pandoc < 0
         - servant-quickcheck < 0
         - servant-rawm < 0

From d043e18ff9049839b4220c6a68034d5ef85ff3c1 Mon Sep 17 00:00:00 2001
From: Dan Burton <danburton.email@gmail.com>
Date: Sun, 28 Oct 2018 12:17:36 -0400
Subject: [PATCH 21/92] Expect multiset tests to fail

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 1eafec3a..75dd450e 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -4867,6 +4867,7 @@ expected-test-failures:
     - hoopl # https://github.com/haskell/hoopl/issues/50
     - hspec-expectations-pretty-diff # GHC 8 issue not reported upstream since issue tracker disabled
     - hweblib # https://github.com/aycanirican/hweblib/issues/3
+    - multiset # doctests require Glob, a hidden package
     - perf # https://github.com/fpco/stackage/pull/2859
     - picosat # https://github.com/fpco/stackage/pull/2382
     - pkcs10 # https://github.com/fcomb/pkcs10-hs/issues/2

From 3c57b0cc913114bb39310a055a4c397940b886aa Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Mon, 29 Oct 2018 00:11:27 +0300
Subject: [PATCH 22/92] Reenable web3

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 75dd450e..fa40496a 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3571,7 +3571,7 @@ packages:
         - yesod-text-markdown
 
     "Alexander Krupenkin <mail@akru.me> @akru":
-        - web3 < 0 # via aeson-1.4.0.0
+        - web3
 
     "Georg Rudoy <0xd34df00d@gmail.com> @0xd34df00d":
         - enum-subset-generate

From 6878cf8551f7b13f69a3e04469f74a66f9ac3414 Mon Sep 17 00:00:00 2001
From: Dan Burton <danburton.email@gmail.com>
Date: Sun, 28 Oct 2018 22:31:00 -0400
Subject: [PATCH 23/92] Attempt to unblock mpi-hs

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 75dd450e..8838ee2b 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -9,7 +9,7 @@ cabal-format-version: "2.2"
 packages:
 
     "Erik Schnetter <schnetter@gmail.com> @eschnett":
-        - mpi-hs < 0 # https://github.com/commercialhaskell/stackage/issues/4068
+        - mpi-hs
 
     "Yang Bo <pop.atry@gmail.com> @Atry":
         - control-dsl

From 6a708a9007b92f95fa1f38d7aeecbadc2abb41f6 Mon Sep 17 00:00:00 2001
From: Dan Burton <danburton.email@gmail.com>
Date: Sun, 28 Oct 2018 22:34:39 -0400
Subject: [PATCH 24/92] Revert "Attempt to unblock mpi-hs"

This reverts commit 6878cf8551f7b13f69a3e04469f74a66f9ac3414.
---
 build-constraints.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 8838ee2b..75dd450e 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -9,7 +9,7 @@ cabal-format-version: "2.2"
 packages:
 
     "Erik Schnetter <schnetter@gmail.com> @eschnett":
-        - mpi-hs
+        - mpi-hs < 0 # https://github.com/commercialhaskell/stackage/issues/4068
 
     "Yang Bo <pop.atry@gmail.com> @Atry":
         - control-dsl

From cb8a98815de062628bc1ece72bd2644d4a1677d6 Mon Sep 17 00:00:00 2001
From: Dan Burton <danburton.email@gmail.com>
Date: Mon, 29 Oct 2018 10:40:01 -0400
Subject: [PATCH 25/92] Add constraint "language-docker < 8.0.0" per #3955

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 75dd450e..804a0424 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -4309,6 +4309,7 @@ packages:
         - cue-sheet
         - stache
         - neat-interpolation < 0.3.2.3
+        - language-docker < 8.0.0
 
         # https://github.com/commercialhaskell/stackage/issues/4053
         - yaml < 0.11

From c16d8ac06493cb029693a631df137153e6f0c000 Mon Sep 17 00:00:00 2001
From: Daniel Mendler <mail@daniel-mendler.de>
Date: Mon, 29 Oct 2018 16:20:10 +0100
Subject: [PATCH 26/92] Add persist and writer-cps-exceptions

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 804a0424..eba7ded5 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2927,6 +2927,7 @@ packages:
         - writer-cps-morph
         - writer-cps-lens
         - writer-cps-full
+        - writer-cps-exceptions
         - wl-pprint-annotated
         - wl-pprint-console
         - console-style
@@ -2936,6 +2937,7 @@ packages:
         - colorful-monoids
         - ihs
         - paripari
+        - persist
 
     "Taras Serduke <taras.serduke@gmail.com> @tserduke":
         - do-list

From baf12403c6f2f0b48f3b1b01474ebd88da4c4a53 Mon Sep 17 00:00:00 2001
From: Chris Coffey <cmcof273@gmail.com>
Date: Mon, 29 Oct 2018 22:24:32 -0400
Subject: [PATCH 27/92] Add `cuckoo-filter`

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 804a0424..1878d214 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3541,6 +3541,7 @@ packages:
 
     "Chris Coffey <chris@foldl.io> @ChrisCoffey":
         - servant-tracing
+        - cuckoo-filter
 
     "Rick Owens <rick@owensmurray.com> @owensmurray":
         - om-elm
@@ -4142,7 +4143,6 @@ packages:
         - servant-streaming < 0
         - servant-streaming-client < 0
         - servant-streaming-server < 0
-        - servant-tracing < 0
         - servant-websockets < 0
         - serverless-haskell < 0
         - servius < 0

From d4da632cf2c1308c37544b28eb970da8b686bf36 Mon Sep 17 00:00:00 2001
From: Alexey Kotlyarov <a@koterpillar.com>
Date: Tue, 30 Oct 2018 17:42:43 +1100
Subject: [PATCH 28/92] Re-enable serverless-haskell

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 804a0424..84a86e1f 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -4144,7 +4144,6 @@ packages:
         - servant-streaming-server < 0
         - servant-tracing < 0
         - servant-websockets < 0
-        - serverless-haskell < 0
         - servius < 0
         - ses-html < 0
         - set-cover < 0

From 80c84d9ce3f323dc700fd1065ae6cc09e3b91ca0 Mon Sep 17 00:00:00 2001
From: Alexandre Peyroux <alex@xn--wxa.email>
Date: Tue, 30 Oct 2018 15:21:36 +0100
Subject: [PATCH 29/92] add nuxeo

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 804a0424..b93ccc4f 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3448,6 +3448,7 @@ packages:
 
     "Alexandre Peyroux <alex@xn--wxa.email> @apeyroux":
         - HSlippyMap
+        - nuxeo
 
     "Andrey Sverdlichenko <blaze@ruddy.ru> @rblaze":
         - credential-store

From 4fa6f60853c60fae5f8f9a86a4918d22ac78def8 Mon Sep 17 00:00:00 2001
From: Dan Burton <danburton.email@gmail.com>
Date: Tue, 30 Oct 2018 11:10:16 -0400
Subject: [PATCH 30/92] Expect web3 tests to fail

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index ccb43e68..646a98e8 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -4827,6 +4827,7 @@ expected-test-failures:
     - users-postgresql-simple # PostgreSQL
     - wai-cors # PhantomJS
     - wai-session-postgresql # PostgreSQL
+    - web3 # requires running server
     - webdriver-angular # webdriver server
     - websockets
 

From ce60bcd7d66b7adb6520334fac3a4195569288be Mon Sep 17 00:00:00 2001
From: Chris Coffey <cmcof273@gmail.com>
Date: Tue, 30 Oct 2018 11:31:07 -0400
Subject: [PATCH 31/92] Add confcrypt

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 646a98e8..5d368170 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3544,6 +3544,7 @@ packages:
     "Chris Coffey <chris@foldl.io> @ChrisCoffey":
         - servant-tracing
         - cuckoo-filter
+        - confcrypt
 
     "Rick Owens <rick@owensmurray.com> @owensmurray":
         - om-elm

From bf5200fb07a08a5b600899dff66afc1c6c9ad071 Mon Sep 17 00:00:00 2001
From: Dan Burton <danburton.email@gmail.com>
Date: Tue, 30 Oct 2018 13:01:50 -0400
Subject: [PATCH 32/92] Unblock crypt-pubkey-types

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 14b265b6..f710e03a 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3807,7 +3807,6 @@ packages:
         - cql-io < 0
         - credential-store < 0
         - crypto-pubkey < 0
-        - crypto-pubkey-types < 0
         - cryptocipher < 0
         - cryptocompare < 0
         - cryptonite-openssl < 0

From b1baf35e59fa3a266c4d8760a8ef1ff02f25ab54 Mon Sep 17 00:00:00 2001
From: Dan Burton <danburton.email@gmail.com>
Date: Tue, 30 Oct 2018 14:25:08 -0400
Subject: [PATCH 33/92] Unblock datadog

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index f710e03a..e4557297 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3817,7 +3817,6 @@ packages:
         - czipwith < 0
         - darcs < 0
         - data-tree-print < 0
-        - datadog < 0
         - datasets < 0
         - dawg-ord < 0
         - deferred-folds < 0
@@ -4618,6 +4617,7 @@ skipped-tests:
     - path # via genvalidity genvalidity-property
     - system-fileio # ansi-terminal-0.8 via chell
     - system-filepath # ansi-terminal-0.8 via chell
+    - buffer-builder # per HTF per cpphs per polyparse (ghc 8.6 failure)
 
     # Blocked by stackage upper bounds. These can be re-enabled once
     # the relevant stackage upper bound is lifted.

From 36e393f3becb3323039d647b8d3ed048ba9f054e Mon Sep 17 00:00:00 2001
From: Alexandre Peyroux <alex@px.io>
Date: Tue, 30 Oct 2018 20:00:37 +0100
Subject: [PATCH 34/92] update e-mail address

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index e4557297..a2688f6c 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3448,7 +3448,7 @@ packages:
     "Alexis Williams <alexis@typedr.at> @typedrat":
         - stb-image-redux
 
-    "Alexandre Peyroux <alex@xn--wxa.email> @apeyroux":
+    "Alexandre Peyroux <alex@px.io> @apeyroux":
         - HSlippyMap
         - nuxeo
 

From 3bfb16493c8488146bd3b448315f2c4c855ec620 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Tue, 30 Oct 2018 17:03:12 -0400
Subject: [PATCH 35/92] Build uri-bytestring again

As of v0.3.2.1, this seems to compile on nightly (benchmarks too). I'm attempting to get
yesod-auth-oauth2 back in Stackage, which requires hoauth2 (which I've fixed), which
requires uri-bytestring-aeson (which I'm fixing now), which requires uri-bytestring.
---
 build-constraints.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index e4557297..dd6ff487 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -4205,7 +4205,6 @@ packages:
         - tz < 0
         - tzdata < 0
         - union < 0
-        - uri-bytestring < 0
         - uri-templater < 0
         - urlpath < 0
         - users < 0
@@ -5118,7 +5117,6 @@ skipped-benchmarks:
     - type-of-html
     - ua-parser
     - unbound-generics
-    - uri-bytestring
     - vec
     - vinyl
     - websockets

From 77485229fee978d539557e18da7ab29ccdfcc175 Mon Sep 17 00:00:00 2001
From: chessai <chessai1996@gmail.com>
Date: Wed, 31 Oct 2018 07:53:20 -0400
Subject: [PATCH 36/92] switch maintainership of streaming,
 streaming-bytestring, and country from Kostiantyn Rybnikov to Daniel
 Cartwright

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index e4557297..6c6c91ca 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1957,9 +1957,13 @@ packages:
         - timerep
         - xml-conduit-parse
 
+    "Daniel Cartwright <chessai1996@gmail.com> @chessai":
+        - streaming
+        - streaming-bytestring
+        - country
+
     "Kostiantyn Rybnikov <k-bx@k-bx.com> @k-bx":
         - SHA
-        - country
         - currency
         - data-ordlist
         - digits
@@ -1978,8 +1982,6 @@ packages:
         - protocol-buffers
         - protocol-buffers-descriptor
         - regex-pcre
-        - streaming
-        - streaming-bytestring
         - string-class
         - string-combinators
 

From 48e77134a123703908d04d9e4f6780a250287dd5 Mon Sep 17 00:00:00 2001
From: Dan Burton <danburton.email@gmail.com>
Date: Wed, 31 Oct 2018 11:39:13 -0400
Subject: [PATCH 37/92] Restore hlint and deps

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index d169732d..258d5603 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3805,7 +3805,6 @@ packages:
         - consul-haskell < 0
         - containers-unicode-symbols < 0
         - country < 0
-        - cpphs < 0
         - cql-io < 0
         - credential-store < 0
         - crypto-pubkey < 0
@@ -3936,7 +3935,6 @@ packages:
         - hledger-lib < 0
         - hledger-ui < 0
         - hledger-web < 0
-        - hlint < 0
         - hmatrix-backprop < 0
         - hmatrix-vector-sized < 0
         - hoogle < 0
@@ -4085,7 +4083,6 @@ packages:
         - pipes-safe < 0
         - pkcs10 < 0
         - plotlyhs < 0
-        - polyparse < 0
         - postgresql-binary < 0
         - postgresql-simple-migration < 0
         - postgresql-simple-url < 0

From 094dcf3a17e9f24c90f44cd1e184acdb1d13cb77 Mon Sep 17 00:00:00 2001
From: Justin Le <justin@jle.im>
Date: Wed, 31 Oct 2018 21:56:02 -0700
Subject: [PATCH 38/92] add lens-typelevel to stackage

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index d169732d..2cac4ed5 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1874,6 +1874,7 @@ packages:
         - hamilton
         - hmatrix-backprop
         - hmatrix-vector-sized
+        - lens-typelevel
         - one-liner-instances
         - prompt
         - tagged-binary

From e4220030b01834c0a85bee1512ae064c097c2e36 Mon Sep 17 00:00:00 2001
From: Marat Khafizov <xafizoff@gmail.com>
Date: Thu, 1 Nov 2018 08:14:23 +0300
Subject: [PATCH 39/92] Add n2o-* packages to the stackage

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index d169732d..7540b327 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3649,6 +3649,12 @@ packages:
 
     "Nikos Karagianndis <nkarag@gmail.com> @nkarag":
         - DBFunctor
+        
+    "Marat Khafizov <xafizoff@gmail.com> @xafizoff":
+        - n2o
+        #- n2o-nitro
+        #- n2o-protocols
+        #- n2o-web
 
     # If you stop maintaining a package you can move it here.
     # It will then be disabled if it starts causing problems.

From eb39f4339544f3944e8226312b8ee2a4b3129bcc Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Thu, 1 Nov 2018 19:42:24 +0900
Subject: [PATCH 40/92] intro < 0.5.2 (minad/intro#2)

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index d169732d..ccab3c7c 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -4325,6 +4325,8 @@ packages:
         # https://github.com/commercialhaskell/stackage/issues/4073
         - pretty-show < 1.9
 
+        # https://github.com/minad/intro/issues/2
+        - intro < 0.5.2
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of

From 516be49fc31198455e5a7b96621fcf989e09ab2f Mon Sep 17 00:00:00 2001
From: Dan Burton <danburton.email@gmail.com>
Date: Thu, 1 Nov 2018 17:11:32 -0400
Subject: [PATCH 41/92] unblock dhall deps (but not dhall)

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index a9cb33a5..180ff54c 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3784,7 +3784,6 @@ packages:
         - cachix-api < 0
         - cairo < 0
         - cayley-client < 0
-        - cborg < 0
         - chatwork < 0
         - cheapskate < 0
         - cheapskate-highlight < 0
@@ -4111,7 +4110,6 @@ packages:
         - rebase < 0
         - ref-fd < 0
         - registry < 0
-        - repline < 0
         - req < 0
         - req-conduit < 0
         - req-url-extra < 0
@@ -4130,7 +4128,6 @@ packages:
         - search-algorithms < 0
         - seqid < 0
         - seqid-streams < 0
-        - serialise < 0
         - servant-JuicyPixels < 0
         - servant-auth < 0
         - servant-auth-client < 0

From cb729a6767d361ada3884ba7c36ce48aa056fb30 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Fri, 2 Nov 2018 00:45:27 -0400
Subject: [PATCH 42/92] Enable uri-bytestring-aeson (#4092)

uri-bytestrying-aeson-0.1.0.7 has been updated to build successfully on nightly
---
 build-constraints.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index a9cb33a5..d288f8bf 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3229,7 +3229,7 @@ packages:
         - conduit-throttle
 
     "Simon Hafner <hafnersimon@gmail.com> @reactormonk":
-        - uri-bytestring-aeson < 0 # GHC 8.4 via base-4.11.0.0
+        - uri-bytestring-aeson
         - katip-scalyr-scribe < 0 # via katip
 
     "Sebastian Witte <woozletoff@gmail.com> @saep":

From cae4b6cc2341aecd2c2db5e9b04e72978708b3a0 Mon Sep 17 00:00:00 2001
From: David Smith <shmish111@gmail.com>
Date: Fri, 2 Nov 2018 12:04:46 +0000
Subject: [PATCH 43/92] add bazel-runfiles

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 7ca74371..2cbe11e0 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3657,6 +3657,9 @@ packages:
         #- n2o-protocols
         #- n2o-web
 
+    "David Smith <shmish111@gmail.com> @shmish111":
+        - bazel-runfiles
+
     # 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
@@ -5294,6 +5297,8 @@ github-users:
         - RyanGlScott
     onrock-eng:
         - donkeybonks
+    tweag:
+        - bazel-runfiles
 
 # end of github-users
 

From 1a72f303f1aece3374492fd88b4349d83f2af7a8 Mon Sep 17 00:00:00 2001
From: Daniel Mendler <mail@daniel-mendler.de>
Date: Fri, 2 Nov 2018 15:15:03 +0100
Subject: [PATCH 44/92] Remove bound on intro

https://github.com/minad/intro/issues/2 has been fixed
---
 build-constraints.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 7ca74371..2c32a2f7 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -4325,9 +4325,6 @@ packages:
 
         # https://github.com/commercialhaskell/stackage/issues/4073
         - pretty-show < 1.9
-
-        # https://github.com/minad/intro/issues/2
-        - intro < 0.5.2
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of

From 1b7a77d8d9d3d9f561fdbe9f4747b257757b9ec1 Mon Sep 17 00:00:00 2001
From: Jonathan Fischoff <jfischoff@yahoo.com>
Date: Fri, 2 Nov 2018 18:50:17 -0700
Subject: [PATCH 45/92] add port-utils to stackage

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 7ca74371..657954ed 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3013,6 +3013,7 @@ packages:
         - pg-transact
         - hspec-pg-transact
         - postgresql-simple-queue
+        - port-utils
 
     "Mahdi Dibaiee <mdibaiee@aol.com> @mdibaiee":
         - picedit < 0 # DependencyFailed (PackageName "cli")

From 210fb255953535ba1c6b23f60149f278012f6db2 Mon Sep 17 00:00:00 2001
From: Dan Burton <danburton.email@gmail.com>
Date: Sat, 3 Nov 2018 01:28:40 -0400
Subject: [PATCH 46/92] Unblock megaparsec, see #3955

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 7ca74371..754f1bdb 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2015,9 +2015,9 @@ packages:
     "Stack Builders stackage@stackbuilders.com @stackbuilders":
         - atomic-write
         - dbcleaner
-        - dotenv < 0.6.0.1 # https://github.com/commercialhaskell/stackage/issues/3955
+        - dotenv
         - hapistrano
-        - inflections < 0.4.0.4 # https://github.com/commercialhaskell/stackage/issues/3955
+        - inflections
         - stache
         - scalendar
 
@@ -3300,7 +3300,7 @@ packages:
         - first-class-patterns
         - relude
         - summoner
-        - tomland
+        - tomland < 0 # megaparsec 7
 
     "Lorenz Moesenlechner <moesenle@gmail.com> @moesenle":
         - servant-websockets
@@ -3818,7 +3818,6 @@ packages:
         - cryptocompare < 0
         - cryptonite-openssl < 0
         - csg < 0
-        - cue-sheet < 0
         - curl-runnings < 0
         - cyclotomic < 0
         - czipwith < 0
@@ -3829,10 +3828,7 @@ packages:
         - deferred-folds < 0
         - dejafu < 0
         - derulo < 0
-        - dhall < 0
         - dhall-bash < 0
-        - dhall-json < 0
-        - dhall-text < 0
         - dhall-to-cabal < 0
         - diagrams-solve < 0
         - discrimination < 0
@@ -3952,7 +3948,6 @@ packages:
         - hslua < 0
         - hslua-aeson < 0
         - hslua-module-text < 0
-        - hspec-megaparsec < 0
         - hspec-need-env < 0
         - hspec-wai-json < 0
         - hsx-jmacro < 0
@@ -4168,7 +4163,6 @@ packages:
         - sparkle < 0
         - speculation < 0
         - squeal-postgresql < 0
-        - stache < 0
         - stack < 0
         - statestack < 0
         - static-text < 0
@@ -4305,15 +4299,6 @@ packages:
         - hspec-discover < 2.5.6
         - hspec-meta < 2.5.6
 
-        # https://github.com/commercialhaskell/stackage/issues/3955
-        - megaparsec < 7.0.0
-        - hspec-megaparsec
-        - modern-uri
-        - cue-sheet
-        - stache
-        - neat-interpolation < 0.3.2.3
-        - language-docker < 8.0.0
-
         # https://github.com/commercialhaskell/stackage/issues/4053
         - yaml < 0.11
 

From 0f60ffb95b04de1eacbf7d6a5c2b760d788b7434 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Mon, 5 Nov 2018 00:30:11 +0900
Subject: [PATCH 47/92] re-enable mpi-hs (#4068)

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 591c3715..2fdac54b 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -9,7 +9,7 @@ cabal-format-version: "2.2"
 packages:
 
     "Erik Schnetter <schnetter@gmail.com> @eschnett":
-        - mpi-hs < 0 # https://github.com/commercialhaskell/stackage/issues/4068
+        - mpi-hs
 
     "Yang Bo <pop.atry@gmail.com> @Atry":
         - control-dsl

From ba14c28f5a7d7ecee0c8f3f904adaef63b3d25e4 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Mon, 5 Nov 2018 00:42:36 +0900
Subject: [PATCH 48/92] microlens, microlens-ghc < 0.4.10 (#4100)

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index ae3b1f6a..67d3d958 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -4314,6 +4314,10 @@ packages:
 
         # https://github.com/commercialhaskell/stackage/issues/4073
         - pretty-show < 1.9
+
+        # https://github.com/commercialhaskell/stackage/issues/4100
+        - microlens < 0.4.10
+        - microlens-ghc < 0.4.10
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of

From 3354f6c1c358ce952d6b22053f7c1de293a3fef3 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Mon, 5 Nov 2018 10:28:40 +0900
Subject: [PATCH 49/92] microlens-platform < 0.3.11 (#4100)

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 67d3d958..c89fcdae 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -4318,6 +4318,7 @@ packages:
         # https://github.com/commercialhaskell/stackage/issues/4100
         - microlens < 0.4.10
         - microlens-ghc < 0.4.10
+        - microlens-platform < 0.3.11
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of

From 5a3cb45402111a22b98ba852676957ce965b50fb Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Mon, 5 Nov 2018 13:06:35 +0900
Subject: [PATCH 50/92] microlens should be good now (#4100)

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index c89fcdae..ae3b1f6a 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -4314,11 +4314,6 @@ packages:
 
         # https://github.com/commercialhaskell/stackage/issues/4073
         - pretty-show < 1.9
-
-        # https://github.com/commercialhaskell/stackage/issues/4100
-        - microlens < 0.4.10
-        - microlens-ghc < 0.4.10
-        - microlens-platform < 0.3.11
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of

From b909a07d97d4cc8509b08f8fcf3b1e3e3f5c8d18 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Mon, 5 Nov 2018 15:57:08 +0900
Subject: [PATCH 51/92] hspec-contrib < 0.5.1 (#3949)

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index ae3b1f6a..b123d87d 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -4302,6 +4302,7 @@ packages:
         - hspec-core < 2.5.6
         - hspec-discover < 2.5.6
         - hspec-meta < 2.5.6
+        - hspec-contrib < 0.5.1
 
         # https://github.com/commercialhaskell/stackage/issues/4053
         - yaml < 0.11

From 866fe31912ec90900324d753ccb6fb116a91dcca Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Mon, 5 Nov 2018 16:41:28 +0900
Subject: [PATCH 52/92] Revert "re-enable mpi-hs (#4068)"

This reverts commit 0f60ffb95b04de1eacbf7d6a5c2b760d788b7434.
---
 build-constraints.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index b123d87d..bfc72e84 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -9,7 +9,7 @@ cabal-format-version: "2.2"
 packages:
 
     "Erik Schnetter <schnetter@gmail.com> @eschnett":
-        - mpi-hs
+        - mpi-hs < 0 # https://github.com/commercialhaskell/stackage/issues/4068
 
     "Yang Bo <pop.atry@gmail.com> @Atry":
         - control-dsl

From 6cfc16746f715611924ae1f6d270a7d1a1def996 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Mon, 5 Nov 2018 16:46:55 +0900
Subject: [PATCH 53/92] slack-web failing to build (jpvillaisaza/slack-web#67)

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index bfc72e84..ea63c45a 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2352,7 +2352,7 @@ packages:
     "Emmanuel Touzery <etouzery@gmail.com> @emmanueltouzery":
         - app-settings
         - hsexif
-        - slack-web
+        # - slack-web # https://github.com/jpvillaisaza/slack-web/issues/67
 
     "Nickolay Kudasov <nickolay.kudasov@gmail.com> @fizruk":
         - http-api-data

From 9f8cd8f220039319d13b464d0f7a597847722016 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Mon, 5 Nov 2018 19:01:21 +0900
Subject: [PATCH 54/92] CURATORS.md: how to tweak package when NOPLAN=1

---
 CURATORS.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CURATORS.md b/CURATORS.md
index c7ef6262..6eb02941 100644
--- a/CURATORS.md
+++ b/CURATORS.md
@@ -314,7 +314,10 @@ develop this advice over time. For now: if you're not sure, ask for guidance.
 __`NOPLAN=1`__ If you wish to rerun a build without recalculating a
 build plan, you can set the environment variable `NOPLAN=1`. This is
 useful for such cases as an intermittent test failure, out of memory
-condition, or manually tweaking the plan file.
+condition, or manually tweaking the plan file. (When using `NOPLAN=1`,
+if one needs to revert one package, say due to a build or test regression,
+one can edit `current-plan.yaml` and updated the SHA256 hash of the .cabal file,
+to avoid having to rebuild everything again.)
 
 Note LTS builds inherit the current Hackage data (stack updated for Nigthly) to avoid excess extra rebuilding.
 

From 3606cc930b468c2c2b907678e6741d01d7c14244 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Mon, 5 Nov 2018 19:14:22 +0900
Subject: [PATCH 55/92] try to re-enable hoogle (#4087)

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index ea63c45a..aa2e16e9 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3943,7 +3943,6 @@ packages:
         - hledger-web < 0
         - hmatrix-backprop < 0
         - hmatrix-vector-sized < 0
-        - hoogle < 0
         - hoopl < 0
         - hopenpgp-tools < 0
         - hpqtypes < 0

From 3e2eabd4c671bd926ef33c37ce6cc4458982d38f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 5 Nov 2018 15:25:15 +0000
Subject: [PATCH 56/92] Add back: katip, mixpanel-cient, systemd, pretty-sop

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index aa2e16e9..a86beb26 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2623,7 +2623,7 @@ packages:
         - ua-parser
         - hs-GeoIP
         - retry
-        - katip < 0 # via aeson-1.3.1.0
+        - katip
         # - katip-elasticsearch # async 2.2
 
     "Sid Kapur sidharthkapur1@gmail.com @sid-kap":
@@ -3484,6 +3484,8 @@ packages:
     "Domen Kozar <domen@enlambda.com> @domenkozar":
         - cachix
         - cachix-api
+        - mixpanel-client
+        - pretty-sop
         - servant-auth
         - servant-auth-server
         - servant-auth-client
@@ -3494,6 +3496,7 @@ packages:
         - servant-streaming-client
         - servant-streaming-server
         - streaming-wai
+        - systemd
 
     "Andre Van Der Merwe <stackage@andrevdm.com> @andrevdm":
         - bhoogle

From f7d82a4cfa8f30db4e574818fcf459ece0a9ff15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 5 Nov 2018 15:30:33 +0000
Subject: [PATCH 57/92] Re-enable servant-auth-* on GHC 8.6

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index a86beb26..fe9f6200 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -709,6 +709,7 @@ packages:
         - vector-instances
         - void
         - wl-pprint-extras
+        - wreq < 0
         - wl-pprint-terminfo
         - zippers
         - zlib-lens
@@ -3990,7 +3991,6 @@ packages:
         - jmacro < 0
         - jmacro-rpc < 0
         - jmacro-rpc-snap < 0
-        - jose < 0
         - jose-jwt < 0
         - json-feed < 0
         - json-rpc-client < 0
@@ -4130,11 +4130,6 @@ packages:
         - seqid < 0
         - seqid-streams < 0
         - servant-JuicyPixels < 0
-        - servant-auth < 0
-        - servant-auth-client < 0
-        - servant-auth-docs < 0
-        - servant-auth-server < 0
-        - servant-auth-swagger < 0
         - servant-checked-exceptions < 0
         - servant-checked-exceptions-core < 0
         - servant-dhall < 0
@@ -4239,7 +4234,6 @@ packages:
         - withdependencies < 0
         - wl-pprint-extras < 0
         - wl-pprint-terminfo < 0
-        - wreq < 0
         - wreq-stringless < 0
         - ws < 0
         - wss-client < 0
@@ -4584,6 +4578,7 @@ skipped-tests:
     - rss-conduit
     - servant-blaze
     - servant-cassava
+    - servant-auth-server
     - siggy-chardust
     - simple-vec3
     - skews

From 293f003dc94645f74b9321cdd874564bb1c10406 Mon Sep 17 00:00:00 2001
From: Emmanuel Touzery <etouzery@gmail.com>
Date: Mon, 5 Nov 2018 21:46:13 +0100
Subject: [PATCH 58/92] restore slack-web

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index aa2e16e9..b6eef297 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2352,7 +2352,7 @@ packages:
     "Emmanuel Touzery <etouzery@gmail.com> @emmanueltouzery":
         - app-settings
         - hsexif
-        # - slack-web # https://github.com/jpvillaisaza/slack-web/issues/67
+        - slack-web
 
     "Nickolay Kudasov <nickolay.kudasov@gmail.com> @fizruk":
         - http-api-data

From d5d81c528fe32a21dba747cfdbd5d89771778640 Mon Sep 17 00:00:00 2001
From: Preetham Gujjula <preetham.gujjula@gmail.com>
Date: Mon, 5 Nov 2018 13:07:34 -0800
Subject: [PATCH 59/92] add modular

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index aa2e16e9..a06c3311 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -7,6 +7,8 @@ cabal-format-version: "2.2"
 
 # Constraints for brand new builds
 packages:
+    "Preetham Gujjula <preetham.gujjula@gmail.com> @pgujjula":
+        - modular
 
     "Erik Schnetter <schnetter@gmail.com> @eschnett":
         - mpi-hs < 0 # https://github.com/commercialhaskell/stackage/issues/4068

From 7e995a0a8aa9a636a6060a41a22540219bd5774a Mon Sep 17 00:00:00 2001
From: Timo von Holtz <tvh@tvholtz.de>
Date: Mon, 5 Nov 2018 23:58:20 +0100
Subject: [PATCH 60/92] Reenable some diagrams packages

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index aa2e16e9..b7b64f50 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -735,20 +735,20 @@ packages:
         - rank2classes
 
     "Brent Yorgey <byorgey@gmail.com> @byorgey":
-        - active < 0 # via lens-4.17
+        - active
         - diagrams < 0 # via diagrams-contrib
         - diagrams-builder < 0 # via lens-4.17
         - diagrams-cairo < 0 # via lens-4.17
         - diagrams-canvas < 0 # via lens-4.17
         - diagrams-contrib < 0 # via lens-4.17
-        - diagrams-core < 0 # via lens-4.17
+        - diagrams-core
         - diagrams-gtk < 0 # via diagrams-cairo
         - diagrams-html5 < 0 # via lens-4.17
-        - diagrams-lib < 0 # via lens-4.17
+        - diagrams-lib
         - diagrams-postscript < 0 # via lens-4.17
         - diagrams-rasterific < 0 # via lens-4.17
         - diagrams-solve
-        - diagrams-svg < 0 # via lens-4.17
+        - diagrams-svg
         - force-layout < 0 # via lens-4.17
         - SVGFonts < 0 # via diagrams-core
         - palette
@@ -3834,7 +3834,6 @@ packages:
         - derulo < 0
         - dhall-bash < 0
         - dhall-to-cabal < 0
-        - diagrams-solve < 0
         - discrimination < 0
         - distributed-static < 0
         - distribution-opensuse < 0

From b21ffb65a7fac4cce8586c62592eb092cdea6deb Mon Sep 17 00:00:00 2001
From: Joe Kachmar <joseph.kachmar@gmail.com>
Date: Tue, 6 Nov 2018 02:19:12 +0000
Subject: [PATCH 61/92] Re-enables monoid-extras and svg-builder (#4106)

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 7112827a..b16a2a44 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -4039,7 +4039,6 @@ packages:
         - moesocks < 0
         - monad-metrics < 0
         - mongoDB < 0
-        - monoid-extras < 0
         - monoid-subclasses < 0
         - monoidal-containers < 0
         - morte < 0
@@ -4173,7 +4172,6 @@ packages:
         - stringsearch < 0
         - strive < 0
         - summoner < 0
-        - svg-builder < 0
         - swish < 0
         - tasty-dejafu < 0
         - tasty-stats < 0

From 3aa6575a1dcbe53fe0c33d38d9c3d74ee0a29e1c Mon Sep 17 00:00:00 2001
From: Joe Kachmar <joseph.kachmar@gmail.com>
Date: Tue, 6 Nov 2018 02:59:22 +0000
Subject: [PATCH 62/92] Disables systemd tests (erebe/systemd#3)

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index b16a2a44..ad1c1781 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -4842,6 +4842,7 @@ expected-test-failures:
     - http-client-tls # https://github.com/snoyberg/http-client/issues/360
     - http-link-header # https://github.com/myfreeweb/http-link-header/issues/7
     - mmark # https://github.com/commercialhaskell/stackage/issues/3906#issuecomment-413061849
+    - systemd # https://github.com/erebe/systemd/issues/3
     - unicode-show # https://github.com/nushio3/unicode-show/issues/2
     - wreq
     - xml-picklers # https://github.com/Philonous/xml-picklers/issues/5

From 5b45c44c2840a8eaeeb70d0d2fe66c38bfbf0f6d Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Tue, 6 Nov 2018 15:06:25 +0900
Subject: [PATCH 63/92] pandoc stack: enable haddock-library, hslua*, lrucache,
 texmath

cheapskate needs revision for containers
---
 build-constraints.yaml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index ad1c1781..29067199 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2249,7 +2249,7 @@ packages:
         - locators
 
     "Sean Hunt <scshunt@csclub.uwaterloo.ca @scshunt":
-        - cheapskate
+        - cheapskate < 0 # containers
 
     "Ivan Miljenovic <Ivan.Miljenovic@gmail.com> @ivan-m":
         - fgl
@@ -2609,7 +2609,7 @@ packages:
         - pandoc-types < 1.19 || > 1.19 # Accidental upload, see: https://github.com/fpco/stackage/issues/2223
         - zip-archive
         - doctemplates
-        - pandoc < 0 # via haddock-library-1.6.0
+        - pandoc < 0 # via cheapskate
         - pandoc-citeproc < 0 # via pandoc
 
     "Karun Ramakrishnan <karun012@gmail.com> @karun012":
@@ -3793,7 +3793,6 @@ packages:
         - cairo < 0
         - cayley-client < 0
         - chatwork < 0
-        - cheapskate < 0
         - cheapskate-highlight < 0
         - cheapskate-lucid < 0
         - check-email < 0
@@ -3903,7 +3902,6 @@ packages:
         - gtk3 < 0
         - gym-http-api < 0
         - hOpenPGP < 0
-        - haddock-library < 0
         - hailgun < 0
         - hamilton < 0
         - handwriting < 0
@@ -3952,9 +3950,6 @@ packages:
         - hpqtypes < 0
         - hquantlib < 0
         - hsebaysdk < 0
-        - hslua < 0
-        - hslua-aeson < 0
-        - hslua-module-text < 0
         - hspec-need-env < 0
         - hspec-wai-json < 0
         - hsx-jmacro < 0
@@ -4018,7 +4013,6 @@ packages:
         - logging-effect-extra < 0
         - logging-effect-extra-file < 0
         - logging-effect-extra-handler < 0
-        - lrucache < 0
         - lucid-extras < 0
         - mapquest-api < 0
         - marvin-interpolate < 0
@@ -4180,7 +4174,6 @@ packages:
         - telegram-bot-simple < 0
         - termbox < 0
         - termonad < 0
-        - texmath < 0
         - text-builder < 0
         - text-ldap < 0
         - text-show < 0

From cddf11076c080dcebaad45582613400c30dff449 Mon Sep 17 00:00:00 2001
From: Dave Tapley <dukedave@gmail.com>
Date: Tue, 6 Nov 2018 13:26:43 -0700
Subject: [PATCH 64/92] Add inline-c-cpp back.

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 09448a47..13836440 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2386,6 +2386,9 @@ packages:
         - pthread < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build
         - rank1dynamic
 
+    "Dave Tapley <dukedave@gmail.com> @dukedave":
+        - inline-c-cpp
+
     "Takahiro Himura <himuratk421@gmail.com> @himura":
         - lens-regex
         # haskell-src-exts via derive

From 5acf7111c50b168527fff5aa0436c1621362da4e Mon Sep 17 00:00:00 2001
From: John Ky <newhoggy@gmail.com>
Date: Wed, 7 Nov 2018 08:20:43 +1100
Subject: [PATCH 65/92] Add new package hw-streams

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 13836440..b2022f8c 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2729,6 +2729,7 @@ packages:
         - hw-rankselect
         - hw-rankselect-base
         - hw-succinct
+        - hw-streams
         - hw-xml < 0 # Build failure haskell-works/hw-xml#28
         - pure-zlib
         - antiope-athena

From 45b6ed8ddc9ccc0a4fa6b80d1719c35c9aa35e43 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Wed, 7 Nov 2018 18:56:57 +0900
Subject: [PATCH 66/92] enable cheapskate and pandoc

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index b2022f8c..6362d8e3 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -527,7 +527,7 @@ packages:
         - psqueues
         - websockets
         - websockets-snap
-        - hakyll < 0 # via pandoc
+        # - hakyll # containers-0.6
 
     "Sibi Prabakaran <sibi@psibi.in> @psibi":
         - download
@@ -2249,7 +2249,7 @@ packages:
         - locators
 
     "Sean Hunt <scshunt@csclub.uwaterloo.ca @scshunt":
-        - cheapskate < 0 # containers
+        - cheapskate
 
     "Ivan Miljenovic <Ivan.Miljenovic@gmail.com> @ivan-m":
         - fgl
@@ -2612,8 +2612,8 @@ packages:
         - pandoc-types < 1.19 || > 1.19 # Accidental upload, see: https://github.com/fpco/stackage/issues/2223
         - zip-archive
         - doctemplates
-        - pandoc < 0 # via cheapskate
-        - pandoc-citeproc < 0 # via pandoc
+        - pandoc
+        - pandoc-citeproc
 
     "Karun Ramakrishnan <karun012@gmail.com> @karun012":
         - doctest-discover
@@ -3797,8 +3797,6 @@ packages:
         - cairo < 0
         - cayley-client < 0
         - chatwork < 0
-        - cheapskate-highlight < 0
-        - cheapskate-lucid < 0
         - check-email < 0
         - cipher-aes128 < 0
         - cipher-blowfish < 0

From f94936afc69c67840137639979d1d548f90761b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20B=C3=A4renz?= <programming@manuelbaerenz.de>
Date: Wed, 7 Nov 2018 18:21:25 +0100
Subject: [PATCH 67/92] Reenable dunai

Dunai has released version 0.5.1 which is compatible with current stackage
---
 build-constraints.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 6362d8e3..845a3248 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -4243,7 +4243,6 @@ packages:
         - df1 < 0
         - di-handle < 0
         - dimensional < 0
-        - dunai < 0
         - exinst < 0
         - extensible < 0
         - fgl < 0

From 3ef774cb7fbc3a68c520163cfa135dd1b0c5f235 Mon Sep 17 00:00:00 2001
From: Joe Kachmar <joseph.kachmar@gmail.com>
Date: Thu, 8 Nov 2018 03:44:16 +0000
Subject: [PATCH 68/92] Skip modular haddocks #4104

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index dd493b33..2b2fcf41 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -4951,6 +4951,7 @@ expected-haddock-failures:
 skipped-haddocks:
 - approximate
 - invertible
+- modular # https://github.com/haskell/haddock/issues/900
 - sparkle # Java function failures tweag/sparkle#144
 # end of skipped-haddocks
 

From 118a53fa23ce3f32250df8fcd3d550d740229876 Mon Sep 17 00:00:00 2001
From: Alexandr Ruchkin <voidex@live.com>
Date: Thu, 8 Nov 2018 11:38:40 +0300
Subject: [PATCH 69/92] Enabled hsdev with docs disabled

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 2b2fcf41..fdf45bbf 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1249,6 +1249,7 @@ packages:
         - simple-log
         - text-region
         - haskell-names
+        - hsdev
 
     "Aleksey Kliger <aleksey@lambdageek.org> @lambdageek":
         - unbound-generics
@@ -4428,6 +4429,9 @@ package-flags:
     windns:
         allow-non-windows: true
 
+    hsdev:
+        docs: false
+
 # end of package-flags
 
 # Special configure options for individual packages

From 22ee3fe108747ea7abf902b4d5d8cab7e588d19a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Thu, 8 Nov 2018 16:16:06 +0100
Subject: [PATCH 70/92] Add shared-memory

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 2b2fcf41..8b0dd0c9 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2152,6 +2152,7 @@ packages:
         - netpbm
         - network-house
         - reinterpret-cast
+        - shared-memory
         - posix-paths < 0 # GHC 8.4 via base-4.11.0.0
         # As dependencies of packages above
         - attoparsec-binary

From a235b1ce6585fc13a3c6c528862635ae671bbdd5 Mon Sep 17 00:00:00 2001
From: mrkkrp <markkarpov92@gmail.com>
Date: Thu, 8 Nov 2018 22:17:50 +0700
Subject: [PATCH 71/92] Re-enable my (Mark Karpov's) packages

All the packages should work with GHC 8.6.2 now, let's try to re-enable
them.
---
 build-constraints.yaml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 2b2fcf41..ad6ef64e 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3739,7 +3739,6 @@ packages:
         - HaskellNet < 0
         - HaskellNet-SSL < 0
         - IPv6DB < 0
-        - JuicyPixels-extra < 0
         - JuicyPixels-scale-dct < 0
         - LambdaHack < 0
         - Network-NineP < 0
@@ -3871,8 +3870,6 @@ packages:
         - file-modules < 0
         - filecache < 0
         - find-clumpiness < 0
-        - flac < 0
-        - flac-picture < 0
         - flow < 0
         - fold-debounce-conduit < 0
         - friday < 0
@@ -3883,7 +3880,6 @@ packages:
         - generic-xmlpickler < 0
         - generics-eot < 0
         - ghc-parser < 0
-        - ghc-syntax-highlighter < 0
         - ghcjs-base-stub < 0
         - gi-gtk-hs < 0
         - gio < 0
@@ -3966,7 +3962,6 @@ packages:
         - hxt-pickle-utils < 0
         - hyperloglog < 0
         - hyraxAbif < 0
-        - identicon < 0
         - ihaskell < 0
         - ihaskell-hvega < 0
         - incremental-parser < 0
@@ -4003,7 +3998,6 @@ packages:
         - lackey < 0
         - lambdabot-core < 0
         - lambdabot-irc-plugins < 0
-        - lame < 0
         - language-c-quote < 0
         - language-puppet < 0
         - learn-physics < 0
@@ -4029,10 +4023,6 @@ packages:
         - mime-mail-ses < 0
         - minio-hs < 0
         - miso < 0
-        - mmark < 0
-        - mmark-cli < 0
-        - mmark-ext < 0
-        - modern-uri < 0
         - moesocks < 0
         - monad-metrics < 0
         - mongoDB < 0
@@ -4107,8 +4097,6 @@ packages:
         - rebase < 0
         - ref-fd < 0
         - registry < 0
-        - req < 0
-        - req-conduit < 0
         - req-url-extra < 0
         - require < 0
         - rerebase < 0
@@ -4216,7 +4204,6 @@ packages:
         - wai-slack-middleware < 0
         - wai-transformers < 0
         - warp-tls-uid < 0
-        - wave < 0
         - web-plugins < 0
         - webdriver < 0
         - webex-teams-api < 0
@@ -4991,7 +4978,6 @@ skipped-benchmarks:
     - binary-tagged
     - Earley
     - IntervalMap
-    - JuicyPixels-extra
     - ad
     - attoparsec
     - backprop

From 90787446c8daf3b52d6f3879278f38db91ac9efc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 8 Nov 2018 15:20:42 +0000
Subject: [PATCH 72/92] readd here, versions and protolude

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 2b2fcf41..1d9453e8 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3934,7 +3934,6 @@ packages:
         - hasql-pool < 0
         - hasql-transaction < 0
         - hedis < 0
-        - here < 0
         - herms < 0
         - heterocephalus < 0
         - hgrev < 0
@@ -4094,7 +4093,6 @@ packages:
         - prometheus < 0
         - protocol-radius < 0
         - protocol-radius-test < 0
-        - protolude < 0
         - publicsuffix < 0
         - qm-interpolated-string < 0
         - qnap-decrypt < 0
@@ -4205,7 +4203,6 @@ packages:
         - vector-sized < 0
         - vector-space < 0
         - vectortiles < 0
-        - versions < 0
         - wai-cli < 0
         - wai-middleware-caching-lru < 0
         - wai-middleware-consul < 0

From c98dfbd7d4946a845624d709eb0cee1c5f112d67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20B=C3=A4renz?= <programming@manuelbaerenz.de>
Date: Thu, 8 Nov 2018 17:01:22 +0100
Subject: [PATCH 73/92] Reenable indexed-list-literals

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 2b2fcf41..242d30f3 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3972,7 +3972,6 @@ packages:
         - incremental-parser < 0
         - indentation-core < 0
         - indentation-parsec < 0
-        - indexed-list-literals < 0
         - influxdb < 0
         - inline-java < 0
         - inliterate < 0

From 64e0327627a3ffe96f7ff16bc11984a85b281d11 Mon Sep 17 00:00:00 2001
From: Dan Burton <danburton.email@gmail.com>
Date: Thu, 8 Nov 2018 12:08:23 -0500
Subject: [PATCH 74/92] Restore authenticate-oauth and RSA

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 2b2fcf41..f1fe9479 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3744,7 +3744,6 @@ packages:
         - LambdaHack < 0
         - Network-NineP < 0
         - QuasiText < 0
-        - RSA < 0
         - RefSerialize < 0
         - SCalendar < 0
         - ShellCheck < 0
@@ -3769,7 +3768,6 @@ packages:
         - asif < 0
         - async-pool < 0
         - atom-conduit < 0
-        - authenticate-oauth < 0
         - autoexporter < 0
         - avwx < 0
         - axel < 0
@@ -4496,6 +4494,7 @@ skipped-tests:
     # These can periodically be checked for updates;
     # just remove these lines and run `stackage-curator check' to verify.
     - Cabal # GHC 8.4 via base-orphans-0.7, base-orphans-0.7
+    - RSA # DRBG-0.5.5 via cipher-aes128-0.7.0.3 via Cabal-2.4
     - aeson # QuickCheck-2.11.3, base-orphans-0.7, hashable-time
     - attoparsec # QuickCheck-2.11.3
     - barrier # tasty 0.12 and tasty-hunit 0.10

From 26a9109a799d0de5452567e9c121caf530c10050 Mon Sep 17 00:00:00 2001
From: Alexandre Peyroux <alex@px.io>
Date: Thu, 8 Nov 2018 22:47:40 +0100
Subject: [PATCH 75/92] add google-isbn

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 2b2fcf41..c6787aa4 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3461,6 +3461,7 @@ packages:
 
     "Alexandre Peyroux <alex@px.io> @apeyroux":
         - HSlippyMap
+        - google-isbn
         - nuxeo
 
     "Andrey Sverdlichenko <blaze@ruddy.ru> @rblaze":

From a2f4cf03b099c0f0fd913ae83cb6c91e7fb3ed69 Mon Sep 17 00:00:00 2001
From: Jonas Carpay <jonascarpay@gmail.com>
Date: Fri, 9 Nov 2018 07:35:20 +0100
Subject: [PATCH 76/92] add apecs-physics

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 2b2fcf41..26b313a5 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2232,6 +2232,7 @@ packages:
 
     "Jonas Carpay <jonascarpay@gmail.com> @jonascarpay":
         - apecs
+        - apecs-physics
 
     "Spencer Janssen <spencerjanssen@gmail.com> @spencerjanssen":
         - Xauth

From 6911a3af02bec74cab128fad599fa9648409d08a Mon Sep 17 00:00:00 2001
From: Stephen Diehl <stephen.m.diehl@gmail.com>
Date: Fri, 9 Nov 2018 11:26:34 +0000
Subject: [PATCH 77/92] Added aos-signature, bulletproofs, merkle-tree,
 pedersen-commitment

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 2b2fcf41..63893d47 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2755,6 +2755,11 @@ packages:
         - protolude
         - repline
         - picosat
+        - picologic
+        - aos-signature
+        - bulletproofs
+        - pedersen-commitment
+        - merkle-tree
 
     "Daishi Nakajima <nakaji.dayo@gmail.com> @nakaji-dayo":
         - api-field-json-th

From 85987ffb27655888bf8d0a9893d053c9a67c0ef3 Mon Sep 17 00:00:00 2001
From: Stephen Diehl <stephen.m.diehl@gmail.com>
Date: Fri, 9 Nov 2018 11:39:00 +0000
Subject: [PATCH 78/92] Remove picologic

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 63893d47..c1255036 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2755,7 +2755,6 @@ packages:
         - protolude
         - repline
         - picosat
-        - picologic
         - aos-signature
         - bulletproofs
         - pedersen-commitment

From 5689a1db986e2ab24e029115e28390903bb1d45f Mon Sep 17 00:00:00 2001
From: Joe Kachmar <joseph.kachmar@symbiont.io>
Date: Fri, 9 Nov 2018 21:54:34 -0500
Subject: [PATCH 79/92] Removes aos-signature commercialhaskell/stackage#4119

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 4b799c74..2d3eb35f 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2758,7 +2758,7 @@ packages:
         - protolude
         - repline
         - picosat
-        - aos-signature
+        - aos-signature < 0 # Build failure commercialhaskell/stackage#4119
         - bulletproofs
         - pedersen-commitment
         - merkle-tree

From 6c2bec85ff0b2a2203d62cf0baf3fee5dbd2ba49 Mon Sep 17 00:00:00 2001
From: Joe Kachmar <joseph.kachmar@symbiont.io>
Date: Fri, 9 Nov 2018 22:07:30 -0500
Subject: [PATCH 80/92] Removes bulletproofs commercialhaskell/stackage#4119

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 2d3eb35f..7420a406 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2758,8 +2758,8 @@ packages:
         - protolude
         - repline
         - picosat
-        - aos-signature < 0 # Build failure commercialhaskell/stackage#4119
-        - bulletproofs
+        - aos-signature < 0 # Test suite build failure commercialhaskell/stackage#4119
+        - bulletproofs < 0 # Test suite build failure commercialhaskell/stackage#4119
         - pedersen-commitment
         - merkle-tree
 

From 22a8caefb1ef23a6869ad0340a86c2ee51e6dd97 Mon Sep 17 00:00:00 2001
From: Joe Kachmar <joseph.kachmar@symbiont.io>
Date: Fri, 9 Nov 2018 22:07:49 -0500
Subject: [PATCH 81/92] Removes cuckoo-filter adinapoli/cuckoofilter#1

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 7420a406..5f48190e 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3566,7 +3566,7 @@ packages:
 
     "Chris Coffey <chris@foldl.io> @ChrisCoffey":
         - servant-tracing
-        - cuckoo-filter
+        - cuckoo-filter < 0 # adinapoli/cuckoofilter#1
         - confcrypt
 
     "Rick Owens <rick@owensmurray.com> @owensmurray":

From 7e4744be13dce3b67fa08ec1d42d356f21e6ab77 Mon Sep 17 00:00:00 2001
From: Joe Kachmar <joseph.kachmar@symbiont.io>
Date: Fri, 9 Nov 2018 22:11:09 -0500
Subject: [PATCH 82/92] Removes wave mrkkrp/wave#9

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 5f48190e..27c17abf 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2340,7 +2340,7 @@ packages:
         - req
         - req-conduit
         - cue-sheet
-        - wave
+        - wave < 0 # mrkkrp/wave#9
         - flac
         - flac-picture
         - lame

From 86cbfc2366bfcb5b16bdab4865950f0f19f8588b Mon Sep 17 00:00:00 2001
From: Joe Kachmar <joseph.kachmar@symbiont.io>
Date: Fri, 9 Nov 2018 22:16:32 -0500
Subject: [PATCH 83/92] Removes dependents on wave mrkkrp/wave#9

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 27c17abf..ab0964d5 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2341,9 +2341,9 @@ packages:
         - req-conduit
         - cue-sheet
         - wave < 0 # mrkkrp/wave#9
-        - flac
-        - flac-picture
-        - lame
+        - flac < 0 # depends on wave
+        - flac-picture < 0 # depends on flac
+        - lame < 0 # depends on wave
         - path
         - forma
         - stache

From bff86dffa2543f8fdcc0c1e2d01613b7cdc8cba4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 Nov 2018 08:33:46 +0100
Subject: [PATCH 84/92] json-autotype builds fine with lens-4.17 these days.

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index ab0964d5..03e82877 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -927,7 +927,7 @@ packages:
     "Michal J. Gajda <maintainer@migamake.com> @mgajda":
         - iterable
         - FenwickTree
-        - json-autotype < 0 # via lens-4.17
+        - json-autotype
 
     "Dom De Re <domdere@domdere.com> @domdere":
         - cassava-conduit

From 0a469b0c0bcfbe0ee5022f3f64cac18475b5d09c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 Nov 2018 08:34:08 +0100
Subject: [PATCH 85/92] cosmetic: strip trailing white space

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 03e82877..53085df3 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3669,7 +3669,7 @@ packages:
 
     "Nikos Karagianndis <nkarag@gmail.com> @nkarag":
         - DBFunctor
-        
+
     "Marat Khafizov <xafizoff@gmail.com> @xafizoff":
         - n2o
         #- n2o-nitro

From 8c371c85f49da5f70ffaf8c19e9b12efe4f48907 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 Nov 2018 09:14:08 +0100
Subject: [PATCH 86/92] current versions of lambdabot compile with ghc-8.6.x

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index ab0964d5..b53f952d 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -4000,8 +4000,6 @@ packages:
         - koofr-client < 0
         - kraken < 0
         - lackey < 0
-        - lambdabot-core < 0
-        - lambdabot-irc-plugins < 0
         - language-c-quote < 0
         - language-puppet < 0
         - learn-physics < 0

From 6c910cb777895d294f3ea02fa9d1a10435f6e582 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 Nov 2018 09:15:25 +0100
Subject: [PATCH 87/92] current versions of cabal2nix compile with ghc-8.6.x

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index ab0964d5..1e23806c 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3798,7 +3798,6 @@ packages:
         - bson-lens < 0
         - bugsnag-haskell < 0
         - cabal-install < 0
-        - cabal2nix < 0
         - cachix < 0
         - cachix-api < 0
         - cairo < 0

From 7b8d7287179cd4934c2daa7a6f030112ab97b669 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Sat, 10 Nov 2018 23:40:38 +0900
Subject: [PATCH 88/92] enable cabal-install (#5639)

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index ab0964d5..ffd6f628 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3797,7 +3797,6 @@ packages:
         - bson < 0
         - bson-lens < 0
         - bugsnag-haskell < 0
-        - cabal-install < 0
         - cabal2nix < 0
         - cachix < 0
         - cachix-api < 0

From 232f92b874b9dd5262b43895ba0be94623559523 Mon Sep 17 00:00:00 2001
From: Jonas Carpay <jonascarpay@gmail.com>
Date: Sat, 10 Nov 2018 20:04:11 +0100
Subject: [PATCH 89/92] Add apecs-physics-gloss

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index ffd6f628..c2b5bd93 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2235,6 +2235,7 @@ packages:
     "Jonas Carpay <jonascarpay@gmail.com> @jonascarpay":
         - apecs
         - apecs-physics
+        - apecs-physics-gloss
 
     "Spencer Janssen <spencerjanssen@gmail.com> @spencerjanssen":
         - Xauth

From bc1fa97aa4f035289f9528b7c1acf0d7bf5c4061 Mon Sep 17 00:00:00 2001
From: Joe Kachmar <joseph.kachmar@symbiont.io>
Date: Sun, 11 Nov 2018 01:22:44 -0500
Subject: [PATCH 90/92] Re-enables aos-signature, bulletproofs #4119

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 213c356d..bc4878ed 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2759,8 +2759,8 @@ packages:
         - protolude
         - repline
         - picosat
-        - aos-signature < 0 # Test suite build failure commercialhaskell/stackage#4119
-        - bulletproofs < 0 # Test suite build failure commercialhaskell/stackage#4119
+        - aos-signature
+        - bulletproofs
         - pedersen-commitment
         - merkle-tree
 

From d1461666d42b1d82a8e704bc57706ffa4ad40bfd Mon Sep 17 00:00:00 2001
From: Joe Kachmar <joseph.kachmar@symbiont.io>
Date: Sun, 11 Nov 2018 01:35:34 -0500
Subject: [PATCH 91/92] Disables bulletproofs (not published yet)

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

diff --git a/build-constraints.yaml b/build-constraints.yaml
index bc4878ed..82447ac9 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2760,7 +2760,7 @@ packages:
         - repline
         - picosat
         - aos-signature
-        - bulletproofs
+        - bulletproofs < 0 # not published to Hackage yet (11 Nov. 18)
         - pedersen-commitment
         - merkle-tree
 

From 2d1c18dd260f0d8ef949237ee13218411b90ed99 Mon Sep 17 00:00:00 2001
From: Joe Kachmar <joseph.kachmar@symbiont.io>
Date: Sun, 11 Nov 2018 19:25:35 -0500
Subject: [PATCH 92/92] Bumps nightly GHC to 8.6.2

---
 Dockerfile          | 2 +-
 check               | 2 +-
 debian-bootstrap.sh | 2 +-
 etc/ci-script.sh    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cf8c7ccc..84815261 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ ENV HOME /home/stackage
 ENV LANG en_US.UTF-8
 
 # NOTE: also update debian-bootstrap.sh when cuda version changes
-ENV PATH /usr/local/cuda-10.0/bin:/opt/ghc/8.6.1/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ENV PATH /usr/local/cuda-10.0/bin:/opt/ghc/8.6.2/bin:/usr/sbin:/usr/bin:/sbin:/bin
 ENV CUDA_PATH /usr/local/cuda-10.0
 ENV LD_LIBRARY_PATH=/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/nvvm/lib64
 
diff --git a/check b/check
index 7c0440a4..f4aa4ca2 100755
--- a/check
+++ b/check
@@ -3,4 +3,4 @@
 # Convenience script for checking constraints locally
 
 cd `dirname $0`
-exec stack exec --resolver ghc-8.6.1 stackage-curator check
+exec stack exec --resolver ghc-8.6.2 stackage-curator check
diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh
index 322a6a43..eed169cf 100755
--- a/debian-bootstrap.sh
+++ b/debian-bootstrap.sh
@@ -25,7 +25,7 @@ add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://down
 add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy-apache24-compat main'
 add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main'
 
-GHCVER=8.6.1
+GHCVER=8.6.2
 
 apt-get update
 apt-get install -y \
diff --git a/etc/ci-script.sh b/etc/ci-script.sh
index 27c860e0..4b4e39fb 100755
--- a/etc/ci-script.sh
+++ b/etc/ci-script.sh
@@ -2,7 +2,7 @@
 
 set -euxo pipefail
 
-export GHCVER=8.6.1
+export GHCVER=8.6.2
 
 # Download and unpack the stack executable
 mkdir -p ~/.local/bin