diff --git a/build-constraints.yaml b/build-constraints.yaml
index b0e792ac..26dcd5e1 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -296,8 +296,8 @@ packages:
         - openexr-write
 
     "Pasqualino Assini <tittoassini@gmail.com> @tittoassini":
-        # - zm # haskell-src-exts via derive
-        # - flat # haskell-src-exts via derive
+        # - zm
+        - flat
         - model < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build
 
     "Jose Iborra <pepeiborra@gmail.com> @pepeiborra":
@@ -310,7 +310,7 @@ packages:
         - floatshow
         - NoHoed
         - threepenny-editors < 0 # GHC 8.4
-        # - clr-inline # haskell-src-exts via here # possibly nondeterministic failures, see https://github.com/fpco/stackage/issues/2510
+        - clr-inline
         - strict-types < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build
 
     "Roman Gonzalez <open-source@roman-gonzalez.info> @roman":
@@ -524,7 +524,7 @@ packages:
         - fusion-plugin < 0 # ghc-8.8.3
 
     "Aleksey Uimanov <s9gf4ult@gmail.com> @s9gf4ult":
-        # - postgresql-query # haskell-src-exts via derive
+        - postgresql-query
         - hreader
         - hset
 
@@ -1262,8 +1262,8 @@ packages:
         # - rest-client # http-types 0.12
         - 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-gen
+        # - rest-happstack # containers
         - rest-stringmap < 0 # via aeson-1.4.0.0
         - rest-types < 0 # GHC 8.4 via base-4.11.0.0
         # - rest-wai # http-types 0.12
@@ -2341,7 +2341,7 @@ packages:
         - Spock-lucid < 0 # GHC 8.4 via Spock
         - charsetdetect-ae
         # - text-all # text-1.2.3.0
-        - fmt < 0 # via doctest-discover
+        - fmt
 
     "Takano Akio tak@anoak.io @takano-akio":
         - fast-builder < 0 # via true-name
@@ -2609,10 +2609,9 @@ packages:
 
     "Takahiro Himura <himuratk421@gmail.com> @himura":
         - lens-regex
-        # haskell-src-exts via derive
-        # - twitter-conduit
-        # - twitter-types
-        # - twitter-types-lens
+        - twitter-conduit
+        - twitter-types
+        - twitter-types-lens
 
     "Robbin C. <robbinch33@gmail.com> @robbinch":
         - zim-parser
@@ -2705,17 +2704,17 @@ packages:
 
     "Jeremy Shaw <jeremy@n-heptane.com> @stepcut":
         - boomerang < 0 # GHC 8.4 via template-haskell-2.13.0.0
-        # - happstack-hsp # haskell-src-exts via hsx2hs
+        # - happstack-hsp # harp
         - happstack-jmacro < 0 # GHC 8.4 via happstack-server
-        - happstack-server < 0
+        - happstack-server
         - happstack-server-tls < 0 # GHC 8.4 via happstack-server
         - hsx-jmacro < 0
         - ixset < 0 # GHC 8.4 via syb-with-class
-        - reform < 0 # build failure with GHC 8.4
-        - reform-blaze < 0 # GHC 8.4 via reform
-        - reform-hamlet < 0 # GHC 8.4 via reform
-        - reform-happstack < 0 # GHC 8.4 via happstack-server
-        # - reform-hsp # haskell-src-exts via hsx2hs
+        - reform
+        - reform-blaze
+        - reform-hamlet
+        - reform-happstack
+        # - reform-hsp # hsx2hs
         - userid < 0 # GHC 8.4 via base-4.11.0.0
         - web-plugins < 0
         - web-routes < 0 # via http-types
@@ -2862,7 +2861,7 @@ packages:
     "Mikhail Glushenkov <mikhail.glushenkov@gmail.com> @23Skidoo":
         # - Cabal take the one that ships with GHC
         - cabal-install < 0 # via base-4.13.0.0
-        # - pointful # haskell-src-exts
+        # - pointful # haskell-src-exts-simple
 
     "Lennart Kolmodin <kolmodin@gmail.com> @kolmodin":
         - binary-bits < 0 # MonadFail
@@ -3602,7 +3601,7 @@ packages:
         - listsafe
 
     "Serokell <hi@serokell.io> @serokell":
-        # - importify # haskell-src-exts via haskell-names
+        # - importify
         - log-warper < 0 # GHC 8.4 via lifted-async-0.10.0.1
         - o-clock
         - universum