diff --git a/CURATORS.md b/CURATORS.md
index 874fcc76..909e2ed1 100644
--- a/CURATORS.md
+++ b/CURATORS.md
@@ -223,6 +223,26 @@ rm -r nightly/work/builds/nightly/
 ```
 This should also be done when moving the Nightly docker image to a new version of Ubuntu.
 
+If you're impatient and would like to build the Docker image on the
+build server instead of waiting for Docker Hub, you can run the
+following command:
+
+```
+DIR=$(mktemp -d)
+(cd $DIR \
+  && git clone https://github.com/fpco/stackage \
+  && cd stackage \
+  && docker build --tag snoyberg/stackage:nightly .)
+rm -rf $DIR
+```
+
+Note that we do a clean clone of the `stackage` repo instead of using
+the existing checkout because of how `docker build` works: it will
+send the entire local directory contents as context to the Docker
+daemon, which in the case of the build tree is a _lot_ of content. (We
+can discuss the wisdom—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:
diff --git a/become-a-curator.md b/become-a-curator.md
index 77bd9310..80559efc 100644
--- a/become-a-curator.md
+++ b/become-a-curator.md
@@ -1,3 +1,5 @@
+## We are no longer accepting applications, please wait until next time
+
 We are looking to expand the stackage curator team!
 
 As a stackage curator you will help the community by curating and
@@ -37,6 +39,6 @@ helped us iron out and document the process further.
 
 You can read the curator documentation here: https://github.com/fpco/stackage/blob/master/CURATORS.md
 
-To apply, please fill in this form: https://goo.gl/forms/eD6lTLtuyyHAIcfC2
+To apply, please fill in this form: [REDACTED]
 
 If you applied last time, we encourage you to do so again!
diff --git a/build-constraints.yaml b/build-constraints.yaml
index ac1f258a..c0bb9c51 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1,6 +1,15 @@
 ghc-major-version: "8.0"
 # Constraints for brand new builds
 packages:
+    "Timo Koepke <timo.koepke@gmail.com> @koepket":
+        - hinterface
+
+    "Jose Iborra <pepeiborra@gmail.com> @pepeiborra":
+        - clr-marshal
+        - clr-host
+        - threepenny-editors
+        # - clr-inline # https://github.com/fpco/stackage/pull/2470
+
     "Joshua Koike <jkoike2013@gmail.com> @jano017":
         - discord-hs
 
@@ -115,6 +124,7 @@ packages:
     "Luke Murphy <lukewm@riseup.net> @lwm":
         - tasty-discover
         - lentil
+        - packunused
 
     "Marco Zocca @ocramz":
         - sparse-linear-algebra
@@ -290,7 +300,7 @@ packages:
         - timelens
         - non-empty-sequence
 
-    "Neil Mitchell @ndmitchell":
+    "Neil Mitchell <ndmitchell@gmail.com> @ndmitchell":
         - hlint
         - hoogle
         - shake
@@ -305,6 +315,7 @@ packages:
         - bake
         - ghcid
         - hexml
+        - weeder
 
     "Alan Zimmerman @alanz":
         - hjsmin
@@ -340,6 +351,7 @@ packages:
         - yesod-auth-fb
         - hourglass-orphans
         - wai-slack-middleware
+        - sysinfo
 
     "haskell-openal":
         - OpenAL
@@ -767,6 +779,8 @@ packages:
 
     "Piyush P Kurur <ppk@cse.iitk.ac.in> @piyush-kurur":
         - raaz
+        - naqsha
+
     "Joey Hess <id@joeyh.name> @joeyh":
         # - git-annex # bounds: bloomfilter, [...] # via: aws, esqueleto, [...] #
         # - github-backup # bounds: github
@@ -919,6 +933,7 @@ packages:
         - netwire-input
         - netwire-input-glfw
         - yoga
+        - freetype2
 
     "Emanuel Borsboom <manny@fpcomplete.com> @borsboom":
         - BoundedChan
@@ -1077,8 +1092,9 @@ packages:
 
     "Jens Petersen <juhpetersen@gmail.com> @juhp":
         - cabal-rpm
+        - stackage-query
         # - cabal-sort # BLOCKED directory 1.3
-        - idris # bounds: safe
+        - idris
         - libffi
         - xmonad-contrib
         - shelly
@@ -1210,9 +1226,9 @@ packages:
         - waitra
 
         # scrive/log
-        # - log # via bloodhound: bounds: vector
+        - log # via bloodhound: bounds: vector
         - log-base
-        # - log-elasticsearch # via bloodhound: bounds: vector
+        - log-elasticsearch # via bloodhound: bounds: vector
         - log-postgres
 
         # Not a maintainer
@@ -1845,6 +1861,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
@@ -2001,6 +2018,7 @@ packages:
         - opaleye-trans
         - pretty-simple
         - read-env-var
+        - servant-checked-exceptions
         - servant-static-th
         - xml-html-qq
         - xml-indexed-cursor
@@ -2038,12 +2056,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
@@ -2156,6 +2172,7 @@ packages:
         - lame
         - path
         - forma
+        - stache
 
     # "Thomas Bereknyei <tomberek@gmail.com>":
         # - multiplate # bounds: transformers
@@ -2207,7 +2224,7 @@ packages:
 
     "Takahiro Himura <himuratk421@gmail.com> @thimura":
         - lens-regex
-        # - twitter-conduit # bounds: http-conduit 2.2 # via: twitter-types, twitter-types-lens
+        - twitter-conduit
         - twitter-types
         - twitter-types-lens
 
@@ -2570,8 +2587,9 @@ packages:
         - repline
         - picosat
 
-    # "Daishi Nakajima <nakaji.dayo@gmail.com> @nakaji_dayo":
-        # - yesod-job-queue # build failure https://github.com/nakaji-dayo/yesod-job-queue/issues/10
+    "Daishi Nakajima <nakaji.dayo@gmail.com> @nakaji_dayo":
+        - api-field-json-th
+        # - yesod-job-queue # compilation failure: nakaji-dayo/yesod-job-queue/issues/12
 
     # "Braden Walters <vc@braden-walters.info> @meoblast001":
         # - hakyll-sass # compilation failure
@@ -2762,6 +2780,7 @@ packages:
         - tasty-auto
         - tasty-stats
         - colorful-monoids
+        - ihs
 
     "Taras Serduke <taras.serduke@gmail.com> @tserduke":
         - do-list
@@ -2830,6 +2849,7 @@ packages:
 
     "XT <e@xtendo.org> @xtendo-org":
         - rawfilepath
+
     "Konstantin Zudov <co@zudov.me> @zudov":
         - html-email-validate
 
@@ -2862,8 +2882,7 @@ packages:
         - printcess
 
     "Alexey Kuleshevich <lehins@yandex.ru> @lehins":
-        []
-        # - wai-middleware-auth # https://github.com/fpco/wai-middleware-auth/issues/3
+        - wai-middleware-auth
         # - hip # via repa: bounds: vector
 
     "Hans-Peter Deifel <hpd@hpdeifel.de> @hpdeifel":
@@ -3010,10 +3029,17 @@ packages:
         - uri-bytestring-aeson
 
     "Sebastian Witte <woozletoff@gmail.com> @saep":
-        []
-        # - nvim-hs # build failure https://github.com/fpco/stackage/pull/2457
-        # - nvim-hs-contrib # per nvim-hs
-        # - nvim-hs-ghcid # per nvim-hs
+        - nvim-hs
+        - nvim-hs-contrib
+        - nvim-hs-ghcid
+
+    "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.
@@ -3108,11 +3134,45 @@ packages:
         # https://github.com/fpco/stackage/issues/2464
         - traverse-with-class < 1.0.0.0
 
-        # https://github.com/xtendo-org/rawfilepath/issues/3
-        - rawfilepath < 0.2.1
+        # https://github.com/diagrams/active/issues/20
+        - lens < 4.15.2
+
+        # 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/2481
+        - megaparsec < 5.3.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/2499
+        - io-streams < 1.4.0.0
+
+        # https://github.com/fpco/stackage/issues/2504
+        - statistics < 0.14
+
+        # https://github.com/fpco/stackage/issues/2505
+        - one-liner < 0.9
+
+        # https://github.com/fpco/stackage/issues/2507
+        - concurrent-output < 1.8
+
+        # breaks hdaemonize: https://github.com/greydot/hdaemonize/issues/5
+        # also breaks monad-logger-syslog: https://github.com/fpco/monad-logger-syslog/issues/6
+        - hsyslog < 5
 
-        # https://github.com/fpco/stackage/issues/2469
-        - cryptonite < 0.23
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of
@@ -3141,6 +3201,9 @@ package-flags:
     hpio:
         test-hlint: false
 
+    idris:
+        ffi: true
+
     minio-hs:
         live-test: false
 
@@ -3336,6 +3399,9 @@ skipped-tests:
     # criterion
     - store
 
+    # requires custom setup?
+    - ersatz # https://github.com/fpco/stackage/issues/2508
+
 # end of skipped-tests
 
 # Tests which we should build and run, but which are expected to fail. We
@@ -3362,6 +3428,7 @@ expected-test-failures:
     - pandoc-citeproc # https://github.com/jgm/pandoc-citeproc/issues/172
     - spdx # https://github.com/phadej/spdx/issues/8
     - statistics # https://github.com/bos/statistics/issues/42
+    - courier # https://github.com/hargettp/courier/issues/18
 
     # Timeouts
     # These tests sometimes take too long and hit the stackage build
@@ -3479,7 +3546,6 @@ expected-test-failures:
     - ListLike # No issue tracker, e-mail sent to maintainer
     - commutative # https://github.com/athanclark/commutative/issues/4
     - dbus # 0.10.12 No issue tracker, e-mail sent to maintainer
-    - folds # https://github.com/ekmett/folds/issues/12
     - hspec-expectations-pretty-diff # GHC 8 issue not reported upstream since issue tracker disabled
     - language-lua2 # https://github.com/mitchellwrosen/language-lua2/issues/4
     - picosat # https://github.com/fpco/stackage/pull/2382
@@ -3494,7 +3560,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
@@ -3506,6 +3572,7 @@ expected-test-failures:
     # these if we want them fixed
     - stack # Permissions failure when creating /home/stackage/.stack.
     - skein # openfile: does not exist https://github.com/fpco/stackage/issues/1187
+    - haskell-tools-daemon # openFile: permission denied https://github.com/fpco/stackage/issues/2502
 
     # Doctests require hidden Glob package
     - multiset
@@ -3557,7 +3624,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
@@ -3856,7 +3923,6 @@ github-users:
         - sestrella
         - jsl
         - jsantos17
-        - mrkkrp
     scotty-web:
         - RyanGlScott
         - xich
@@ -3921,6 +3987,10 @@ tell-me-when-its-released:
 - terminal-progress-bar-0.1.1 # Unskip test suite
 - req-0.2.0 # Remove from expected-test-failures https://github.com/mrkkrp/req/issues/14#issuecomment-287562784
 - vivid-0.2.0.5 # Re-enable package (disabed per MonadRandom < 0.5) https://github.com/fpco/stackage/issues/2180
+- lens-4.15.2 # Test failures in lens-4.15.1 https://github.com/fpco/stackage/issues/2496
+- active-0.2.0.12 # Will likely contain fix for the lens-4.15.2 https://github.com/fpco/stackage/issues/2496
+- hdaemonize-0.5.2 # Handles the build failure from https://github.com/greydot/hdaemonize/issues/5
+- monad-logger-syslog-0.1.3.0 # Handles the build failure from https://github.com/fpco/monad-logger-syslog/issues/6
 
 # Packages which should be hidden after registering, to avoid module name
 # conflicts. This is intended for at least two use cases:
@@ -3978,3 +4048,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 4de888b5..747e1c5d 100755
--- a/debian-bootstrap.sh
+++ b/debian-bootstrap.sh
@@ -34,6 +34,7 @@ apt-get install -y \
     sudo \
     curl \
     freeglut3-dev \
+    fsharp \
     git \
     gradle \
     libadns1-dev \
@@ -75,6 +76,7 @@ apt-get install -y \
     libmagickcore-dev \
     libmagickwand-dev \
     libmarkdown2-dev \
+    libmono-2.0-dev \
     libmp3lame-dev \
     libmpfr-dev \
     libmysqlclient-dev \
@@ -111,6 +113,7 @@ apt-get install -y \
     llvm-3.7 \
     locales \
     m4 \
+    mono-mcs \
     nettle-dev \
     nodejs \
     npm \