Make the compilerDeps (hadrian plan-nix) on demand.

Author: hamishmack

build.nix

@@ -26,6 +26,11 @@ in rec {
       } // pkgs.lib.optionalAttrs (ghcFromTo "9.13" "9.14") {
         cabalProjectLocal = builtins.readFile ./test/cabal.project.local;
       });
+    } // pkgs.lib.optionalAttrs (__compareVersions haskell.compiler.${compiler-nix-name}.version "9.4" >= 0) {
+      # Make sure the plan for hadrian is cached (we need it to instanciate ghc).
+      hadrian-plan = pkgs.haskell-nix.compiler.${compiler-nix-name}.hadrian.project.plan-nix;
+      # Also include the same plan evaluated on the eval system (probably x86_64-linux).
+      hadrian-plan-eval = (pkgs.haskell-nix.compiler.${compiler-nix-name}.override { hadrianEvalPackages = evalPackages; }).hadrian.project.plan-nix;
     } // pkgs.lib.optionalAttrs (__compareVersions haskell.compiler.${compiler-nix-name}.version "9.8" < 0) {
       hlint-latest = tool compiler-nix-name "hlint" {
         inherit evalPackages;

compiler/ghc/default.nix

@@ -85,6 +85,8 @@ let self =
 
 # extra values we want to have available as passthru values.
 , extra-passthru ? {}
+
+, hadrianEvalPackages ? buildPackages
 }@args:
 
 assert !(enableIntegerSimple || enableNativeBignum) -> gmp != null;
@@ -262,6 +264,7 @@ let
     buildPackages.haskell-nix.tool compiler-nix-name "hadrian" {
       compilerSelection = p: p.haskell.compiler;
       index-state = buildPackages.haskell-nix.internalHackageIndexState;
+      evalPackages = hadrianEvalPackages;
       modules = [{
         reinstallableLibGhc = false;
         # Apply the patches in a way that does not require using something
@@ -370,7 +373,7 @@ let
   };
 
 in
-stdenv.mkDerivation (rec {
+haskell-nix.haskellLib.makeCompilerDeps (stdenv.mkDerivation (rec {
   version = ghc-version;
   name = "${targetPrefix}ghc-${version}" + lib.optionalString (useLLVM) "-llvm";
 
@@ -658,7 +661,7 @@ stdenv.mkDerivation (rec {
     '';
 
   passthru = {
-    inherit bootPkgs targetPrefix libDir llvmPackages enableShared useLLVM;
+    inherit bootPkgs targetPrefix libDir llvmPackages enableShared useLLVM hadrian;
 
     # Our Cabal compiler name
     haskellCompilerName = "ghc-${version}";
@@ -896,5 +899,5 @@ stdenv.mkDerivation (rec {
         cd ../../..
         runHook postInstall
       '';
-});
+}));
 in self

lib/make-compiler-deps.nix

@@ -1,6 +1,5 @@
 { lib, runCommand }:
-let
-  makeCompilerDeps = ghc: ghc // {
+ghc: ghc // {
     cachedDeps = runCommand "${ghc.name}-deps" {}
       # First checks that ghc-pkg runs first with `--version` as failures in the `for` and
       # `if` statements will be masked.
@@ -34,9 +33,4 @@ let
         fi
       done
       '';
-  } // lib.optionalAttrs (ghc ? dwarf) {
-    dwarf = makeCompilerDeps ghc.dwarf;
-  } // lib.optionalAttrs (ghc ? smallAddressSpace) {
-    smallAddressSpace = makeCompilerDeps ghc.smallAddressSpace;
-  };
-in makeCompilerDeps
+  }

overlays/cache-compiler-deps.nix

@@ -1,7 +1,4 @@
 final: prev: {
-  haskell-nix = prev.haskell-nix // {
-      compiler = __mapAttrs (_: ghc: final.haskell-nix.haskellLib.makeCompilerDeps ghc) prev.haskell-nix.compiler;
-  };
   haskell = prev.haskell // {
       compiler = __mapAttrs (name: ghc: final.haskell-nix.haskellLib.makeCompilerDeps ghc // {
         inherit (final.haskell-nix.compiler.${name}) raw-src configured-src;