Expected kind ‘* -> *’, but ‘Code Q’ has kind ‘* -> *’

Summary

Trying to build pkgsCross.ghcjs.buildPackages.haskell.compiler.ghcHEAD from nixpkgs after bumping ghcHEAD past !9779 (closed) results in the following error:

Command line: _build/stage0/bin/javascript-unknown-ghcjs-ghc -Wall -Wcompat -hisuf hi -osuf o -hcsuf hc -static -hide-all-packages -no-user-package-db '-package-env -' '-package-db _build/stage1/inplace/package.conf.d' '-this-unit-id template-haskell-2.20.0.0-inplace' '-package-id base-4.18.0.0-inplace' '-package-id ghc-boot-th-9.7-inplace' '-package-id ghc-prim-0.10.0-inplace' '-package-id pretty-1.1.3.6-inplace' -i -i/build/ghc-ecdc435/_build/stage1/libraries/template-haskell/build -i/build/ghc-ecdc435/_build/stage1/libraries/template-haskell/build/autogen -i/build/ghc-ecdc435/libraries/template-haskell/vendored-filepath -i/build/ghc-ecdc435/libraries/template-haskell -Irts/include -I_build/stage1/libraries/template-haskell/build -I/build/ghc-ecdc435/libraries/base/include -I/build/ghc-ecdc435/_build/stage1/libraries/base/build/include -I/build/ghc-ecdc435/libraries/ghc-bignum/include/ -I/build/ghc-ecdc435/_build/stage1/libraries/ghc-bignum/build/include/ -I/build/ghc-ecdc435/rts/include -I/build/ghc-ecdc435/_build/stage1/rts/build/include -optP-include -optP_build/stage1/libraries/template-haskell/build/autogen/cabal_macros.h -optc-Qunused-arguments -outputdir _build/stage1/libraries/template-haskell/build -fdiagnostics-color=always -Wall -this-unit-id template-haskell -XHaskell2010 -XImplicitPrelude -no-global-package-db -package-db=/build/ghc-ecdc435/_build/stage1/inplace/package.conf.d -ghcversion-file=rts/include/ghcversion.h -ghcversion-file=rts/include/ghcversion.h -Wnoncanonical-monad-instances -optc-Wno-unknown-pragmas -optP-Wno-nonportable-include-path -c libraries/template-haskell/Language/Haskell/TH/Lib/Internal.hs -o _build/stage1/libraries/template-haskell/build/Language/Haskell/TH/Lib/Internal.o -fsplit-sections -O -H64m -O2 -haddock -fPIC -fexternal-dynamic-refs -Wno-deprecated-flags
===> Command failed with error code: 1

libraries/template-haskell/Language/Haskell/TH/Lib/Internal.hs:39:14: error: [GHC-83865]
    • Expected kind ‘* -> *’, but ‘Code Q’ has kind ‘* -> *’
    • In the type ‘Code Q’
      In the type declaration for ‘CodeQ’
   |
39 | type CodeQ = Code Q
   |   

Full build logs: https://f.monade.li/H4kbyz

I'm still bisecting to find the exact commit that introduced this. 8185b1c2 is good, ecdc4353 is bad.