@@ -692,8 +692,12 @@ final: prev: {
692692 final.ghc-extra-projects.${compiler-nix-name}.plan-nix;
693693 } // final.lib.optionalAttrs (ifdLevel > 1) {
694694 # Things that require two levels of IFD to build (inputs should be in level 1)
695+ # The internal versions of nix-tools and cabal-install are occasionally used,
696+ # but definitely need to be cached in case they are used.
695697 nix-tools = final.buildPackages.haskell-nix.nix-tools.${compiler-nix-name};
698+ internal-nix-tools = final.buildPackages.haskell-nix.internal-nix-tools;
696699 cabal-install = final.buildPackages.haskell-nix.cabal-install.${compiler-nix-name};
700+ internal-cabal-install = final.buildPackages.haskell-nix.internal-cabal-install;
697701 } // final.lib.optionalAttrs (ifdLevel > 1 && !final.stdenv.hostPlatform.isGhcjs) {
698702 # GHCJS builds its own template haskell runner.
699703 # These seem to be the only things we use from `ghc-extra-packages`