Merge remote-tracking branch 'origin/master' into regen-bounds

build-constraints.yaml

@@ -4496,7 +4496,12 @@ packages:
         - egison-pattern-src-th-mode
 
     "Travis Cardwell <travis.cardwell@extrema.is> @TravisCardwell":
+        - bm
+        - horizontal-rule
         - literatex
+        - phatsort
+        - queue-sheet
+        - redact
         - ttc
 
     "Jasper Woudenberg <mail@jasperwoudenberg.com> @jwoudenberg":
@@ -4768,6 +4773,9 @@ packages:
         - data-default-instances-unordered-containers
         - data-default-instances-vector
 
+    "David Spies <dnspies@gmail.com> @davidspies":
+        - fastmemo
+
     "comp <onecomputer00@gmail.com> @1Computer1":
         - errata
         - reorder-expression
@@ -6905,6 +6913,9 @@ packages:
       # https://github.com/commercialhaskell/stackage/issues/6478
       - tasty-hedgehog < 1.2
 
+      # https://github.com/commercialhaskell/stackage/issues/6480
+      - cryptonite < 0.30
+
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of