diff --git a/build-constraints.yaml b/build-constraints.yaml
index 862d20cc..204ce2c6 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -432,7 +432,7 @@ packages:
         - ghc-exactprint
         - haskell-lsp
         - hjsmin
-        - language-javascript
+        # - language-javascript # build failure with GHC 8.4 https://github.com/erikd/language-javascript/issues/67
         - Strafunski-StrategyLib
 
     "Alfredo Di Napoli <alfredo.dinapoli@gmail.com> @adinapoli":
@@ -3287,6 +3287,7 @@ packages:
         - hpqtypes < 0 # build failure with GHC 8.4 https://github.com/scrive/hpqtypes/issues/7
         - hw-fingertree-strict < 0 # build failure with GHC 8.4 https://hub.darcs.net/ross/fingertree/issue/5
         - inline-c < 0 # build failure with GHC 8.4 https://github.com/fpco/inline-c/issues/73
+        - language-javascript < 0 # build failure with GHC 8.4 https://github.com/erikd/language-javascript/issues/67
         - list-t < 0 # build failure with GHC 8.4 # https://github.com/nikita-volkov/list-t/issues/12
         - monoid-subclasses < 0 # build failure with GHC 8.4 https://github.com/blamario/monoid-subclasses/issues/16
         - n-tuple < 0 # build failure with GHC 8.4 https://github.com/athanclark/n-tuple/issues/1
@@ -3436,7 +3437,6 @@ packages:
         - direct-sqlite < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build
         - groundhog < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build
         - hjsmin < 0 # DependencyFailed (PackageName "language-javascript")
-        - language-javascript < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build
         - sqlite-simple < 0 # DependencyFailed (PackageName "direct-sqlite")
         - wai-route < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build
         - wai-routing < 0 # DependencyFailed (PackageName "wai-route")
@@ -3940,18 +3940,8 @@ packages:
         - xmonad-contrib < 0 # GHC 8.4 via xmonad
         - yesod-auth-fb < 0 # GHC 8.4 via yesod-auth
         - yesod-auth-hashdb < 0 # GHC 8.4 via yesod-auth
-        - hledger-web < 0 # GHC 8.4 via yesod-form
-        - yesod < 0 # GHC 8.4 via yesod-form
-        - yesod-auth-hashdb < 0 # GHC 8.4 via yesod-form
-        - yesod-form-bootstrap4 < 0 # GHC 8.4 via yesod-form
-        - yesod < 0 # GHC 8.4 via yesod-persistent
-        - yesod-auth-hashdb < 0 # GHC 8.4 via yesod-persistent
         - classy-prelude-yesod < 0 # GHC 8.4 via yesod-static
         - hledger-web < 0 # GHC 8.4 via yesod-static
-        - hledger-web < 0 # GHC 8.4 via yesod-test
-        - yesod-auth-hashdb < 0 # GHC 8.4 via yesod-test
-        - yesod-csp < 0 # GHC 8.4 via yesod-test
-        - yesod-paginator < 0 # GHC 8.4 via yesod-test
         - ipython-kernel < 0 # GHC 8.4 via zeromq4-haskell
         - HsOpenSSL-x509-system < 0 # GHC 8.4 via HsOpenSSL
         - mysql-haskell-openssl < 0 # GHC 8.4 via HsOpenSSL
@@ -4331,7 +4321,6 @@ packages:
         - xml-isogen < 0 # GHC 8.4 via dom-parser
         - kdt < 0 # GHC 8.4 via heap
         - yesod-static < 0 # GHC 8.4 via hjsmin
-        - yesod-static < 0 # GHC 8.4 via yesod-test
         - google-oauth2-jwt < 0 # GHC 8.4 via RSA
         - urlpath < 0 # GHC 8.4 via attoparsec-uri
         - urlpath < 0 # GHC 8.4 via monad-control-aligned
@@ -4366,6 +4355,7 @@ packages:
         - jmacro < 0 # GHC 8.4 via wl-pprint-text
         - exception-mtl < 0 # GHC 8.4 via exception-transformers
         - language-c-quote < 0 # GHC 8.4 via exception-transformers
+        - yesod-form-bootstrap4 < 0 # GHC 8.4 via classy-prelude-yesod
 
 
     "GHC upper bounds":