diff --git a/build-constraints.yaml b/build-constraints.yaml
index 31c1666c..664011d1 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -338,10 +338,11 @@ packages:
         - essence-of-live-coding-warp
         - finite-typelits
         - has-transformers
+        - monad-schedule
         - pulse-simple
         - rhine
         - rhine-gloss
-        - simple-affine-space
+        - simple-affine-space < 0.2 # https://github.com/commercialhaskell/stackage/issues/6739
         - time-domain
 
     "Paul Johnson <paul@cogito.org.uk> @PaulJohnson":
@@ -701,7 +702,7 @@ packages:
         - fusion-plugin
 
     "Adithya Kumar <adi.obilisetty@gmail.com> @adithyaov":
-        - unicode-data
+        - unicode-data < 0.4.0 # https://github.com/commercialhaskell/stackage/issues/6741
 
     "Aleksey Uimanov <s9gf4ult@gmail.com> @s9gf4ult":
         - postgresql-query
@@ -832,7 +833,7 @@ packages:
         - githash
 
         - time-manager
-        - pantry
+        - pantry < 0.6.0 # https://github.com/commercialhaskell/stackage/issues/6742
         - mega-sdist
         - http-download
         - hi-file-parser
@@ -1122,7 +1123,7 @@ packages:
         - monad-parallel
         - monad-coroutine
         - monoid-subclasses
-        - rank2classes
+        - rank2classes        < 1.4.5 # https://github.com/commercialhaskell/stackage/issues/6737
         - input-parsers
         - incremental-parser
         - construct
@@ -1392,6 +1393,7 @@ packages:
 
     "Joachim Breitner <mail@joachim-breitner.de> @nomeata":
         - arbtt
+        - rec-def
         - bytestring-progress # dependency of arbtt
         - circle-packing
         - haskell-spacegoo
@@ -2426,7 +2428,7 @@ packages:
     "Daniel Cartwright <chessai1996@gmail.com> @chessai":
         - streaming
         - streaming-bytestring
-        - country
+        - country < 0.2.3.1 # https://github.com/commercialhaskell/stackage/issues/6740
         - semirings
         - torsor
         - chronos
@@ -2500,6 +2502,9 @@ packages:
         - monad-peel
         - NineP
         - Network-NineP
+        - pontarius-xmpp
+        - stringprep
+        - ranges
 
     "Antoni Silvestre <antoni.silvestre@gmail.com> @asilvestre":
         # Test suite needs a running neo4j server with auth disabled
@@ -3385,6 +3390,7 @@ packages:
         - tasty-bench
         - tasty-inspection-testing
         - text-rope
+        - data-array-byte
 
     "Ashley Yakeley <ashley@semantic.org> @AshleyYakeley":
         - countable
@@ -4552,13 +4558,13 @@ packages:
         - minimal-configuration
 
     "Davit Nalchevanidze <d.nalchevanidze@gmail.com> @nalchevanidze":
-        - morpheus-graphql
-        - morpheus-graphql-core
-        - morpheus-graphql-client
-        - morpheus-graphql-subscriptions
-        - morpheus-graphql-app
-        - morpheus-graphql-code-gen
-        - morpheus-graphql-tests
+        - morpheus-graphql                < 0.22.0 # https://github.com/commercialhaskell/stackage/issues/6738
+        - morpheus-graphql-core           < 0.22.0 # https://github.com/commercialhaskell/stackage/issues/6738
+        - morpheus-graphql-client         < 0.22.0 # https://github.com/commercialhaskell/stackage/issues/6738
+        - morpheus-graphql-subscriptions  < 0.22.0 # https://github.com/commercialhaskell/stackage/issues/6738
+        - morpheus-graphql-app            < 0.22.0 # https://github.com/commercialhaskell/stackage/issues/6738
+        - morpheus-graphql-code-gen       < 0.22.0 # https://github.com/commercialhaskell/stackage/issues/6738
+        - morpheus-graphql-tests          < 0.22.0 # https://github.com/commercialhaskell/stackage/issues/6738
 
     "Satoshi Egi <egi@egison.org> @egisatoshi":
         - backtracking
@@ -9380,6 +9386,7 @@ expected-test-failures:
     - hgeometry-combinatorial # 0.14
     - hpack # 0.35 https://github.com/commercialhaskell/stackage/issues/6725
     - hruby # 0.5.0.0
+    - hspec-contrib # 0.5.1.1 https://github.com/commercialhaskell/stackage/issues/6733
     - hspec-golden-aeson # 0.9.0.0
     - justified-containers # 0.3.0.0
     - jwt # 0.11.0
@@ -9500,6 +9507,7 @@ expected-test-failures:
     - vivid-supercollider # 0.4.1.2 https://github.com/commercialhaskell/stackage/issues/4250
     - xml-html-qq # 0.1.0.1
     - xmlgen # 0.6.2.2 https://github.com/skogsbaer/xmlgen/issues/6
+    - pontarius-xmpp # 0.5.6.5
 
     # Recursive deps https://github.com/fpco/stackage/issues/1818
     - options