diff --git a/build-constraints.yaml b/build-constraints.yaml
index 20cc4f61..6f4e0fcd 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -13,7 +13,7 @@ packages:
         - beam-sqlite
 
     "Fraser Murray <fraser.m.murray@gmail.com @intolerable":
-        - stitch
+        - stitch < 0 # GHC 8.4 via base-4.11.0.0
 
     "Yusent Chig <yusent@protonmail.com> @yusent":
         []
@@ -112,7 +112,7 @@ packages:
 
     "Roman Gonzalez <open-source@roman-gonzalez.info> @roman":
         - teardown
-        - capataz
+        - capataz < 0 # GHC 8.4 via base-4.11.0.0
 
     "Richard Cook <rcook@rcook.org> @rcook":
         - hidden-char
@@ -122,10 +122,10 @@ packages:
         - tibetan-utils
 
     "Henning Thielemann <stackage@henning-thielemann.de> @thielema":
-        - accelerate-utility
-        - accelerate-arithmetic
-        - accelerate-fourier
-        - accelerate-fftw
+        - accelerate-arithmetic < 0 # GHC 8.4 via base-4.11.0.0
+        - accelerate-fftw < 0 # GHC 8.4 via base-4.11.0.0
+        - accelerate-fourier < 0 # GHC 8.4 via base-4.11.0.0
+        - accelerate-utility < 0 # GHC 8.4 via base-4.11.0.0
         - alsa-core
         - alsa-pcm < 0 # build failure with GHC 8.4
         - alsa-seq
@@ -140,7 +140,7 @@ packages:
         - cutter
         - data-accessor
         - data-accessor-mtl
-        - data-accessor-template
+        - data-accessor-template < 0 # GHC 8.4 via template-haskell-2.13.0.0
         - data-accessor-transformers
         - data-ref
         - dsp
@@ -192,7 +192,7 @@ packages:
         - blas-carray
         - lapack-ffi
         - lapack-carray
-        - lapack-ffi-tools
+        - lapack-ffi-tools < 0 # GHC 8.4 via base-4.11.0.0
         # Not a maintainer
         - ix-shapable
 
@@ -219,7 +219,7 @@ packages:
 
     "Li-yao Xia <lysxia@gmail.com> @Lysxia":
         - boltzmann-samplers
-        - generic-random
+        - generic-random < 0 # GHC 8.4 via base-4.11.0.0
         - show-combinators
 
     "Tobias Dammers <tdammers@gmail.com> @tdammers":
@@ -389,7 +389,7 @@ packages:
         - say
         - unliftio-core
         - unliftio
-        - compact
+        - compact < 0 # GHC 8.4 via base-4.11.0.0
 
         - fsnotify
         - hinotify
@@ -434,7 +434,7 @@ packages:
 
     "Alan Zimmerman @alanz":
         - ghc-exactprint
-        - haskell-lsp
+        - haskell-lsp < 0 # GHC 8.4 via base-4.11.0.0
         - hjsmin
         - language-javascript
         - Strafunski-StrategyLib
@@ -659,7 +659,7 @@ packages:
         - rank2classes
 
     "Brent Yorgey <byorgey@gmail.com> @byorgey":
-        - active
+        - active < 0 # GHC 8.4 via base-4.11.0.0
         # - diagrams # lens 4.16
         # - diagrams-builder # haskell-src-exts
         # - diagrams-cairo # lens 4.16
@@ -668,10 +668,10 @@ packages:
         # - diagrams-lib # lens 4.16
         # - diagrams-rasterific # lens 4.16
         # - diagrams-svg # lens 4.16
-        - force-layout
+        - force-layout < 0 # GHC 8.4 via base-4.11.0.0
         - haxr < 0 # GHC 8.4 via HaXml
         - MonadRandom
-        - monoid-extras
+        - monoid-extras < 0 # GHC 8.4 via base-4.11.0.0
 
     "Vincent Berthoux <vincent.berthoux@gmail.com> @Twinside":
         - JuicyPixels
@@ -708,26 +708,26 @@ packages:
         - ChannelT
 
     "Trevor L. McDonell <tmcdonell@cse.unsw.edu.au> @tmcdonell":
-        - accelerate
-        - accelerate-llvm
-        - accelerate-llvm-native
-        - accelerate-llvm-ptx
-        - accelerate-io
-        - accelerate-fft
-        - accelerate-blas
-        - accelerate-bignum
+        - accelerate < 0 # GHC 8.4 via base-4.11.0.0
+        - accelerate-bignum < 0 # GHC 8.4 via base-4.11.0.0
+        - accelerate-blas < 0 # GHC 8.4 via base-4.11.0.0
+        - accelerate-fft < 0 # GHC 8.4 via base-4.11.0.0
+        - accelerate-io < 0 # GHC 8.4 via base-4.11.0.0
+        - accelerate-llvm < 0 # GHC 8.4 via base-4.11.0.0
+        - accelerate-llvm-native < 0 # GHC 8.4 via base-4.11.0.0
+        - accelerate-llvm-ptx < 0 # GHC 8.4 via base-4.11.0.0
         # - accelerate-examples # https://github.com/AccelerateHS/accelerate/issues/418
         - repa
         - repa-io
         - repa-algorithms
-        - gloss
-        - gloss-algorithms
-        - gloss-raster
-        - gloss-rendering
-        - gloss-accelerate
-        - gloss-raster-accelerate
-        - colour-accelerate
-        - lens-accelerate
+        - gloss < 0 # GHC 8.4 via base-4.11.0.0
+        - gloss-accelerate < 0 # GHC 8.4 via base-4.11.0.0
+        - gloss-algorithms < 0 # GHC 8.4 via base-4.11.0.0
+        - gloss-raster < 0 # GHC 8.4 via base-4.11.0.0
+        - gloss-raster-accelerate < 0 # GHC 8.4 via base-4.11.0.0
+        - gloss-rendering < 0 # GHC 8.4 via base-4.11.0.0
+        - colour-accelerate < 0 # GHC 8.4 via base-4.11.0.0
+        - lens-accelerate < 0 # GHC 8.4 via base-4.11.0.0
         - mwc-random-accelerate
         - cuda < 0 # build failure with GHC 8.4
         - cublas < 0 # build failure with GHC 8.4
@@ -753,7 +753,7 @@ packages:
         - binary-list
         - byteset
         - Clipboard
-        - grouped-list
+        - grouped-list < 0 # GHC 8.4 via base-4.11.0.0
         - haskintex
         - HaTeX
         - include-file
@@ -794,7 +794,7 @@ packages:
         - HUnit
         - aeson
         - attoparsec-iso8601
-        - feed
+        - feed < 0 # GHC 8.4 via base-4.11.0.0
         - time-compat
         - through-text
         # Not my packages
@@ -840,7 +840,7 @@ packages:
         - random-fu
 
     "Ben Gamari <ben@smart-cactus.org> @bgamari":
-        - vector-fftw
+        - vector-fftw < 0 # GHC 8.4 via base-4.11.0.0
 
     "Roman Cheplyaka <roma@ro-che.info> @feuerbach":
         - action-permutations
@@ -876,7 +876,7 @@ packages:
         - hweblib
 
     "Joachim Breitner <mail@joachim-breitner.de> @nomeata":
-        - circle-packing
+        - circle-packing < 0 # GHC 8.4 via base-4.11.0.0
         - haskell-spacegoo
         - tasty-expected-failure
 
@@ -892,8 +892,8 @@ packages:
         - opensource
 
     "Piyush P Kurur <ppk@cse.iitk.ac.in> @piyush-kurur":
-        - raaz
-        - naqsha
+        - raaz < 0 # GHC 8.4 via base-4.11.0.0
+        - naqsha < 0 # GHC 8.4 via base-4.11.0.0
 
     "Joey Hess <id@joeyh.name> @joeyh":
         # - git-annex # conduit 1.3
@@ -940,12 +940,12 @@ packages:
         - json-schema
         - multipart
         # - rest-client # http-types 0.12
-        - rest-core
+        - rest-core < 0 # GHC 8.4 via base-4.11.0.0
+        - rest-snap < 0 # GHC 8.4 via rest-core
         # - rest-gen # haskell-src-exts
         # - rest-happstack # haskell-src-exts via rest-gen
-        - rest-snap
         - rest-stringmap
-        - rest-types
+        - rest-types < 0 # GHC 8.4 via base-4.11.0.0
         # - rest-wai # http-types 0.12
         - tostring
         - uri-encode
@@ -976,7 +976,7 @@ packages:
         - hid < 0 # build failure with GHC 8.4
         - monad-journal
         - smoothie
-        - wavefront
+        - wavefront < 0 # GHC 8.4 via base-4.11.0.0
         - zero
 
     "Thomas Schilling <nominolo@googlemail.com> @nominolo":
@@ -1132,8 +1132,8 @@ packages:
         - shake-language-c
 
     "David Turner <dave.c.turner@gmail.com> @davecturner":
-        - alarmclock
-        - bank-holidays-england
+        - alarmclock < 0 # GHC 8.4 via base-4.11.0.0
+        - bank-holidays-england < 0 # GHC 8.4 via base-4.11.0.0
 
     "Haskell Servant <jkarni@gmail.com>":
         - servant
@@ -1185,8 +1185,8 @@ packages:
         - ghcjs-codemirror
         # - ghcjs-dom # http-types 0.12
         # - jsaddle # http-types 0.12
-        - vado
-        - vcswrapper
+        - vado < 0 # GHC 8.4 via base-4.11.0.0
+        - vcswrapper < 0 # GHC 8.4 via base-4.11.0.0
         - ShellCheck < 0 # build failure with GHC 8.4
         - binary-shared
 
@@ -1204,26 +1204,26 @@ packages:
         # - avers # cryptonite 0.25
         # - avers-api # cryptonite 0.25
         # - avers-server # cryptonite 0.25
-        - css-syntax
+        - css-syntax < 0 # GHC 8.4 via base-4.11.0.0
         # - etcd # https://github.com/wereHamster/etcd-hs/issues/5
         - github-types
-        - github-webhook-handler
-        - github-webhook-handler-snap
-        - google-cloud
-        - kraken
-        - libinfluxdb
-        - mole
-        - publicsuffix
-        - rethinkdb-client-driver
+        - github-webhook-handler < 0 # GHC 8.4 via base-4.11.0.0
+        - github-webhook-handler-snap < 0 # GHC 8.4 via base-4.11.0.0
+        - google-cloud < 0 # GHC 8.4 via base-4.11.0.0
+        - kraken < 0 # GHC 8.4 via base-4.11.0.0
+        - libinfluxdb < 0 # GHC 8.4 via base-4.11.0.0
+        - mole < 0 # GHC 8.4 via base-4.11.0.0
+        - publicsuffix < 0 # GHC 8.4 via base-4.11.0.0
+        - rethinkdb-client-driver < 0 # GHC 8.4 via base-4.11.0.0
         - snap-blaze
 
     "Alexandr Kurilin <alex@kurilin.net> @alex_kurilin":
         - bcrypt
 
     "Jeffrey Rosenbluth <jeffrey.rosenbluth@gmail.com> @jeffreyrosenbluth":
-        - palette
+        - palette < 0 # GHC 8.4 via base-4.11.0.0
         # - diagrams-canvas # lens 4.16
-        - svg-builder
+        - svg-builder < 0 # GHC 8.4 via base-4.11.0.0
 
     "Gabríel Arthúr Pétursson <gabriel@system.is> @polarina":
         - sdl2
@@ -1269,11 +1269,11 @@ packages:
 
     "Oleg Grenrus <oleg.grenrus@iki.fi> @phadej":
         - aeson-compat
-        - aeson-extra
+        - aeson-extra < 0 # GHC 8.4 via template-haskell-2.13.0.0
         - binary-orphans
         - binary-tagged < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build
         - cabal-doctest
-        - crypt-sha512
+        - crypt-sha512 < 0 # GHC 8.4 via base-4.11.0.0
         - dlist-nonempty
         - edit-distance
         - functor-classes-compat
@@ -1286,14 +1286,14 @@ packages:
         - microstache
         # - monad-http # http-types 0.12
         - postgresql-simple-url
-        - range-set-list
-        - regex-applicative-text
-        - servant-swagger-ui
-        - servant-yaml
+        - range-set-list < 0 # GHC 8.4 via base-4.11.0.0
+        - regex-applicative-text < 0 # GHC 8.4 via base-4.11.0.0
+        - servant-swagger-ui < 0 # GHC 8.4 via transformers-compat-0.6.0.6
+        - servant-yaml < 0 # GHC 8.4 via base-4.11.0.0
         - singleton-bool
-        - spdx
+        - spdx < 0 # GHC 8.4 via base-4.11.0.0
         - splitmix
-        - tdigest
+        - tdigest < 0 # GHC 8.4 via base-4.11.0.0
         - these
         - time-parsers
         - tree-diff
@@ -1590,27 +1590,27 @@ packages:
         - setlocale
 
     "Taylor Fausak <taylor@fausak.me> @tfausak":
-        - autoexporter
+        - autoexporter < 0 # GHC 8.4 via base-4.11.0.0
         - derulo
         - flow
-        - github-release
+        - github-release < 0 # GHC 8.4 via base-4.11.0.0
         - json-feed
-        - lackey
-        - ratel
-        - ratel-wai
+        - lackey < 0 # GHC 8.4 via base-4.11.0.0
+        - ratel < 0 # GHC 8.4 via base-4.11.0.0
+        - ratel-wai < 0 # GHC 8.4 via base-4.11.0.0
         - rattletrap
         - salve
-        - strive
+        - strive < 0 # GHC 8.4 via template-haskell-2.13.0.0
         - wuss
 
         - bmp # @benl23x5
         - ekg-statsd # @tibbe
-        - gloss # @benl23x5
-        - gloss-rendering # @benl23x5
+        - gloss < 0 # GHC 8.4 via base-4.11.0.0
+        - gloss-rendering < 0 # GHC 8.4 via base-4.11.0.0
         - gpolyline # @fegu
         - monad-memo # @EduardSergeev
         - postgresql-simple-migration # @ameingast
-        - statestack # @byorgey
+        - statestack < 0 # GHC 8.4 via base-4.11.0.0
 
     "Marios Titas <redneb@gmx.com> @redneb":
         - HsOpenSSL-x509-system
@@ -1776,7 +1776,7 @@ packages:
         - cassette < 0 # build failure with GHC 8.4
         - choice
         - distributed-closure
-        - inline-java
+        - inline-java < 0 # GHC 8.4 via ghc-8.4.1
         - inline-r < 0 # GHC 8.4 via inline-c
         # - jni # GHC 8.4 via inline-c
         # - jvm # GHC 8.4 via inline-c
@@ -1811,7 +1811,7 @@ packages:
         - atom-conduit
         - conduit-parse
         - dublincore-xml-conduit
-        - euler-tour-tree
+        - euler-tour-tree < 0 # GHC 8.4 via base-4.11.0.0
         - opml-conduit
         - rss-conduit
         - timerep
@@ -1837,9 +1837,9 @@ packages:
         - hsyslog-udp
         - streaming
         - streaming-bytestring
-        - country
+        - country < 0 # GHC 8.4 via base-4.11.0.0
         - friday
-        - friday-juicypixels
+        - friday-juicypixels < 0 # GHC 8.4 via base-4.11.0.0
 
     "Rob O'Callahan ropoctl@gmail.com @rcallahan":
         - pipes-fastx
@@ -1884,11 +1884,11 @@ packages:
 
     "Oliver Charles <ollie@ocharles.org.uk> @ocharles":
         - diff3 < 0 # build failure with GHC 8.4
-        - exhaustive
-        - libsystemd-journal
-        - network-carbon
-        - tasty-rerun
-        - logging-effect
+        - exhaustive < 0 # GHC 8.4 via base-4.11.0.0
+        - libsystemd-journal < 0 # GHC 8.4 via base-4.11.0.0
+        - network-carbon < 0 # GHC 8.4 via base-4.11.0.0
+        - tasty-rerun < 0 # GHC 8.4 via base-4.11.0.0
+        - logging-effect < 0 # GHC 8.4 via base-4.11.0.0
         # - reactive-banana # pqueue-1.4.1
 
     "Antoni Silvestre <antoni.silvestre@gmail.com> @asilvestre":
@@ -1945,13 +1945,13 @@ packages:
 
     "Matthew Pickering <matthewtpickering@gmail.com> @mpickering":
         - refact
-        - apply-refact
+        - apply-refact < 0 # GHC 8.4 via ghc-8.4.1
 
     "Andrew Gibiansky <andrew.gibiansky@gmail.com> @gibiansky":
         - ipython-kernel
 
     "Andrés Sicard-Ramírez <asr@eafit.edu.co> @asr":
-        - Agda
+        - Agda < 0 # GHC 8.4 via template-haskell-2.13.0.0
 
     "James Cook <mokus@deepbondi.net> @mokus0":
         - dependent-sum
@@ -1965,7 +1965,7 @@ packages:
         - ekg-wai
         # - haxl-amazonka # http-conduit 2.3 via amazonka
         - hasql-migration
-        - servant-JuicyPixels
+        - servant-JuicyPixels < 0 # GHC 8.4 via base-4.11.0.0
 
     "Artyom <yom@artyom.me> @neongreen":
         - microlens
@@ -1986,7 +1986,7 @@ packages:
         - fmt < 0 # DependencyFailed (PackageName "text-format")
 
     "Takano Akio tak@anoak.io @takano-akio":
-        - fast-builder
+        - fast-builder < 0 # GHC 8.4 via base-4.11.0.0
         - filelock
 
     "Brian Lewis brian@lorf.org @bsl":
@@ -2000,7 +2000,7 @@ packages:
         - netpbm
         - network-house
         - reinterpret-cast
-        - posix-paths
+        - posix-paths < 0 # GHC 8.4 via base-4.11.0.0
         # As dependencies of packages above
         - attoparsec-binary
 
@@ -2070,7 +2070,7 @@ packages:
         - yi-snippet < 0 # GHC 8.4 via yi-rope
 
     "Tobias Bexelius <tobias_bexelius@hotmail.com> @tobbebex":
-        - GPipe
+        - GPipe < 0 # GHC 8.4 via base-4.11.0.0
 
     "Jonas Carpay <jonascarpay@gmail.com> @jonascarpay":
         - apecs < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build
@@ -2230,7 +2230,7 @@ packages:
 
     "David Wiltshire <david.wiltshire@metark.com> @dave77":
         # on behalf of Alexey Karakulov @w3rs
-        - hashable-time
+        - hashable-time < 0 # GHC 8.4 via base-4.11.0.0
 
     "Yuras Shumovich <shumovichy@gmail.com> @Yuras":
         - pdf-toolbox-content < 0 # DependencyFailed (PackageName "pdf-toolbox-core")
@@ -2281,8 +2281,8 @@ packages:
         - fuzzyset
 
     "Will Sewell <me@willsewell.com> @willsewell":
-        - benchpress
-        - pusher-http-haskell
+        - benchpress < 0 # GHC 8.4 via base-4.11.0.0
+        - pusher-http-haskell < 0 # GHC 8.4 via base-4.11.0.0
 
     "Yorick Laupa yo.eight@gmail.com @YoEight":
         - eventstore
@@ -2324,11 +2324,11 @@ packages:
         - prettyprinter-compat-annotated-wl-pprint
 
     "Jeremy Shaw <jeremy@n-heptane.com> @stepcut":
-        - boomerang
+        - boomerang < 0 # GHC 8.4 via template-haskell-2.13.0.0
         # - happstack-hsp # haskell-src-exts via hsx2hs
         - happstack-jmacro
-        - happstack-server
-        - happstack-server-tls
+        - happstack-server < 0 # GHC 8.4 via template-haskell-2.13.0.0
+        - happstack-server-tls < 0 # GHC 8.4 via happstack-server
         - hsx-jmacro < 0 # GHC 8.4 via wl-pprint-text
         - ixset
         - reform < 0 # build failure with GHC 8.4
@@ -2336,13 +2336,13 @@ packages:
         - reform-hamlet < 0 # GHC 8.4 via reform
         - reform-happstack < 0 # GHC 8.4 via happstack-server
         # - reform-hsp # haskell-src-exts via hsx2hs
-        - userid
+        - userid < 0 # GHC 8.4 via base-4.11.0.0
         - web-plugins
         - web-routes
-        - web-routes-boomerang
+        - web-routes-boomerang < 0 # GHC 8.4 via boomerang
         - web-routes-happstack
         - web-routes-hsp
-        - web-routes-th
+        - web-routes-th < 0 # GHC 8.4 via template-haskell-2.13.0.0
         - web-routes-wai
         # - hsx2hs # haskell-src-exts
 
@@ -2367,7 +2367,7 @@ packages:
 
     "Denis Redozubov <denis.redozubov@gmail.com> @dredozubov":
         - hreader-lens
-        - schematic
+        - schematic < 0 # GHC 8.4 via base-4.11.0.0
 
     "Yuji Yamamoto <whosekiteneverfly@gmail.com> @igrep":
         - yes-precure5-command
@@ -2400,7 +2400,7 @@ packages:
         - LibZip >= 1.0
 
     "Anthony Cowley <acowley@gmail.com> @acowley":
-        - Frames
+        - Frames < 0 # GHC 8.4 via base-4.11.0.0
         - hpp < 0 # build failure with GHC 8.4 via bytestring-trie
 
     "Takayuki Muranushi <muranushi@gmail.com> @nushio3":
@@ -2408,15 +2408,15 @@ packages:
         - unicode-show
 
     "Jason Shipman <jasonpshipman@gmail.com> @jship":
-        - logging-effect-extra
-        - logging-effect-extra-file
-        - logging-effect-extra-handler
+        - logging-effect-extra < 0 # GHC 8.4 via base-4.11.0.0
+        - logging-effect-extra-file < 0 # GHC 8.4 via base-4.11.0.0
+        - logging-effect-extra-handler < 0 # GHC 8.4 via base-4.11.0.0
         - overhang
         - tao
         - tao-example
 
     "Suhail Shergill <suhailshergill@gmail.com> @suhailshergill":
-        - extensible-effects
+        - extensible-effects < 0 # GHC 8.4 via base-4.11.0.0
 
     "Justus Adam <dev@justus.science> @JustusAdam":
         # - marvin # https://github.com/JustusAdam/marvin/issues/22
@@ -2424,7 +2424,7 @@ packages:
         - mustache
 
     "Cindy Wang <cindylinz@gmail.com> @CindyLinz":
-        - NoTrace
+        - NoTrace < 0 # GHC 8.4 via base-4.11.0.0
         - linked-list-with-iterator
 
     "Jean-Philippe Bernardy <jean-philippe.bernardy@tweag.io> @jyp":
@@ -2607,8 +2607,8 @@ packages:
         - directory-tree
 
     "Ian Grant Jeffries <ian@housejeffries.com> @seagreen":
-        - hjsonpointer
-        - hjsonschema
+        - hjsonpointer < 0 # GHC 8.4 via base-4.11.0.0
+        - hjsonschema < 0 # GHC 8.4 via hjsonpointer
 
     "Drew Hess <src@drewhess.com> @dhess":
         - hpio
@@ -2642,7 +2642,7 @@ packages:
         - xxhash-ffi
 
     "Cliff Harvey <cs.hbar+hs@gmail.com> @BlackBrane":
-        - ansigraph
+        - ansigraph < 0 # GHC 8.4 via base-4.11.0.0
         # - microsoft-translator # servant 0.13
 
     "Tebello Thejane <zyxoas+stackage@gmail.com> @tebello-thejane":
@@ -2664,15 +2664,15 @@ packages:
 
     "Alexis King <lexi.lambda@gmail.com> @lexi-lambda":
         - freer-simple
-        - monad-mock
-        - test-fixture
+        - monad-mock < 0 # GHC 8.4 via template-haskell-2.13.0.0
+        - test-fixture < 0 # GHC 8.4 via template-haskell-2.13.0.0
         - text-conversions
-        - th-to-exp
+        - th-to-exp < 0 # GHC 8.4 via template-haskell-2.13.0.0
         - type-assertions
 
     "Patrick Chilton <chpatrick@gmail.com> @chpatrick":
         - webrtc-vad
-        - servant-generic
+        - servant-generic < 0 # GHC 8.4 via base-4.11.0.0
         # - clang-pure
         - codec
 
@@ -2704,12 +2704,12 @@ packages:
         - direct-rocksdb
 
     "Anton Gushcha <ncrashed@gmail.com> @ncrashed":
-        - aeson-injector
+        - aeson-injector < 0 # GHC 8.4 via base-4.11.0.0
         - JuicyPixels-blp
 
     "Al Zohali <zohl@fmap.me> @zohl":
         # - servant-auth-cookie # servant 0.13
-        - dictionaries
+        - dictionaries < 0 # GHC 8.4 via base-4.11.0.0
         - cereal-time
 
     "Joachim Fasting <joachifm@fastmail.fm> @joachifm":
@@ -2757,7 +2757,7 @@ packages:
         - bv
 
     "Juan Pedro Villa Isaza @jpvillaisaza":
-        - licensor
+        - licensor < 0 # GHC 8.4 via base-4.11.0.0
 
     "Florian Hofmann fho@f12n.de @fhaust":
         - vector-split
@@ -2768,17 +2768,17 @@ packages:
         # - amazonka-s3-streaming # https://github.com/axman6/amazonka-s3-streaming/issues/9
 
     "Ondrej Palkovsky <palkovsky.ondrej@gmail.com> @ondrap":
-        - json-stream
+        - json-stream < 0 # GHC 8.4 via base-4.11.0.0
 
     "Philipp Balzarek <p.balzarek@googlemail.com>":
         - xml-picklers
 
     "Lennart Spitzner <hexagoxel@hexagoxel.de> @lspitzner":
-        - multistate
+        - multistate < 0 # GHC 8.4 via base-4.11.0.0
         - pqueue
-        - butcher
-        - czipwith
-        - brittany
+        - butcher < 0 # GHC 8.4 via base-4.11.0.0
+        - czipwith < 0 # GHC 8.4 via template-haskell-2.13.0.0
+        - brittany < 0 # GHC 8.4 via ghc-8.4.1
 
     "Ryan Mulligan <ryan@ryantm.com> @ryantm":
         - HDBC-mysql
@@ -2864,11 +2864,11 @@ packages:
     "Boldizsár Németh <nboldi@elte.hu> @nboldi":
         - instance-control
         - references
-        - haskell-tools-ast
-        - haskell-tools-backend-ghc
-        - haskell-tools-rewrite
-        - haskell-tools-prettyprint
-        - haskell-tools-refactor
+        - haskell-tools-ast < 0 # GHC 8.4 via template-haskell-2.13.0.0
+        - haskell-tools-backend-ghc < 0 # GHC 8.4 via template-haskell-2.13.0.0
+        - haskell-tools-prettyprint < 0 # GHC 8.4 via ghc-8.4.1
+        - haskell-tools-refactor < 0 # GHC 8.4 via template-haskell-2.13.0.0
+        - haskell-tools-rewrite < 0 # GHC 8.4 via ghc-8.4.1
         # - haskell-tools-demo # Cabal 2 via minisat-solver
         # - haskell-tools-cli # Cabal 2 via minisat-solver
         # - haskell-tools-daemon # Cabal 2 via minisat-solver
@@ -2882,7 +2882,7 @@ packages:
 
     "Mitsutoshi Aoe <maoe@foldr.in> @maoe":
         - influxdb
-        - sensu-run
+        - sensu-run < 0 # GHC 8.4 via base-4.11.0.0
         - viewprof
 
     "Dylan Simon <dylan-stack@dylex.net> @dylex":
@@ -2933,7 +2933,7 @@ packages:
         - tsv2csv
 
     "Thomas Sutton <me@thomas-sutton.id.au> @thsutton":
-        - aeson-diff
+        - aeson-diff < 0 # GHC 8.4 via base-4.11.0.0
         - edit-distance-vector
 
     "Kyle Van Berendonck <kvanberendonck+stackage@gmail.com> @donkeybonks":
@@ -2986,14 +2986,14 @@ packages:
         - hslua-aeson
 
     "Judah Jacobson <judah.jacobson@gmail.com> @judah":
-        - lens-labels
-        - proto-lens
-        - proto-lens-descriptors
-        # - proto-lens-protoc # haskell-src-exts
+        - lens-labels < 0 # GHC 8.4 via base-4.11.0.0
         # - proto-lens-combinators # haskell-src-exts via proto-lens-protoc
-        - proto-lens-arbitrary
-        - proto-lens-optparse
         # - proto-lens-protobuf-types # haskell-src-exts via proto-lens-protoc
+        # - proto-lens-protoc # haskell-src-exts
+        - proto-lens < 0 # GHC 8.4 via base-4.11.0.0
+        - proto-lens-arbitrary < 0 # GHC 8.4 via base-4.11.0.0
+        - proto-lens-descriptors < 0 # GHC 8.4 via base-4.11.0.0
+        - proto-lens-optparse < 0 # GHC 8.4 via base-4.11.0.0
         - tensorflow-test
 
     "Christof Schramm <christof.schramm@campus.lmu.de>":
@@ -3013,7 +3013,7 @@ packages:
         - conduit-throttle
 
     "Simon Hafner <hafnersimon@gmail.com> @reactormonk":
-        - uri-bytestring-aeson
+        - uri-bytestring-aeson < 0 # GHC 8.4 via base-4.11.0.0
         - katip-scalyr-scribe
 
     "Sebastian Witte <woozletoff@gmail.com> @saep":
@@ -3131,8 +3131,8 @@ packages:
         - colorize-haskell
 
     "Chris Martin <ch.martin@gmail.com> @chris-martin":
-        - partial-semigroup
-        - path-text-utf8
+        - partial-semigroup < 0 # GHC 8.4 via base-4.11.0.0
+        - path-text-utf8 < 0 # GHC 8.4 via base-4.11.0.0
 
     "Viacheslav Lotsmanov <lotsmanov89@gmail.com> @unclechu":
         - qm-interpolated-string
@@ -3211,7 +3211,7 @@ packages:
         - servant-exceptions
 
     "Vaibhav Sagar <vaibhavsagar@gmail.com> @vaibhavsagar":
-        - ihaskell
+        - ihaskell < 0 # GHC 8.4 via ghc-boot-8.4.1
         - ghc-parser
 
     "Alexis Williams <alexis@typedr.at> @typedrat":
@@ -3226,7 +3226,7 @@ packages:
         - re2
 
     "Sebastian Graf <sgraf1337@gmail.com> @sgraf812":
-        - pomaps
+        - pomaps < 0 # GHC 8.4 via base-4.11.0.0
 
     "Alexey Kotlyarov <akotlyarov@seek.com.au> @koterpillar":
         []
@@ -3237,9 +3237,9 @@ packages:
         - cassava-records
 
     "Lucas David Traverso <lucas6246@gmail.com> @ludat":
-        - map-syntax
-        - snap
-        - heist
+        - map-syntax < 0 # GHC 8.4 via base-4.11.0.0
+        - heist < 0 # GHC 8.4 via map-syntax
+        - snap < 0 # GHC 8.4 via base-4.11.0.0
 
     "Tim Humphries <tim+stackage@utf8.me> @thumphries":
         - transformers-either
@@ -3249,7 +3249,7 @@ packages:
         - bhoogle
 
     "David Millar-Durrant <dmillardurrant@gmail.com> @DavidM-D":
-        - indexed-list-literals
+        - indexed-list-literals < 0 # GHC 8.4 via base-4.11.0.0
 
     "Dmitry Dzhus <dima@dzhus.org> @dzhus":
         - static-text
@@ -3355,146 +3355,12 @@ packages:
     # These lines are temporary and should ideally be replaced by commenting out
     # the packages at their point of inclusion.
     "Blocked by GHC 8.4":
-        - Frames < 0 # GHC 8.4 via base-4.11.0.0
-        - GPipe < 0 # GHC 8.4 via base-4.11.0.0
-        - NoTrace < 0 # GHC 8.4 via base-4.11.0.0
         - Unique < 0 # GHC 8.4 via base-4.11.0.0
-        - accelerate < 0 # GHC 8.4 via base-4.11.0.0
-        - accelerate-arithmetic < 0 # GHC 8.4 via base-4.11.0.0
-        - accelerate-bignum < 0 # GHC 8.4 via base-4.11.0.0
-        - accelerate-blas < 0 # GHC 8.4 via base-4.11.0.0
-        - accelerate-fft < 0 # GHC 8.4 via base-4.11.0.0
-        - accelerate-fftw < 0 # GHC 8.4 via base-4.11.0.0
-        - accelerate-fourier < 0 # GHC 8.4 via base-4.11.0.0
-        - accelerate-io < 0 # GHC 8.4 via base-4.11.0.0
-        - accelerate-llvm < 0 # GHC 8.4 via base-4.11.0.0
-        - accelerate-llvm-native < 0 # GHC 8.4 via base-4.11.0.0
-        - accelerate-llvm-ptx < 0 # GHC 8.4 via base-4.11.0.0
-        - accelerate-utility < 0 # GHC 8.4 via base-4.11.0.0
-        - active < 0 # GHC 8.4 via base-4.11.0.0
-        - aeson-diff < 0 # GHC 8.4 via base-4.11.0.0
-        - aeson-injector < 0 # GHC 8.4 via base-4.11.0.0
-        - alarmclock < 0 # GHC 8.4 via base-4.11.0.0
-        - ansigraph < 0 # GHC 8.4 via base-4.11.0.0
-        - autoexporter < 0 # GHC 8.4 via base-4.11.0.0
-        - bank-holidays-england < 0 # GHC 8.4 via base-4.11.0.0
-        - benchpress < 0 # GHC 8.4 via base-4.11.0.0
-        - butcher < 0 # GHC 8.4 via base-4.11.0.0
-        - capataz < 0 # GHC 8.4 via base-4.11.0.0
-        - circle-packing < 0 # GHC 8.4 via base-4.11.0.0
-        - colour-accelerate < 0 # GHC 8.4 via base-4.11.0.0
-        - compact < 0 # GHC 8.4 via base-4.11.0.0
-        - country < 0 # GHC 8.4 via base-4.11.0.0
-        - crypt-sha512 < 0 # GHC 8.4 via base-4.11.0.0
         - cryptohash-sha512 < 0 # GHC 8.4 via base-4.11.0.0
-        - css-syntax < 0 # GHC 8.4 via base-4.11.0.0
-        - dictionaries < 0 # GHC 8.4 via base-4.11.0.0
-        - euler-tour-tree < 0 # GHC 8.4 via base-4.11.0.0
-        - exhaustive < 0 # GHC 8.4 via base-4.11.0.0
-        - extensible-effects < 0 # GHC 8.4 via base-4.11.0.0
-        - fast-builder < 0 # GHC 8.4 via base-4.11.0.0
-        - feed < 0 # GHC 8.4 via base-4.11.0.0
-        - force-layout < 0 # GHC 8.4 via base-4.11.0.0
-        - friday-juicypixels < 0 # GHC 8.4 via base-4.11.0.0
-        - generic-random < 0 # GHC 8.4 via base-4.11.0.0
         - ghc-compact < 0 # GHC 8.4 via base-4.11.0.0
-        - github-release < 0 # GHC 8.4 via base-4.11.0.0
-        - github-webhook-handler < 0 # GHC 8.4 via base-4.11.0.0
-        - github-webhook-handler-snap < 0 # GHC 8.4 via base-4.11.0.0
-        - gloss < 0 # GHC 8.4 via base-4.11.0.0
-        - gloss-accelerate < 0 # GHC 8.4 via base-4.11.0.0
-        - gloss-algorithms < 0 # GHC 8.4 via base-4.11.0.0
-        - gloss-raster < 0 # GHC 8.4 via base-4.11.0.0
-        - gloss-raster-accelerate < 0 # GHC 8.4 via base-4.11.0.0
-        - gloss-rendering < 0 # GHC 8.4 via base-4.11.0.0
-        - google-cloud < 0 # GHC 8.4 via base-4.11.0.0
-        - grouped-list < 0 # GHC 8.4 via base-4.11.0.0
-        - hashable-time < 0 # GHC 8.4 via base-4.11.0.0
-        - haskell-lsp < 0 # GHC 8.4 via base-4.11.0.0
-        - hjsonpointer < 0 # GHC 8.4 via base-4.11.0.0
-        - indexed-list-literals < 0 # GHC 8.4 via base-4.11.0.0
-        - json-stream < 0 # GHC 8.4 via base-4.11.0.0
-        - kraken < 0 # GHC 8.4 via base-4.11.0.0
-        - lackey < 0 # GHC 8.4 via base-4.11.0.0
-        - lapack-ffi-tools < 0 # GHC 8.4 via base-4.11.0.0
-        - lens-accelerate < 0 # GHC 8.4 via base-4.11.0.0
-        - lens-labels < 0 # GHC 8.4 via base-4.11.0.0
-        - libinfluxdb < 0 # GHC 8.4 via base-4.11.0.0
-        - libsystemd-journal < 0 # GHC 8.4 via base-4.11.0.0
-        - licensor < 0 # GHC 8.4 via base-4.11.0.0
-        - logging-effect < 0 # GHC 8.4 via base-4.11.0.0
-        - logging-effect-extra < 0 # GHC 8.4 via base-4.11.0.0
-        - logging-effect-extra-file < 0 # GHC 8.4 via base-4.11.0.0
-        - logging-effect-extra-handler < 0 # GHC 8.4 via base-4.11.0.0
-        - map-syntax < 0 # GHC 8.4 via base-4.11.0.0
-        - mole < 0 # GHC 8.4 via base-4.11.0.0
-        - monoid-extras < 0 # GHC 8.4 via base-4.11.0.0
-        - multistate < 0 # GHC 8.4 via base-4.11.0.0
-        - naqsha < 0 # GHC 8.4 via base-4.11.0.0
-        - network-carbon < 0 # GHC 8.4 via base-4.11.0.0
-        - palette < 0 # GHC 8.4 via base-4.11.0.0
-        - partial-semigroup < 0 # GHC 8.4 via base-4.11.0.0
-        - path-text-utf8 < 0 # GHC 8.4 via base-4.11.0.0
-        - pomaps < 0 # GHC 8.4 via base-4.11.0.0
-        - posix-paths < 0 # GHC 8.4 via base-4.11.0.0
         - postgresql-simple < 0 # GHC 8.4 via base-4.11.0.0
         - postgresql-simple-url < 0 # GHC 8.4 via base-4.11.0.0
-        - proto-lens < 0 # GHC 8.4 via base-4.11.0.0
-        - proto-lens-arbitrary < 0 # GHC 8.4 via base-4.11.0.0
-        - proto-lens-descriptors < 0 # GHC 8.4 via base-4.11.0.0
-        - proto-lens-optparse < 0 # GHC 8.4 via base-4.11.0.0
-        - publicsuffix < 0 # GHC 8.4 via base-4.11.0.0
-        - pusher-http-haskell < 0 # GHC 8.4 via base-4.11.0.0
-        - raaz < 0 # GHC 8.4 via base-4.11.0.0
-        - range-set-list < 0 # GHC 8.4 via base-4.11.0.0
-        - ratel < 0 # GHC 8.4 via base-4.11.0.0
-        - ratel-wai < 0 # GHC 8.4 via base-4.11.0.0
-        - regex-applicative-text < 0 # GHC 8.4 via base-4.11.0.0
-        - rest-core < 0 # GHC 8.4 via base-4.11.0.0
-        - rest-types < 0 # GHC 8.4 via base-4.11.0.0
-        - rethinkdb-client-driver < 0 # GHC 8.4 via base-4.11.0.0
-        - schematic < 0 # GHC 8.4 via base-4.11.0.0
-        - sensu-run < 0 # GHC 8.4 via base-4.11.0.0
-        - servant-JuicyPixels < 0 # GHC 8.4 via base-4.11.0.0
-        - servant-generic < 0 # GHC 8.4 via base-4.11.0.0
-        - servant-yaml < 0 # GHC 8.4 via base-4.11.0.0
-        - snap < 0 # GHC 8.4 via base-4.11.0.0
-        - spdx < 0 # GHC 8.4 via base-4.11.0.0
-        - statestack < 0 # GHC 8.4 via base-4.11.0.0
-        - stitch < 0 # GHC 8.4 via base-4.11.0.0
-        - svg-builder < 0 # GHC 8.4 via base-4.11.0.0
-        - tasty-rerun < 0 # GHC 8.4 via base-4.11.0.0
-        - tdigest < 0 # GHC 8.4 via base-4.11.0.0
-        - uri-bytestring-aeson < 0 # GHC 8.4 via base-4.11.0.0
-        - userid < 0 # GHC 8.4 via base-4.11.0.0
-        - vado < 0 # GHC 8.4 via base-4.11.0.0
-        - vcswrapper < 0 # GHC 8.4 via base-4.11.0.0
-        - vector-fftw < 0 # GHC 8.4 via base-4.11.0.0
-        - wavefront < 0 # GHC 8.4 via base-4.11.0.0
-        - apply-refact < 0 # GHC 8.4 via ghc-8.4.1
-        - brittany < 0 # GHC 8.4 via ghc-8.4.1
-        - haskell-tools-prettyprint < 0 # GHC 8.4 via ghc-8.4.1
-        - haskell-tools-rewrite < 0 # GHC 8.4 via ghc-8.4.1
-        - inline-java < 0 # GHC 8.4 via ghc-8.4.1
-        - ihaskell < 0 # GHC 8.4 via ghc-boot-8.4.1
-        - Agda < 0 # GHC 8.4 via template-haskell-2.13.0.0
-        - aeson-extra < 0 # GHC 8.4 via template-haskell-2.13.0.0
-        - boomerang < 0 # GHC 8.4 via template-haskell-2.13.0.0
         - classyplate < 0 # GHC 8.4 via template-haskell-2.13.0.0
-        - czipwith < 0 # GHC 8.4 via template-haskell-2.13.0.0
-        - data-accessor-template < 0 # GHC 8.4 via template-haskell-2.13.0.0
-        - happstack-server < 0 # GHC 8.4 via template-haskell-2.13.0.0
-        - haskell-tools-ast < 0 # GHC 8.4 via template-haskell-2.13.0.0
-        - haskell-tools-backend-ghc < 0 # GHC 8.4 via template-haskell-2.13.0.0
-        - haskell-tools-refactor < 0 # GHC 8.4 via template-haskell-2.13.0.0
-        - monad-mock < 0 # GHC 8.4 via template-haskell-2.13.0.0
-        - servant-swagger-ui < 0 # GHC 8.4 via transformers-compat-0.6.0.6
-        - strive < 0 # GHC 8.4 via template-haskell-2.13.0.0
-        - test-fixture < 0 # GHC 8.4 via template-haskell-2.13.0.0
-        - th-to-exp < 0 # GHC 8.4 via template-haskell-2.13.0.0
-        - web-routes-th < 0 # GHC 8.4 via template-haskell-2.13.0.0
-
-        # missed by first wave
         - ixset-typed < 0 # GHC 8.4 via template-haskell-2.13.0.0
 
         # trans deps, gen 1
@@ -3514,7 +3380,6 @@ packages:
         - wrecker < 0 # GHC 8.4 via ansigraph
         - hastache < 0 # GHC 8.4 via base-4.11.0.0
         - token-bucket < 0 # GHC 8.4 via base-4.11.0.0
-        - web-routes-boomerang < 0 # GHC 8.4 via boomerang
         - uuid < 0 # GHC 8.4 via cryptohash-md5
         - attoparsec-time < 0 # GHC 8.4 via doctest-0.15.0
         - flow < 0 # GHC 8.4 via doctest-0.15.0
@@ -3522,11 +3387,9 @@ packages:
         - download < 0 # GHC 8.4 via feed
         - hint < 0 # GHC 8.4 via ghc-8.4.1
         - happstack-jmacro < 0 # GHC 8.4 via happstack-server
-        - happstack-server-tls < 0 # GHC 8.4 via happstack-server
         - jmacro-rpc-happstack < 0 # GHC 8.4 via happstack-server
         - web-routes-happstack < 0 # GHC 8.4 via happstack-server
         - haskell-lsp-client < 0 # GHC 8.4 via haskell-lsp
-        - hjsonschema < 0 # GHC 8.4 via hjsonpointer
         - IPv6DB < 0 # GHC 8.4 via hspec-2.5.0
         - xmlhtml < 0 # GHC 8.4 via hspec-2.5.0
         - chatwork < 0 # GHC 8.4 via http-api-data-0.3.8.1 hspec-2.5.0
@@ -3540,7 +3403,6 @@ packages:
         - hOpenPGP < 0 # GHC 8.4 via ixset-typed
         - text-generic-pretty < 0 # GHC 8.4 via ixset-typed
         - log-warper < 0 # GHC 8.4 via lifted-async-0.10.0.1
-        - heist < 0 # GHC 8.4 via map-syntax
         - req-url-extra < 0 # GHC 8.4 via modern-uri
         - online < 0 # GHC 8.4 via numhask
         - plot-light < 0 # GHC 8.4 via palette
@@ -3567,7 +3429,6 @@ packages:
         - teardown < 0 # GHC 8.4 via protolude
         - text-generic-pretty < 0 # GHC 8.4 via protolude
         - stack < 0 # GHC 8.4 via regex-applicative-text
-        - rest-snap < 0 # GHC 8.4 via rest-core
         - servant-elm < 0 # GHC 8.4 via servant
         - servant-purescript < 0 # mainland-pretty <- srcloc
         - pipes-text < 0 # GHC 8.4 via streaming-commons-0.2.0.0
@@ -3934,7 +3795,6 @@ skipped-tests:
     - heist # lens 4.16
 
     # Transitive outdated dependencies
-    # These packages
     # These can also be checked for updates periodically.
     - MissingH # via testpack https://github.com/jgoerzen/testpack/issues/11
     - o-clock # tasty 0.12 via tasty-hedgehog
@@ -3944,7 +3804,6 @@ skipped-tests:
     - system-fileio # ansi-terminal-0.8 via chell
     - system-filepath # ansi-terminal-0.8 via chell
 
-
     # Blocked by stackage upper bounds. These can be re-enabled once
     # the relevant stackage upper bound is lifted.
 
@@ -4059,7 +3918,6 @@ expected-test-failures:
     - concurrent-extra # https://github.com/basvandijk/concurrent-extra/issues/12
     - doctest # https://github.com/sol/doctest/issues/198
 
-
     # Intermittent failures or unreliable. These tests may pass when
     # re-enabled, but will eventually fail again. Only remove these
     # from expected-failures if we know a fix has been released.