diff --git a/CURATORS.md b/CURATORS.md
index b27f0503..909e2ed1 100644
--- a/CURATORS.md
+++ b/CURATORS.md
@@ -1,7 +1,7 @@
 This is a collection of instructions covering the processes that the Stackage curators - the
 guys who maintain the Stackage project itself - should be doing on a regular basis.
 Originally this was handled largely by Michael Snoyman,
-but now we are a team of 4 people handling requests weekly in rotation.
+but now we are a team of 5 people handling requests weekly in rotation.
 Curation activities are mostly automated, and do not take up a significant amount of time.
 
 ## Workflow overview
@@ -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—or lack thereof—of Docker's
+approach separately.)
+
 ## stackage-build server
 
 You'll need to get your SSH public key added to the machine. ~/.ssh/config info:
@@ -275,8 +295,9 @@ 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. This is the default for
-LTS builds.
+condition, or manually tweaking the plan file.
+
+Note LTS builds inherit the current Hackage data (stack updated for Nigthly) to avoid excess extra rebuilding.
 
 ### Timing
 
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 4ad692a9..b5f2ea64 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -2,7 +2,7 @@ This project is built around the concept of maintainers taking responsibility fo
 
 The idea behind Stackage is that, if all packages work with the newest versions of dependencies, we avoid dependency hell. Specifically, we aim for:
 
-* All packages are buildable and testable from Hackage. We recommend [the Stack Travis script](http://docs.haskellstack.org/en/stable/GUIDE.html#travis-with-caching), which ensures a package is not accidentally incomplete.
+* All packages are buildable and testable from Hackage. We recommend [the Stack Travis script](https://docs.haskellstack.org/en/stable/travis_ci/), which ensures a package is not accidentally incomplete.
 * All packages are compatible with the newest versions of all dependencies (You can find restrictive upper bounds by visiting http://packdeps.haskellers.com/feed?needle=PACKAGENAME).
 * All packages in a snapshot are compatible with the versions of libraries that ship with the GHC used in the snapshot ([more information on lenient lower bounds](https://www.fpcomplete.com/blog/2014/05/lenient-lower-bounds)).
 
@@ -21,6 +21,8 @@ To add a set of packages, you would add:
         - package2
         - package3
 
+Note that the `master` branch is used for Stackage Nightly (not the `nightly` branch, which is used for the nightly docker builder imagine).
+
 After doing that, send a pull request (with a commit message like "add foo-bar"). We do not require new submissions to be tested against the rest of Stackage before the pull request (though it is a good idea to do so if you can with `stack --resolver nightly exec stackage-curator check` and `stack --resolver nightly build`), provided you meet the dependency version requirements above. If your library depends on a C library, add a note to your pull request with the Ubuntu library name, or even better edit the `debian-bootstrap.sh` script directly
 
 If you want to make sure that the package builds against the newest versions of all dependecies you can do this:
@@ -103,10 +105,11 @@ following the above steps, you can get your package into the next major LTS
 Haskell release.
 
 If you would like to get your package added to an existing LTS Haskell major
-release (e.g., if `lts-3.21` is out, you would want your package to appear in
-`lts-3.22`), please do the following in addition to the steps above:
+release (e.g., if `lts-8.9` is out, you would want your package to appear in
+`lts-8.10`), please do the following in addition to the steps above:
 
 * Open up a new issue on the [lts-haskell repo](https://github.com/fpco/lts-haskell/issues/new)
-* Specify the LTS major version you would like your package to go into (e.g., lts-3)
+* Specify the LTS major version you would like your package to go into (e.g., lts-8)
 * Provide a list of packages you would like added, and if relevant, any upper bounds on those packages
-* Be patient! The LTS releases are by their nature more conservative than nightly, and therefore adding new packages is a more manual process. The Stackage curators will try to get to your issue quickly, but there may be some delay.
+* Be patient! The LTS releases are less frequent than Nightly and by their nature more conservative, and therefore adding new packages is a more manual process. The Stackage curators will try to get to your issue as soon as possible, but it may take some time.
+* To add a package to more than one LTS version please file separate tickets for each major LTS release, since they will typically be built and added at different times.
diff --git a/README.md b/README.md
index f0cfbef1..a3d768b4 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Add your package
 We welcome all packages, provided:
 
 * The package author/maintainer agrees to the [maintainers agreement](https://github.com/fpco/stackage/blob/master/MAINTAINERS.md).
-* The package is buildable and testable from Hackage. We recommend [the Stack Travis script](http://docs.haskellstack.org/en/stable/GUIDE.html#travis-with-caching), which ensures a package is not accidentally incomplete.
+* The package is buildable and testable from Hackage. We recommend [the Stack Travis script](https://docs.haskellstack.org/en/stable/travis_ci/), which ensures a package is not accidentally incomplete.
 * The package is compatible with the newest versions of all dependencies (You can find restrictive upper bounds by visiting http://packdeps.haskellers.com/feed?needle=PACKAGENAME).
 * The package is compatible with the versions of libraries that ship with GHC ([more information on lenient lower bounds](https://www.fpcomplete.com/blog/2014/05/lenient-lower-bounds)).
 
@@ -123,3 +123,7 @@ That said, we do maintain the capability to keep multiple LTS runs
 operational in parallel, and with LTS 6 and 7 in fact did so. We
 aren't changing our guarantees yet on longevity of a release, but are
 trying to push out the bounds a bit farther.
+
+__What time are Stackage snapshots published?__
+
+Stackage Nightly and LTS are not released at a fixed time of day, they get pushed to stackage.org (and the metadata to the stackage-nightly and stackage-lts github repos) when their builds finish on the Stackage build server and the latest built haddocks have been synced over. This time varies greatly depending on build times for package updates, bounds breakage, problems with new packages being added and other build issues, etc. There are days when a release does not happen. LTS releases tend to happen over the weekend or early in the week.
diff --git a/automated/build.sh b/automated/build.sh
index c5e78640..9e2a6566 100755
--- a/automated/build.sh
+++ b/automated/build.sh
@@ -138,4 +138,5 @@ docker run $ARGS_UPLOAD $IMAGE /bin/bash -c "exec stackage-curator check-target-
 # * Register as a new Hackage distro
 docker run $ARGS_UPLOAD $IMAGE /bin/bash -c "stackage-curator upload-docs --target $TARGET --bundle-file $BUNDLE_FILE && stackage-curator upload-index --plan-file $PLAN_FILE --target $TARGET && stackage-curator upload-github --plan-file $PLAN_FILE --docmap-file $DOCMAP_FILE --target $TARGET && exec stackage-curator hackage-distro --plan-file $PLAN_FILE --target $TARGET"
 
+echo -n "Completed at "
 date
diff --git a/become-a-curator.md b/become-a-curator.md
new file mode 100644
index 00000000..80559efc
--- /dev/null
+++ b/become-a-curator.md
@@ -0,0 +1,44 @@
+## 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
+publishing the widely used nightly and LTS snapshots: Collections of
+packages that are guaranteed to play well together. All curators are
+volunteers.
+
+This is a great opportunity to contribute to the haskell community and get
+familiar with the tools of the trade! You will also be in regular
+contact with experienced community members.
+
+We don't have any prerequisites, but familiarity with any of Haskell,
+Cabal, Stack, Linux, Git, and Docker is a plus.
+
+We work in shifts of one week, which means you will be on duty every
+6th week. Our suggestion is to pair you up with another curator to
+help out in the beginning.
+
+The workload is usually about 30 minutes per day, whenever you have
+time. The work consists of keeping the builds running on the build
+server, filing issues for packages needing updates when new releases
+occur, and closing resolved issues. The LTS snapshots are prepared
+once a week. All communication with package maintainers happen on
+github.
+
+We also have a curator slack channel where we help each other out.
+
+The current curator team consists of:
+* Adam Bergmark
+* Dan Burton
+* Jens Petersen
+* Luke Murphy
+* Michael Snoyman
+
+We onboarded Luke as the newest member a few months ago and this
+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: [REDACTED]
+
+If you applied last time, we encourage you to do so again!
diff --git a/build-constraints.yaml b/build-constraints.yaml
index d7d625c0..29d01f93 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1,6 +1,103 @@
 ghc-major-version: "8.0"
 # Constraints for brand new builds
 packages:
+    "Pasqualino Assini <tittoassini@gmail.com> @tittoassini":
+        - zm
+        - flat
+        - model
+
+    "Timo Koepke <timo.koepke@gmail.com> @koepket":
+        - hinterface
+
+    "Jose Iborra <pepeiborra@gmail.com> @pepeiborra":
+        - clr-marshal
+        - clr-host
+        - threepenny-editors
+        - clr-inline  # possibly nondeterministic failures, see https://github.com/fpco/stackage/issues/2510
+
+    "Joshua Koike <jkoike2013@gmail.com> @jano017":
+        - discord-hs
+
+    "Roman Gonzalez <romanandreg@gmail.com @roman":
+        - etc
+
+    "Richard Cook <rcook@rcook.org> @rcook":
+        - hidden-char
+
+    "Vanessa McHale <tmchale@wisc.edu> @vmchale": []
+        # - tibetan-utils # bounds: text-show
+
+    "Henning Thielemann <stackage@henning-thielemann.de> @thielema":
+        # - accelerate-arithmetic # via accelerate: bounds: base
+        # - accelerate-fftw # via accelerate: bounds: base
+        # - accelerate-fourier # via accelerate: bounds: base
+        # - accelerate-utility # via accelerate: bounds: base
+        - apportionment
+        - audacity
+        - bibtex
+        - board-games
+        - buffer-pipe
+        - calendar-recycling
+        - comfort-graph
+        - concurrent-split
+        - cutter
+        - data-accessor
+        - data-accessor-mtl
+        - data-accessor-template
+        - data-accessor-transformers
+        - data-ref
+        - dsp
+        - enumset
+        - equal-files
+        - event-list
+        - explicit-exception
+        - fixed-length
+        - gnuplot
+        - group-by-date
+        - iff
+        - interpolation
+        - latex
+        - lazyio
+        - markov-chain
+        - midi
+        - midi-music-box
+        - mbox-utility
+        - non-empty
+        - non-negative
+        - numeric-prelude
+        - pathtype
+        - pooled-io
+        - probability
+        - sample-frame
+        - sample-frame-np
+        - set-cover
+        - sound-collage
+        - sox
+        - split-record
+        - spreadsheet
+        - stm-split
+        - storable-record
+        - storablevector
+        - synthesizer-core
+        - synthesizer-dimensional
+        - synthesizer-midi
+        - tagchup
+        - tfp
+        - unicode
+        - unsafe
+        - utility-ht
+        - xml-basic
+        - youtube
+        - prelude-compat
+
+        - fft
+        - carray
+        # Not a maintainer
+        - ix-shapable
+
+    "Jeremy Barisch-Rooney <barischj@tcd.ie> @barischj":
+       - threepenny-gui-flexbox
+
     "Romain Edelmann <romain.edelmann@gmail.com> @redelmann":
         - distribution
 
@@ -11,13 +108,16 @@ packages:
         - ramus
 
     "Simon Jakobi <simon.jakobi@gmail.com> @sjakobi":
+        - path
+        - present
         - threepenny-gui
 
     "Joe M <joe9mail@gmail.com> @joe9":
         - logger-thread
-        # - text-generic-pretty # # via ixset-typed: via safecopy: bounds: vector
+        - text-generic-pretty
 
     "Li-yao Xia <lysxia@gmail.com> @Lysxia":
+        - boltzmann-samplers
         - generic-random
 
     "Tobias Dammers <tdammers@gmail.com> @tdammers":
@@ -29,11 +129,13 @@ packages:
     "Luke Murphy <lukewm@riseup.net> @lwm":
         - tasty-discover
         - lentil
+        - packunused
 
     "Marco Zocca @ocramz":
         - sparse-linear-algebra
         - matrix-market-attoparsec
         - network-multicast
+        - xeno
 
     "Joseph Canero <jmc41493@gmail.com> @caneroj1":
         - sqlite-simple-errors
@@ -55,6 +157,7 @@ packages:
         - word24
         - mysql-haskell
         - mysql-haskell-openssl
+        - data-has
 
     "Harendra Kumar <harendra.kumar@gmail.com> @harendra-kumar":
         - unicode-transforms
@@ -92,7 +195,7 @@ packages:
         - envy
         - s3-signer
         # - google-translate # bounds: servant
-        # - hackernews # bounds: servant
+        - hackernews
         # - ses-html # bounds: time 1.6
         # - stripe-haskell # via: stripe-http-streams
         # - stripe-http-streams # via: http-streams
@@ -154,19 +257,19 @@ packages:
         - async
         - base16-bytestring
         - c2hs
-        # - cassava # bounds: vector
+        - cassava
         - csv-conduit
         - executable-hash
         - executable-path
         - foreign-store
         - formatting
-        # - gtk2hs-buildtools # via hashtables: bounds: vector
+        - gtk2hs-buildtools
         - happy
         - hybrid-vectors
         - indents
         - language-c
         - lhs2tex
-        # - persistent-mongoDB # bounds: http-api-data
+        - persistent-mongoDB
         - pretty-class
         - th-expand-syns
         - th-lift
@@ -202,7 +305,7 @@ packages:
         - timelens
         - non-empty-sequence
 
-    "Neil Mitchell @ndmitchell":
+    "Neil Mitchell <ndmitchell@gmail.com> @ndmitchell":
         - hlint
         - hoogle
         - shake
@@ -217,6 +320,7 @@ packages:
         - bake
         - ghcid
         - hexml
+        - weeder
 
     "Alan Zimmerman @alanz":
         - hjsmin
@@ -245,6 +349,14 @@ packages:
     "Sibi Prabakaran <sibi@psibi.in> @psibi":
         - download
         - textlocal
+        - shell-conduit
+        - tldr
+        - fb
+        - yesod-fb
+        - yesod-auth-fb
+        - hourglass-orphans
+        - wai-slack-middleware
+        - sysinfo
 
     "haskell-openal":
         - OpenAL
@@ -311,12 +423,11 @@ packages:
         - hostname-validate
         - ini
         - lucid
-        # - osdkeys # via libnotify: via gtk: via cairo: via gtk2hs-buildtools: via hashtables: bounds: vector
+        - osdkeys # via libnotify
         - pdfinfo
         # - present # compilation failure against haskell-src-exts
         - pure-io
         # - scrobble # compilation errors against time 1.6
-        - shell-conduit
         - sourcemap
         - hindent
         - descriptive
@@ -328,13 +439,13 @@ packages:
         # - structured-haskell-mode # bounds: haskell-src-exts # via: applicative-quoters
 
     "Alberto G. Corona <agocorona@gmail.com> @agocorona":
-        # - RefSerialize # via hashtables: bounds: vector
-        # - TCache # via hashtables: bounds: vector
-        # - Workflow # via RefSerialize: via hashtables: bounds: vector
-        # - MFlow # via RefSerialize: via hashtables: bounds: vector
+        - RefSerialize
+        - TCache
+        - Workflow
+        - MFlow
         - transient
-        # - transient-universe # via TCache: via hashtables: bounds: vector
-        # - ghcjs-hplay # via transient-universe: via TCache: via hashtables: bounds: vector
+        - transient-universe
+        - axiom
 
     "Edward Kmett <ekmett@gmail.com> @ekmett":
         - ad
@@ -369,7 +480,7 @@ packages:
         - lca
         - lens
         - linear
-        # - linear-accelerate # via accelerate: via hashtables: bounds: vector
+        - linear-accelerate
         # - log-domain # via safecopy: bounds: vector
         - machines
         - monadic-arrays
@@ -394,6 +505,7 @@ packages:
         - streams
         - tagged
         - trifecta
+        - unique
         - vector-instances
         - void
         - wl-pprint-extras
@@ -401,7 +513,7 @@ packages:
         - zippers
         - fixed
         - half
-        # - gl BLOCKED directory 1.3
+        - gl
         - lens-aeson
         - zlib-lens
         # - hyperloglog # bounds: approximate, binary, comonad
@@ -433,10 +545,10 @@ packages:
         - diagrams
         - diagrams-builder
         # - diagrams-haddock # BLOCKED directory 1.3 via cautious-file
-        # - diagrams-cairo # bounds: vector
+        - diagrams-cairo # bounds: vector
         - diagrams-contrib
         - diagrams-core
-        # - diagrams-gtk # via diagrams-cairo: bounds: vector
+        - diagrams-gtk
         - diagrams-lib
         - diagrams-postscript
         - diagrams-rasterific
@@ -488,8 +600,7 @@ packages:
         - ChannelT
 
     "Trevor L. McDonell <tmcdonell@cse.unsw.edu.au> @tmcdonell":
-        []
-        # - accelerate # via hashtables: bounds: vector
+        - accelerate
 
     "Liam O'Connor <liamoc@cse.unsw.edu.au> @liamoc":
         []
@@ -540,6 +651,7 @@ packages:
         - turtle
         - foldl
         - morte
+        - bench
 
     "Andrew Thaddeus Martin <andrew.thaddeus@gmail.com> @andrewthad":
         - yesod-table
@@ -560,7 +672,6 @@ packages:
         - fay-text
         - fay-uri
         - feed
-        # - snaplet-fay # BLOCKED directory 1.3 via heist and snap
         - time-compat
         - through-text
 
@@ -581,12 +692,13 @@ packages:
         - messagepack
         - messagepack-rpc
 
-    # "Boris Lykah <lykahb@gmail.com> @lykahb":
-        # - groundhog # bounds: transformers
-        # - groundhog-th # via groundhog
-        # - groundhog-sqlite # via groundhog
-        # - groundhog-postgresql # bounds: transformers # via groundhog
-        # - groundhog-mysql # bounds: transformers # via: groundhog,  mysql-simple
+    "Boris Lykah <lykahb@gmail.com> @lykahb":
+        - groundhog
+        - groundhog-th
+        - groundhog-sqlite
+        - groundhog-postgresql
+        - groundhog-mysql
+        - groundhog-inspector
 
     "Janne Hellsten <jjhellst@gmail.com> @nurpax":
         - sqlite-simple
@@ -603,8 +715,7 @@ packages:
         - posix-realtime
 
     "Dom De Re <domdere@domdere.com> @domdere":
-        []
-        # - cassava-conduit # via cassava: bounds: vector
+        - cassava-conduit
 
     "Dominic Steinitz <dominic@steinitz.org> @idontgetoutmuch":
         []
@@ -671,6 +782,10 @@ packages:
         # - hopenpgp-tools # via ixset-typed: via safecopy: bounds: vector
         - opensource
 
+    "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
@@ -731,8 +846,8 @@ packages:
         - multipart
         - rest-client
         - rest-core
-        # - rest-gen # bounds: blaze-html
-        # - rest-happstack # via rest-gen: bounds: blaze-html
+        - rest-gen
+        - rest-happstack
         - rest-snap
         - rest-stringmap
         - rest-types
@@ -742,11 +857,11 @@ packages:
 
     "Simon Michael <simon@joyful.com> @simonmichael":
         - darcs
-        # - hledger # via hledger-lib: via hashtables: bounds: vector
-        # - hledger-lib # via hashtables: bounds: vector
-        # - hledger-ui # via hledger-lib: via hashtables: bounds: vector
-        # - hledger-web # via hledger-lib: via hashtables: bounds: vector
-        # - hledger-api # via hledger-lib: via hashtables: bounds: vector
+        - hledger
+        - hledger-lib
+        - hledger-ui
+        - hledger-web
+        - hledger-api
         # - shelltestrunner # bounds: Diff, HUnit
         - quickbench
         - regex-compat-tdfa
@@ -822,6 +937,8 @@ packages:
         - netwire
         - netwire-input
         - netwire-input-glfw
+        - yoga
+        - freetype2
 
     "Emanuel Borsboom <manny@fpcomplete.com> @borsboom":
         - BoundedChan
@@ -844,7 +961,7 @@ packages:
         - multimap
         - parallel-io
         - text-binary
-        # - Chart-cairo # via cairo: via gtk2hs-buildtools: via hashtables: bounds: vector
+        - Chart-cairo
         - ghc-events
         - monad-extras
         # - stack < 9.9.9 # bounds: ghc, template-haskell
@@ -859,7 +976,8 @@ packages:
         - base-prelude
         - cases
         - focus
-        # - hasql # via hashtables: bounds: vector
+        - hasql
+        - hasql-pool
         - list-t
         - mtl-prelude
         - neat-interpolation
@@ -867,6 +985,7 @@ packages:
         - postgresql-binary
         - slave-thread
         - stm-containers
+        - refined
 
     "Iustin Pop <iustin@k1024.org> @iustin":
         - prefix-units
@@ -945,12 +1064,12 @@ packages:
         - servant-blaze
         - servant-foreign
         - servant-mock
-        # - servant-cassava # via cassava: bounds: vector
+        - servant-cassava
 
     "Alexandr Ruchkin <voidex@live.com> @mvoidex":
-        # - hdocs # BLOCKED haddock-api GHC 8.0.2
+        - hdocs
         - hformat
-        # - hsdev # BLOCKED haddock-api GHC 8.0.2
+        # - hsdev # bounds: text-region-0.2.0.0
         - simple-log
         - text-region
 
@@ -978,20 +1097,22 @@ packages:
 
     "Jens Petersen <juhpetersen@gmail.com> @juhp":
         - cabal-rpm
+        - stackage-query
         # - cabal-sort # BLOCKED directory 1.3
-        - hslua
-        # - idris # bounds: safe
+        - idris
+        - libffi
         - xmonad-contrib
+        - shelly
 
-        # - cairo # via gtk2hs-buildtools: via hashtables: bounds: vector
-        # - gio # via gtk2hs-buildtools: via hashtables: bounds: vector
-        # - glib # via gtk2hs-buildtools: via hashtables: bounds: vector
-        # - gtk # via gtk2hs-buildtools: via hashtables: bounds: vector
-        # - gtk3 # via gtk2hs-buildtools: via hashtables: bounds: vector
-        # - gtksourceview3 # via gtk2hs-buildtools: via hashtables: bounds: vector
-        # - pango # via gtk2hs-buildtools: via hashtables: bounds: vector
-        # - webkitgtk3 # via gtk2hs-buildtools: via hashtables: bounds: vector
-        # - webkitgtk3-javascriptcore # via gtk2hs-buildtools: via hashtables: bounds: vector
+        - cairo
+        - gio
+        - glib
+        - gtk
+        - gtk3
+        - gtksourceview3
+        - pango
+        - webkitgtk3
+        - webkitgtk3-javascriptcore
 
         - ghcjs-codemirror
         # - ghcjs-dom # via: ghcjs-dom-jsaddle # https://github.com/fpco/stackage/issues/1569
@@ -1025,6 +1146,7 @@ packages:
         # - mole # bounds: hspec, optparse-applicative
         - publicsuffix
         - rethinkdb-client-driver
+        - snap-blaze
 
     "Alexandr Kurilin <alex@kurilin.net> @alex_kurilin":
         - bcrypt
@@ -1064,6 +1186,8 @@ packages:
         - http-link-header
         - microformats2-parser
         - hspec-expectations-pretty-diff
+        - wai-cli
+        - magicbane
 
     "Francesco Mazzoli <f@mazzo.li> @bitonic":
         - language-c-quote
@@ -1073,6 +1197,7 @@ packages:
         - getopt-generics
         - graph-wrapper
         - string-conversions
+        - hspec-checkers
 
     "Jan Stolarek <jan.stolarek@p.lodz.pl> @jstolarek":
         - tasty-program
@@ -1084,12 +1209,14 @@ packages:
         - binary-tagged
         - cabal-doctest
         - edit-distance
+        - functor-classes-compat
         - generics-sop-lens
         - github
         - insert-ordered-containers
         - integer-logarithms
         - JuicyPixels-scale-dct
         - lattices
+        - microstache
         - monad-http
         - postgresql-simple-url
         - range-set-list
@@ -1098,14 +1225,16 @@ packages:
         - servant-yaml
         - singleton-bool
         - spdx
+        - tdigest
+        - tdigest-Chart
         - these
         - time-parsers
         - 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
@@ -1119,11 +1248,6 @@ packages:
         - recursion-schemes
         - unordered-containers
 
-        - fft
-        - carray
-        - ix-shapable
-        - fft
-
         # Regex packages by Chris Kuklewicz
         - regex-base
         - regex-compat
@@ -1257,7 +1381,7 @@ packages:
         - gogol-admin-reports
         - gogol-adsense
         - gogol-adsense-host
-        #- gogol-affiliates # https://github.com/brendanhay/gogol/issues/61
+        - gogol-affiliates
         - gogol-analytics
         - gogol-android-enterprise
         - gogol-android-publisher
@@ -1274,7 +1398,7 @@ packages:
         - gogol-blogger
         - gogol-books
         - gogol-civicinfo
-        #- gogol-classroom # https://github.com/brendanhay/gogol/issues/61
+        - gogol-classroom
         - gogol-cloudmonitoring
         - gogol-cloudtrace
         - gogol-compute
@@ -1375,9 +1499,9 @@ packages:
         - hmatrix-gsl-stats
         - hsignal
         - hstatistics
-        # - plot # via cairo: via gtk2hs-buildtools: via hashtables: bounds: vector
-        # - plot-gtk # via gtk: via cairo: via gtk2hs-buildtools: via hashtables: bounds: vector
-        # - plot-gtk3 # via gtk3: via cairo: via gtk2hs-buildtools: via hashtables: bounds: vector
+        - plot
+        - plot-gtk
+        - plot-gtk3
         - vector-buffer
         # - hmatrix-repa # via repa: bounds: vector
 
@@ -1454,7 +1578,7 @@ packages:
         - elm-export
         - elm-export-persistent
         # - pipes-csv # via cassava: bounds: vector
-        # - pipes-mongodb # via mongoDB: via hashtables: bounds: vector
+        - pipes-mongodb # via mongoDB
         - servant-elm
         - skeletons
         - streaming-wai
@@ -1501,21 +1625,25 @@ packages:
         - markup
         # - nested-routes # via: HList
         - path-extra
-        # - poly-arity # via HList (sent e-mail to HList maintainer)
+        - poly-arity
         - urlpath
         - wai-transformers
         - wai-middleware-content-type
         - wai-middleware-verbs
+        - websockets-rpc
         - webpage
         - composition-extra
         - rose-trees
         - sets
         - timemap
-        - triesn
+        - tries
         - path-extra
-        # - pred-trie # via poly-arity
-        # - pred-set # via hashtables: bounds: vector
-        # - HSet # via hashtables: bounds: vector
+        - pred-trie
+        - pred-set
+        - HSet
+        - unit-constraint
+        - unfoldable-restricted
+        - quickcheck-combinators
 
     "Fumiaki Kinoshita <fumiexcel@gmail.com> @fumieval":
         - boundingboxes
@@ -1547,6 +1675,7 @@ packages:
 
     "Justin Le <justin@jle.im> @mstksg":
         - auto
+        - backprop
         - configurator-export
         - hamilton
         - prompt
@@ -1597,9 +1726,6 @@ packages:
         - fn
         # - fn-extra # via: digestive-functors
 
-    "Chris Wong <lambda.fairy@gmail.com> @lfairy":
-        - nationstates
-
     "Mathieu Boespflug <mboes@tweag.net> @mboes":
         # - ihaskell-inline-r # via: ihaskell, ihaskell-blaze
         - cassette
@@ -1652,6 +1778,7 @@ packages:
         - Spintax
         - glabrous
         - google-oauth2-jwt
+        - IPv6DB
 
     "koral koral@mailoo.org @k0ral":
         - atom-conduit
@@ -1697,6 +1824,9 @@ packages:
         - b9
         - type-spec
         - pretty-types
+        - mediabus
+        #- mediabus-fdk-aac # needs non-free libfdk-aac-dev
+        - mediabus-rtp
 
     # "Will Thompson <will@willthompson.co.uk> @wjt":
         # - bustle # build failure against haskell-src-exts https://github.com/vasylp/hgettext/issues/10
@@ -1708,7 +1838,7 @@ packages:
     "Robert Massaioli <robertmassaioli@gmail.com> @robertmassaioli":
         - range
 
-    "Index Int <vlad.z.4096@gmail.com> @int-index":
+    "Vladislav Zavialov <vlad.z.4096@gmail.com> @int-index":
         - transformers-lift
         - ether
         - union
@@ -1737,6 +1867,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
@@ -1744,6 +1875,9 @@ packages:
         # package name is haskell-neo4j-client github name is haskell-neo4j-rest-client
         - haskell-neo4j-client
 
+    "Anton Kholomiov <anton.kholomiov@gmail.com>":
+        - data-fix
+
     "Alexey Khudyakov <alexey.skladnoy@gmail.com> @Shimuuar":
         - histogram-fill
         - fixed-vector
@@ -1751,7 +1885,12 @@ packages:
         - type-level-numbers
 
     "Ryan Scott <ryan.gl.scott@gmail.com> @RyanGlScott":
+        - abstract-deque
+        - abstract-deque-tests
+        - abstract-par
+        - atomic-primops
         - base-orphans
+        - chaselev-deque
         - code-page
         - deriving-compat
         - echo
@@ -1761,6 +1900,8 @@ packages:
         - keycode
         - lift-generics
         - mintty
+        - monad-par
+        - monad-par-extras
         - mtl-compat
         - proxied
         - text-show
@@ -1796,8 +1937,7 @@ packages:
         # - ipython-kernel # GHC 8
 
     "Andrés Sicard-Ramírez <asr@eafit.edu.co> @asr":
-        []
-        # - Agda # via hashtables: bounds: vector
+        - Agda
 
     "James Cook <mokus@deepbondi.net> @mokus0":
         - dependent-sum
@@ -1810,7 +1950,7 @@ packages:
     "Timo von Holtz <tvh@tvholtz.de> @tvh":
         - ekg-wai
         - haxl-amazonka
-        # - hasql-migration # via hasql: via hashtables: bounds: vector
+        - hasql-migration
         - servant-JuicyPixels
 
     "Artyom <yom@artyom.me> @neongreen":
@@ -1848,15 +1988,15 @@ packages:
         - loop
         - netpbm
         - network-house
+        - posix-paths
         - reinterpret-cast
         # As dependencies of packages above
         - attoparsec-binary
         - storable-record
 
     "Brandon Martin <brandon@codedmart.com> @codedmart":
-        []
-        # - engine-io-wai # bounds: ghc, base
-        # - rethinkdb # bounds: vector
+        - engine-io-wai
+        - rethinkdb
 
     "Michael Walker <mike@barrucadu.co.uk> @barrucadu":
         - both
@@ -1884,6 +2024,8 @@ packages:
         - opaleye-trans
         - pretty-simple
         - read-env-var
+        - servant-checked-exceptions
+        - servant-static-th
         - xml-html-qq
         - xml-indexed-cursor
         - yahoo-finance-api
@@ -1920,12 +2062,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
@@ -1942,7 +2082,7 @@ packages:
         - smallcaps
 
     "Gregory Collins <greg@gregorycollins.net> @gregorycollins":
-        # - hashtables # bounds: vector
+        - hashtables
         - io-streams
         - openssl-streams
 
@@ -1971,7 +2111,7 @@ packages:
         - cabal2nix
         - funcmp
         - hackage-db
-        # - hledger-interest # via hledger-lib: via hashtables: bounds: vector
+        - hledger-interest
         - hopenssl
         - hsdns
         - hsemail
@@ -1983,8 +2123,7 @@ packages:
         - titlecase
 
     "Mark Fine <mark.fine@gmail.com> @markfine":
-        []
-        # - postgresql-schema # BLOCKED shelly GHC 8.0.2
+        - postgresql-schema
         # - sbp # build failure
 
     "Jinjing Wang <nfjinjing@gmail.com> @nfjinjing":
@@ -2001,6 +2140,7 @@ packages:
         # - find-clumpiness # build failure against optparse-applicative https://github.com/GregorySchwartz/find-clumpiness/issues/1
         - blosum
         # - convert-annotation # via cassava: bounds: vector
+        - rank-product
 
     "Simon Marechal <bartavelle@gmail.com> @bartavelle":
         - compactmap
@@ -2015,7 +2155,7 @@ packages:
         # - stm-firehose # bounds: http-types, stm-conduit, transformers, wai, warp
         # - hslogstash # bounds: aeson, lens, time, transformers # via: stm-firehose
 
-    "Mark Karpov <markkarpov@opmbx.org> @mrkkrp":
+    "Mark Karpov <markkarpov92@gmail.com> @mrkkrp":
         - megaparsec
         - htaglib
         - slug
@@ -2035,13 +2175,16 @@ packages:
         - wave
         - flac
         - flac-picture
+        - lame
+        - path
+        - forma
+        - stache
 
     # "Thomas Bereknyei <tomberek@gmail.com>":
         # - multiplate # bounds: transformers
 
     "Sumit Sahrawat <sumit.sahrawat.apm13@iitbhu.ac.in> @sumitsahrawat":
-        []
-        # - plot-gtk-ui # via cairo: via gtk2hs-buildtools: via hashtables: bounds: vector
+        - plot-gtk-ui
         # - calculator # bounds: ghc, base
 
     "Emmanuel Touzery <etouzery@gmail.com> @emmanueltouzery":
@@ -2087,9 +2230,9 @@ packages:
 
     "Takahiro Himura <himuratk421@gmail.com> @thimura":
         - lens-regex
-        # - twitter-conduit # bounds: http-conduit 2.2 # via: twitter-types, twitter-types-lens
-        # - twitter-types # via: derive
-        # - twitter-types-lens # via: twitter-types
+        - twitter-conduit
+        - twitter-types
+        - twitter-types-lens
 
     # "Robbin C. <robbinch33@gmail.com> robbinch":
         # - zim-parser # via: lzma
@@ -2265,6 +2408,7 @@ packages:
     "Denis Redozubov <denis.redozubov@gmail.com> @dredozubov":
         - tracy
         # - hreader-lens # bounds: hreader
+        - schematic
 
     "Yuji Yamamoto <whosekiteneverfly@gmail.com> @igrep":
         - yes-precure5-command
@@ -2341,6 +2485,8 @@ packages:
 
     "Elie Genard <elaye.github.io@gmail.com> @eliegenard":
         - turtle-options
+        - mushu
+        - hakyll-favicon
 
     # "Ruey-Lin Hsu <petercommand@gmail.com> @petercommand":
         # - MASMGen # bounds: ghc, base
@@ -2358,8 +2504,8 @@ packages:
     "Sid Kapur sidharthkapur1@gmail.com @sid-kap":
         - tuple
         - OneTuple
-        # - SVGFonts # via blaze-svg: bounds: blaze-markup
-        # - Chart-diagrams # via SVGFonts: via blaze-svg: bounds: blaze-markup
+        - SVGFonts
+        - Chart-diagrams
 
     # "Aaron Levin <aaron.levin@soundcloud.com> @aaronmblevin":
         # - haskell-kubernetes # bounds: QuickCheck, aeson, http-api-data, lens, servant, servant-client
@@ -2415,6 +2561,7 @@ packages:
         # - ghc-imported-from # bounds: process-streaming # via: ghc-mod
 
     "Fraser Tweedale <frase@frase.id.au> @frasertweedale":
+        - concise
         - jose
 
     # "Yutaka Nishimura <ytk.nishimura@gmail.com> @ynishi":
@@ -2424,6 +2571,11 @@ packages:
         - zot
         - yjtools
         - io-machine
+        - yjsvg
+        - x11-xim
+        - Imlib
+        - xturtle
+        - gluturtle
 
     "Jan Gerlinger <git@jangerlinger.de> @JanGe":
         - irc-dcc
@@ -2445,10 +2597,11 @@ packages:
     "Stephen Diehl <stephen.m.diehl@gamil.com> @sdiehl":
         - protolude
         - repline
-        # - picosat  # https://github.com/sdiehl/haskell-picosat/issues/6
+        - 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
@@ -2468,8 +2621,8 @@ packages:
         - wikicfp-scraper
         - wild-bind
         - wild-bind-x11
-        # - wild-bind-indicator # via gtk: via cairo: via gtk2hs-buildtools: via hashtables: bounds: vector
-        # - wild-bind-task-x11 # via wild-blind-indicator: via gtk: via cairo: via gtk2hs-buildtools: via hashtables: bounds: vector
+        - wild-bind-indicator
+        - wild-bind-task-x11
 
     "Cies Breijs <cies@kde.nl> @cies":
         - htoml
@@ -2478,6 +2631,13 @@ packages:
         - protobuf-simple
 
     "David Reaver <johndreaver@gmail.com> @jdreaver":
+        - eventful-core
+        - eventful-dynamodb
+        - eventful-memory
+        - eventful-postgresql
+        - eventful-sql-common
+        - eventful-sqlite
+        - eventful-test-helpers
         - oanda-rest-api
         - stratosphere
 
@@ -2554,7 +2714,7 @@ packages:
         - open-witness
 
     "Victor Denisov <denisovenator@gmail.com> @VictorDenisov":
-        # - mongoDB # via hashtables: bounds: vector
+        - mongoDB
         - bson
 
     "Alexis King <lexi.lambda@gmail.com> @lexi-lambda":
@@ -2571,6 +2731,7 @@ packages:
 
     "Michal Konecny <mikkonecny@gmail.com> @michalkonecny":
         - hmpfr
+        - mixed-types-num
 
     "Bartosz Nitka <niteria@gmail.com> @niteria":
         - haskell-packages
@@ -2606,14 +2767,18 @@ packages:
 
     "Al Zohali <zohl@fmap.me> @zohl":
         - servant-auth-cookie < 0.4.1 || > 0.4.1
+        - dictionaries
 
     "Joachim Fasting <joachifm@fastmail.fm> @joachifm":
         - libmpd
 
     "Moritz Kiefer <moritz.kiefer@purelyfunctional.org> @cocreature":
         - lrucaching
+        - llvm-hs
+        - llvm-hs-pure
 
     "Thierry Bourrillon <thierry.bourrillon@fpinsight.com> @tbourrillon":
+        - heatshrink
         - hocilib
 
     # "Matthias Herrmann <matthias.mh.herrmann@gmail.com> @2chilled":
@@ -2634,6 +2799,7 @@ packages:
         - tasty-auto
         - tasty-stats
         - colorful-monoids
+        - ihs
 
     "Taras Serduke <taras.serduke@gmail.com> @tserduke":
         - do-list
@@ -2667,7 +2833,7 @@ packages:
         - pqueue
 
     "Ryan Mulligan <ryan@ryantm.com> @ryantm":
-      - hdbc-mysql
+      - HDBC-mysql
 
     "Tony Day <tonyday567@gmail.com> @tonyday567":
         []
@@ -2693,7 +2859,8 @@ packages:
     "Mahdi Dibaiee <mdibaiee@aol.com>":
         - picedit
         - mathexpr
-        # - sibe # via Chart-cairo: via cairo: via gtk2hs-buildtools: via hashtables: bounds: vector
+        - sibe
+        - termcolor
 
     "Alexis Williams <sasinestro@gmail.com> @typedrat":
         # - stb-image-redux # bounds: vector
@@ -2701,6 +2868,7 @@ packages:
 
     "XT <e@xtendo.org> @xtendo-org":
         - rawfilepath
+
     "Konstantin Zudov <co@zudov.me> @zudov":
         - html-email-validate
 
@@ -2737,8 +2905,7 @@ packages:
         # - hip # via repa: bounds: vector
 
     "Hans-Peter Deifel <hpd@hpdeifel.de> @hpdeifel":
-        []
-        # - hledger-iadd # via hledger-lib: via hashtables: bounds: vector
+        - hledger-iadd
 
     "Roy Levien <royl@aldaron.com> @orome":
         - crypto-enigma
@@ -2763,6 +2930,7 @@ packages:
         - stack-type
 
     "Mitsutoshi Aoe <maoe@foldr.in> @maoe":
+        - sensu-run
         - viewprof
 
     "Dylan Simon <dylan-stack@dylex.net> @dylex":
@@ -2772,9 +2940,15 @@ packages:
 
     "Louis Pan <louis@pan.me> @louispan":
         - alternators
+        - arrow-extras
+        - disposable
+        - ghcjs-base-stub
         - glaze
         - glazier
         - glazier-pipes
+        - glazier-react
+        - glazier-react-widget
+        - javascript-extras
         - l10n
         - pipes-category
         - pipes-fluid
@@ -2787,8 +2961,7 @@ packages:
         - sdl2-gfx
 
     "Aditya Manthramurthy <aditya.mmy@gmail.com> @donatello":
-        []
-        # - minio-hs # tests failed https://github.com/fpco/stackage/pull/2287
+        - minio-hs
 
     "ncaq <ncaq@ncaq.net> @ncaq":
         - haskell-import-graph
@@ -2797,10 +2970,15 @@ packages:
     "Andrei Barbu <andrei@0xab.com> @abarbu":
         - nondeterminism
         - csp
+        - matplotlib
 
     "mackeyrms <librarymaintainer@mackeycorp.com> @mackeyrms":
         - tsv2csv
 
+    "Thomas Sutton <me@thomas-sutton.id.au> @thsutton":
+        - aeson-diff
+        - edit-distance-vector
+
     "Kyle Van Berendonck <kvanberendonck@gmail.com> @kvanberendonck":
         - rot13
         - dvorak
@@ -2814,6 +2992,81 @@ packages:
     "Christopher A. Gorski <cgorski@cgorski.org> @cgorski":
         - general-games
 
+    "Cristian Adrián Ontivero <cristianontivero@gmail.com> @contivero":
+        - hasmin
+        - hopfli
+
+    "Peter Trško <peter.trsko@gmail.com> @trskop":
+        - between
+        - connection-pool
+        - freer-effects
+        - verbosity
+
+    "Devon Hollowood <devonhollowood@gmail.com> @devonhollowood":
+        - search-algorithms
+
+    "Chris Dornan <chris@chrisdornan.com> @cdornan":
+        - regex
+        - regex-with-pcre
+        - regex-examples
+
+    "Elliot Cameron <eacameron@gmail.com> @3noch":
+        - ziptastic-client
+        - ziptastic-core
+
+    "Hardy Jones <jones3.hardy@gmail.com> @joneshf":
+        - servant-ruby
+        - wai-middleware-rollbar
+
+    "Andrey Mokhov <andrey.mokhov@gmail.com> @snowleopard":
+        - algebraic-graphs
+
+    "Albert Krewinkel <albert+stackage@zeitkraut.de> @tarleb":
+        - hslua
+        - hslua-aeson
+
+    "Judah Jacobson <judah.jacobson@gmail.com> @judah":
+        - lens-labels
+        - proto-lens
+        - proto-lens-descriptors
+        - proto-lens-protoc
+        - proto-lens-combinators
+        - proto-lens-arbitrary
+        - proto-lens-optparse
+        - tensorflow          # https://github.com/fpco/stackage/issues/2527
+        - tensorflow-core-ops # https://github.com/fpco/stackage/issues/2527
+        - tensorflow-opgen
+        - tensorflow-ops      # https://github.com/fpco/stackage/issues/2527
+        - tensorflow-proto
+        - tensorflow-test
+
+    "Christof Schramm <christof.schramm@campus.lmu.de>":
+        - mnist-idx
+
+    "Naushadh <naushadh@protonmail.com> @naushadh":
+        - persistent-mysql-haskell
+
+    "Moritz Schulte <mtesseract@silverratio.net> @mtesseract":
+        - async-refresh
+        - async-refresh-tokens
+        - type-level-integers
+
+    "Simon Hafner <hafnersimon@gmail.com> @reactormonk":
+        - uri-bytestring-aeson
+
+    "Sebastian Witte <woozletoff@gmail.com> @saep":
+        - nvim-hs
+        - nvim-hs-contrib
+        - nvim-hs-ghcid
+
+    "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
@@ -2857,6 +3110,7 @@ packages:
         - imm < 1.1.0.1
         - opml-conduit < 0.6.0.2
         - rss-conduit < 0.3.0.1
+        - MusicBrainz < 0.3
 
         # https://github.com/fpco/stackage/issues/2317
         - skylighting < 0.2
@@ -2864,11 +3118,89 @@ packages:
         # https://github.com/fpco/stackage/issues/2329
         - network-transport < 0.5
 
+        # https://github.com/fpco/stackage/issues/2334
+        - tcp-streams < 1.0.0.0
+        - tcp-streams-openssl < 1.0.0.0
+
+        # https://github.com/fpco/stackage/issues/2345
+        - syb < 0.7
+
+        # https://github.com/fpco/stackage/issues/2378
+        - errors < 2.2.0
+
+        # https://github.com/fpco/stackage/issues/2393
+        - HUnit < 1.6.0.0
+
+        # https://github.com/fpco/stackage/issues/2400
+        - hslua < 0.5
+
+        # https://github.com/fpco/stackage/issues/2433
+        - hlint < 2
+
+        # https://github.com/fpco/stackage/issues/2440
+        - discord-hs < 0.3.2
+
+        # https://github.com/fpco/stackage/issues/2449
+        - aeson < 1.2.0.0
+
+        # https://github.com/fpco/stackage/issues/2451
+        - websockets < 0.11.0.0
+
+        # https://github.com/fpco/stackage/issues/2464
+        - traverse-with-class < 1.0.0.0
+
+        # https://github.com/fpco/stackage/issues/2477
+        - intervals < 0.8
+
+        # https://github.com/fpco/stackage/issues/2478
+        - generics-sop < 0.3.0.0
+
+        # https://github.com/fpco/stackage/issues/2487
+        - graphviz < 2999.19
+
+        # https://github.com/fpco/stackage/issues/2489
+        - 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
+
+        # https://github.com/fpco/stackage/issues/2513
+        - hsyslog < 5
+
+        # https://github.com/fpco/stackage/issues/2516
+        - ghc-typelits-knownnat < 0.3
+
+        # https://github.com/fpco/stackage/issues/2528
+        - concurrent-output < 1.10.0
+
+        # https://github.com/fpco/stackage/issues/2529
+        - mmorph < 1.1.0
+
+        # https://github.com/fpco/stackage/issues/2533
+        - mysql-haskell < 0.8.1.0
+
+        # https://github.com/fpco/stackage/issues/2537
+        - servant < 0.11
+        - servant-client < 0.11
+        - servant-server < 0.11
+        - servant-docs < 0.10.0.1
+        - servant-foreign < 0.10.0.1
+
+        # https://github.com/fpco/stackage/issues/2538
+        - criterion < 1.2
+        - statistics < 0.14 # requires bigger criterion, criterion stopped on #2538
+
+
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of
 # global-flags
 package-flags:
+    pathtype:
+        old-time: false
+
     brick:
         demos: true
 
@@ -2889,6 +3221,12 @@ package-flags:
     hpio:
         test-hlint: false
 
+    idris:
+        ffi: true
+
+    minio-hs:
+        live-test: false
+
     hxt:
         network-uri: true
     hxt-http:
@@ -2940,6 +3278,9 @@ package-flags:
         ghc_7_7: false
         ghc_8_0: true
 
+    functor-classes-compat:
+        containers: false
+
 # end of package-flags
 
 # Special configure options for individual packages
@@ -2969,6 +3310,11 @@ configure-args:
   hocilib:
   - --extra-lib-dirs
   - /usr/local/lib
+  clang-pure:
+  - --extra-lib-dirs
+  - /usr/lib/llvm-3.7/lib
+  - --extra-include-dirs
+  - /usr/lib/llvm-3.7/include
 
 # end of configure-args
 
@@ -3036,7 +3382,6 @@ skipped-tests:
     - state-plus # QuickCheck 2.9
     - system-filepath # QuickCheck 2.9 via chell-quickcheck
     - terminal-progress-bar # fixed on master, depends on older version of itself
-    - vector # https://github.com/haskell/vector/commit/31edb3fc51e76facc1e291f1e9e721663d91dbd8
 
     # Transitive outdated dependencies
     # These packages
@@ -3058,13 +3403,12 @@ skipped-tests:
     - symengine # symengine
 
 
-    # Wontfix. The maintainer chose to keep these broken/outdated, only
-    # re-enable if requested.
+    # Wontfix. The maintainer doesn't want to keep test dependencies
+    # up to date or be notified about it, or doesn't want stackage to
+    # run the tests.
+    # Only re-enable if requested.
     - postgresql-binary # https://github.com/nikita-volkov/postgresql-binary/issues/6#issuecomment-243063139
 
-    # BLOCKED shelly GHC 8.0.2
-    - c2hs
-
     # directory 1.3
     - machines
     - xmlhtml
@@ -3101,6 +3445,8 @@ 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
+    - matplotlib # https://github.com/fpco/stackage/issues/2365
 
     # Timeouts
     # These tests sometimes take too long and hit the stackage build
@@ -3119,6 +3465,7 @@ expected-test-failures:
     - GLFW-b # X
     - HTF # Requires shell script and are incompatible with sandboxed package databases
     - HaRe # # Needs ~/.ghc-mod/cabal-helper https://github.com/fpco/stackage/pull/906
+    - IPv6DB
     - amqp
     - aws # AWS Credentials
     - bindings-GLFW # Expects running X server
@@ -3132,6 +3479,8 @@ expected-test-failures:
     - dns # https://github.com/kazu-yamamoto/dns/issues/29
     - drifter-postgresql # PostgreSQL
     - etcd # etcd https://github.com/fpco/stackage/issues/811
+    - eventful-dynamodb
+    - eventful-postgresql
     - eventstore # Event Store
     - fb # Facebook app
     - ghc-imported-from # depends on haddocks being generated first https://github.com/fpco/stackage/pull/1315
@@ -3178,6 +3527,8 @@ expected-test-failures:
     - wai-session-postgresql # PostgreSQL
     - webdriver-angular # webdriver server
     - yahoo-finance-api # Requires being able to access Yahoo Finance API
+    - req-conduit # bad JSON response from service pinged https://github.com/mrkkrp/req-conduit/issues/1
+    - clr-inline # requires working Mono https://github.com/fpco/stackage/issues/2510
 
     # Test executable requires arguments
     - hpqtypes
@@ -3194,7 +3545,6 @@ expected-test-failures:
     - crypto-pubkey # https://github.com/vincenthz/hs-crypto-pubkey/issues/23
     - cubicbezier # https://github.com/kuribas/cubicbezier/issues/3
     - ghc-events # https://github.com/haskell/ghc-events/issues/9
-    - ginger # https://bitbucket.org/tdammers/ginger/issues/1/test-suite-failure-due-to-missing-test
     - graylog # 0.1.0.1 https://github.com/fpco/stackage/pull/1254
     - haskell-names # 0.7.0 https://github.com/haskell-suite/haskell-names/issues/78
     - rematch # No issue tracker, sent e-mail to maintainer https://github.com/fpco/stackage/issues/376
@@ -3212,18 +3562,19 @@ expected-test-failures:
     - th-printf # 0.3.1 https://github.com/pikajude/th-printf/issues/3
     - unicode-show # https://github.com/nushio3/unicode-show/issues/2
     - xmonad # 0.12 https://github.com/xmonad/xmonad/issues/36
+    - pixelated-avatar-generator # 0.1.3 https://github.com/ExcaliburZero/pixelated-avatar-generator/issues/19
+    - xml-picklers # https://github.com/Philonous/xml-picklers/issues/5
 
     # Compilation 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
-    - jose-jwt # doctest ambiguity https://github.com/fpco/stackage/issues/2169
     - language-lua2 # https://github.com/mitchellwrosen/language-lua2/issues/4
-    - servant-server # 0.9.1.1 due to hspec-wai-0.8.0 https://github.com/haskell-servant/servant/issues/643
+    - picosat # https://github.com/fpco/stackage/pull/2382
     - sourcemap # https://github.com/chrisdone/sourcemap/issues/3
-    - text-ldap # # https://github.com/khibino/haskell-text-ldap/issues/1
+    - text-ldap # https://github.com/khibino/haskell-text-ldap/issues/1
+    - text-show # https://github.com/fpco/stackage/issues/2436
     - thyme # https://github.com/liyang/thyme/issues/50
     - tries # https://github.com/athanclark/tries/issues/2
     - vector-algorithms # http://hub.darcs.net/dolio/vector-algorithms/issue/9
@@ -3232,7 +3583,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
     - clock # 0.7.2 clock:test => tasty:lib => clock:lib
@@ -3244,17 +3595,18 @@ 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
     - makefile
 
     # Misc.
-    - aeson # Will be fixed in the next release
     - distributed-process-supervisor # # https://github.com/haskell-d
     - ghcid # Weird conflicts with sandboxingistributed/distributed-process-supervisor/issues/1
     - haskell-docs # GHC bug
     - rattletrap # OOM? https://github.com/fpco/stackage/issues/2232
+    - req # https://github.com/mrkkrp/req/issues/14#issuecomment-287562784
     - servant # https://github.com/haskell-servant/servant/issues/698
     - snap-core # https://github.com/snapframework/snap-core/issues/26
     - stm-delay # https://github.com/joeyadams/haskell-stm-delay/issues/5
@@ -3295,7 +3647,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
@@ -3320,6 +3672,10 @@ expected-haddock-failures:
     - stratosphere
     - store
 
+    # https://github.com/kuribas/cubicbezier/issues/4
+    - cubicbezier
+
+
 # end of expected-haddock-failures
 
 # Benchmarks which should not be built. Note that Stackage builds benchmarks but does not run them.
@@ -3334,6 +3690,8 @@ skipped-benchmarks:
     # just remove these lines and run `stackage-curator check'
     # to verify.
     - criterion-plus
+    - http2
+    - pipes # optparse-applicative 0.13
 
     # Transitive outdated dependencies
     # These packages
@@ -3349,188 +3707,12 @@ skipped-benchmarks:
     - cipher-camellia # https://github.com/vincenthz/hs-crypto-cipher/issues/46
     - cipher-des # https://github.com/vincenthz/hs-crypto-cipher/issues/46
     - cipher-rc4 # https://github.com/vincenthz/hs-crypto-cipher/issues/46
-    - http2 # https://github.com/kazu-yamamoto/http2/pull/13, we can upgrade http2 in lts-6 when this is lifted.
 
     # GHC Bugs
     - hledger-lib # https://github.com/fpco/stackage/issues/1587
 
-    - pipes # optparse-applicative 0.13
-
-    # Criterionpocalypse # via criterion: via cassava: bounds: vector
-    - Earley
-    - Frames
-    - IntervalMap
-    - JuicyPixels-extra
-    - acid-state
-    - ad
-    - arithmoi
-    - attoparsec
-    - avers
-    - binary-list
-    - binary-parsers
-    - binary-tagged
-    - binary-typed
-    - blake2
-    - buffer-builder
-    - bytestring-conversion
-    - bytestring-tree-builder
-    - cacophony
-    - case-insensitive
+    # Cyclic dependencies
     - cassava
-    - cipher-aes128
-    - clash-prelude
-    - clustering
-    - cmark
-    - conduit
-    - conduit-extra
-    - conduit-iconv
-    - cprng-aes
-    - criterion
-    - cron
-    - crypto-numbers
-    - crypto-pubkey
-    - cryptohash
-    - cryptohash-md5
-    - cryptohash-sha1
-    - cryptohash-sha256
-    - cryptol
-    - ctrie
-    - data-msgpack
-    - diagrams-lib
-    - dimensional
-    - do-list
-    - ed25519
-    - edit-distance
-    - effect-handlers
-    - euphoria
-    - farmhash
-    - fast-builder
-    - fast-digits
-    - fclabels
-    - foldl
-    - foldl-statistics
-    - gitson
-    - glob-posix
-    - graphviz
-    - grouped-list
-    - hOpenPGP
-    - hashable
-    - haskell-tools-cli
-    - hasql
-    - highjson
-    - hindent
-    - hip
-    - histogram-fill
-    - hledger
-    - hosc
-    - hourglass
-    - html-email-validate
-    - htoml
-    - http-client-tls
-    - http-link-header
-    - human-readable-duration
-    - hw-balancedparens
-    - hw-bits
-    - hw-conduit
-    - hw-json
-    - hw-rankselect-base
-    - hweblib
-    - hxt-regex-xmlschema
-    - identicon
-    - ilist
-    - include-file
-    - incremental-parser
-    - inline-r
-    - jose-jwt
-    - katip
-    - kdt
-    - lens
-    - lifted-async
-    - lifted-base
-    - logging-effect
-    - loop
-    - lucid
-    - matrices
-    - matrix
-    - megaparsec
-    - monad-logger-prefix
-    - mongoDB
-    - mono-traversable
-    - monoid-extras
-    - morte
-    - mutable-containers
-    - netpbm
-    - pandoc
-    - phantom-state
-    - picoparsec
-    - postgresql-binary
-    - pretty-simple
-    - prometheus-client
-    - psqueues
-    - publicsuffix
-    - ramus
-    - rdf
-    - redis-io
-    - reinterpret-cast
-    - reroute
-    - rethinkdb-client-driver
-    - rose-trees
-    - sampling
-    - sandi
-    - say
-    - scalpel-core
-    - scanner
-    - scientific
-    - semver
-    - servant-auth-cookie
-    - sets
-    - skylighting
-    - snap-server
-    - sorted-list
-    - sourcemap
-    - sparse-linear-algebra
-    - stache
-    - stackage-curator
-    - stateWriter
-    - stm-containers
-    - store
-    - streaming-commons
-    - superbuffer
-    - taggy
-    - tar
-    - text-manipulate
-    - text-metrics
-    - text-show
-    - thread-local-storage
-    - thyme
-    - timemap
-    - tinylog
-    - tls
-    - turtle
-    - tz
-    - ua-parser
-    - unbound-generics
-    - unicode-transforms
-    - union
-    - unordered-containers
-    - uri-bytestring
-    - uuid
-    - uuid-types
-    - varying
-    - vector-binary-instances
-    - vectortiles
-    - vinyl
-    - wai-middleware-metrics
-    - wai-routing
-    - warp
-    - wire-streams
-    - word24
-    - word8
-    - xmlgen
-    - yesod-core
-    - yi-rope
-    - zippers
-    - jvm
 
 # end of skipped-benchmarks
 
@@ -3590,7 +3772,6 @@ github-users:
         - sestrella
         - jsl
         - jsantos17
-        - mrkkrp
     scotty-web:
         - RyanGlScott
         - xich
@@ -3616,6 +3797,11 @@ github-users:
         - Bodigrim
         - cartazio
         - phadej
+    IxpertaSolutions:
+        - Siprj
+        - liskin
+        - trskop
+        - xkollar
 
 # end of github-users
 
@@ -3648,8 +3834,9 @@ tell-me-when-its-released:
 - point-octree-0.5.5.3 # re-enable test and then we can resolve https://github.com/fpco/lts-haskell/issues/27
 - yarr-1.4.0.2 # Re-enable package https://github.com/fpco/stackage/issues/1876
 - 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
-- aeson-1.1.0.0 # Re-enable test suite
+- lens-4.15.2 # Test failures in lens-4.15.1 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:
@@ -3688,6 +3875,7 @@ hide:
 - objective # conflicts with Control.Object in natural-transformation
 - binary-ieee754 # conflicts with data-binary-ieee754
 - rerebase # conflicts with base
+- matrices # conflicts with matrix
 
 # Cryptonite deprecations
 - cipher-aes
@@ -3706,3 +3894,9 @@ 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
+- mime-mail
diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh
index 937789b5..bb5b1747 100755
--- a/debian-bootstrap.sh
+++ b/debian-bootstrap.sh
@@ -20,10 +20,11 @@ apt-get install -y software-properties-common
 
 add-apt-repository ppa:hvr/ghc -y
 add-apt-repository -y ppa:marutter/rrutter
-# not sure what this was needed for
-#add-apt-repository -y ppa:openstack-ubuntu-testing/icehouse
+apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
+add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy main'
+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'
 
-# Set the GHC version
 GHCVER=8.0.2
 
 apt-get update
@@ -37,6 +38,7 @@ apt-get install -y \
     sudo \
     curl \
     freeglut3-dev \
+    fsharp \
     git \
     gradle \
     libadns1-dev \
@@ -69,6 +71,7 @@ apt-get install -y \
     libgtksourceview-3.0-dev \
     libhidapi-dev \
     libicu-dev \
+    libimlib2-dev \
     libjudy-dev \
     liblapack-dev \
     libleveldb-dev \
@@ -78,6 +81,8 @@ apt-get install -y \
     libmagickcore-dev \
     libmagickwand-dev \
     libmarkdown2-dev \
+    libmono-2.0-dev \
+    libmp3lame-dev \
     libmpfr-dev \
     libmysqlclient-dev \
     libncurses-dev \
@@ -94,6 +99,7 @@ apt-get install -y \
     libsdl2-ttf-dev \
     libsnappy-dev \
     libsndfile1-dev \
+    libsox-dev \
     libsqlite3-dev \
     libssl-dev \
     libsystemd-dev \
@@ -112,10 +118,16 @@ apt-get install -y \
     llvm-3.7 \
     locales \
     m4 \
+    minisat \
+    mono-mcs \
     nettle-dev \
     nodejs \
     npm \
     openjdk-8-jdk \
+    python-mpltoolkits.basemap \
+    python3-matplotlib \
+    python3-numpy \
+    python3-pip \
     r-base \
     r-base-dev \
     ruby-dev \
@@ -172,3 +184,26 @@ cd /tmp \
 # Add JDK to system paths.
 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
+
+# Install version 3 of the protobuf compiler.  (The `protobuf-compiler` package only
+# supports version 2.)
+curl -OL https://github.com/google/protobuf/releases/download/v3.3.0/protoc-3.3.0-linux-x86_64.zip \
+  && sudo unzip -o protoc-3.3.0-linux-x86_64.zip -d /usr bin/protoc \
+  && rm -f protoc-3.3.0-linux-x84_64.zip
+
+# Install the TensorFlow C API.
+curl https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.1.0.tar.gz > libtensorflow.tar.gz \
+    && sudo tar zxf libtensorflow.tar.gz -C /usr \
+    && rm libtensorflow.tar.gz \
+    && ldconfig
+
+## non-free repo for mediabus-fdk-aac
+#apt-add-repository multiverse \
+#    && apt-get update \
+#    && apt-get install -y libfdk-aac-dev