Move hadrian plans into the project roots

Author: hamishmack

build.nix

@@ -26,11 +26,6 @@ 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}.hadrianProject.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; }).hadrianProject.plan-nix;
     } // pkgs.lib.optionalAttrs (__compareVersions haskell.compiler.${compiler-nix-name}.version "9.8" < 0) {
       hlint-latest = tool compiler-nix-name "hlint" {
         inherit evalPackages;

ci.nix

@@ -121,9 +121,7 @@ dimension "Nixpkgs version" nixpkgsVersions (nixpkgsName: pinnedNixpkgsSrc:
         # Native builds
         # TODO: can we merge this into the general case by picking an appropriate "cross system" to mean native?
         native = pkgs.recurseIntoAttrs ({
-          roots = pkgs.haskell-nix.roots' compiler-nix-name ifdLevel // {
-            ghc = pkgs.buildPackages.haskell-nix.compiler.${compiler-nix-name}.override { hadrianEvalPackages = evalPackages; };
-          };
+          roots = pkgs.haskell-nix.roots' { inherit compiler-nix-name evalPackages; } ifdLevel
         } // pkgs.lib.optionalAttrs runTests {
           inherit (build) tests tools maintainer-scripts maintainer-script-cache;
         } // pkgs.lib.optionalAttrs (ifdLevel >= 3) rec {
@@ -143,7 +141,7 @@ dimension "Nixpkgs version" nixpkgsVersions (nixpkgsName: pinnedNixpkgsSrc:
         let pkgs = import pinnedNixpkgsSrc (nixpkgsArgs // { inherit system crossSystem; });
             build = import ./build.nix { inherit pkgs evalPackages ifdLevel compiler-nix-name haskellNix; };
         in pkgs.recurseIntoAttrs (pkgs.lib.optionalAttrs (ifdLevel >= 1) ({
-            roots = pkgs.haskell-nix.roots' compiler-nix-name ifdLevel // {
+            roots = pkgs.haskell-nix.roots' { inherit compiler-nix-name evalPackages; } ifdLevel // {
               ghc = pkgs.buildPackages.haskell-nix.compiler.${compiler-nix-name}.override { hadrianEvalPackages = evalPackages; };
             };
             # TODO: look into cross compiling ghc itself

overlays/haskell.nix

@@ -705,7 +705,7 @@ final: prev: {
                   inherit (callProjectResults) index-state-max;
                   tool = final.buildPackages.haskell-nix.tool' evalPackages pkg-set.config.compiler.nix-name;
                   tools = final.buildPackages.haskell-nix.tools' evalPackages pkg-set.config.compiler.nix-name;
-                  roots = final.haskell-nix.roots pkg-set.config.compiler.nix-name;
+                  roots = final.haskell-nix.roots { inherit (pkg-set.config) compiler.nix-name; inherit evalPackages; }
                   projectFunction = haskell-nix: haskell-nix.cabalProject';
                   inherit projectModule buildProject;
                 };
@@ -966,7 +966,7 @@ final: prev: {
                   stack-nix = callProjectResults.projectNix;
                   tool = final.buildPackages.haskell-nix.tool' evalPackages pkg-set.config.compiler.nix-name;
                   tools = final.buildPackages.haskell-nix.tools' evalPackages pkg-set.config.compiler.nix-name;
-                  roots = final.haskell-nix.roots pkg-set.config.compiler.nix-name;
+                  roots = final.haskell-nix.roots { inherit (pkg-set.config) compiler.nix-name; inherit evalPackages; }
                   projectFunction = haskell-nix: haskell-nix.stackProject';
                   inherit projectModule buildProject;
                 };
@@ -1082,28 +1082,31 @@ final: prev: {
         # are tested and cached. Consider using `p.roots` where `p` is a
         # project as it will automatically match the `compiler-nix-name`
         # of the project.
-        roots = compiler-nix-name: final.linkFarm "haskell-nix-roots-${compiler-nix-name}"
+        roots = { compiler-nix-name, evalPackages ? final.pkgsBuildBuild }: final.linkFarm "haskell-nix-roots-${compiler-nix-name}"
           (final.lib.filter (x: x.name != "recurseForDerivations")
             (final.lib.mapAttrsToList (name: path: { inherit name path; })
               (roots' compiler-nix-name 2)));
 
-        roots' = compiler-nix-name: ifdLevel:
+        roots' = { compiler-nix-name, evalPackages ? final.pkgsBuildBuild }: ifdLevel: evalPackages:
+          let
+            ghc = final.buildPackages.haskell-nix.compiler.${compiler-nix-name}.override { hadrianEvalPackages = evalPackages; };
+          in
           	final.recurseIntoAttrs ({
             # Things that require no IFD to build
             source-pin-hackage = hackageSrc;
             source-pin-stackage = stackageSrc;
             source-pin-haskell-nix = final.path;
-            # Double buildPackages is intentional,
-            # see comment in lib/default.nix for details.
-            # Using buildPackages rather than evalPackages so both darwin and linux
-            # versions will get pinned (evalPackages on darwin systems will be for darwin).
-            inherit (final.buildPackages.buildPackages) gitMinimal nix-prefetch-git;
-            inherit (final.buildPackages) nix;
+            inherit (evalPackages) nix gitMinimal nix-prefetch-git;
           } // final.lib.optionalAttrs (final.stdenv.hostPlatform.libc == "glibc") {
             inherit (final) glibcLocales;
+          } // pkgs.lib.optionalAttrs (builtins.compareVersions ghc.version "9.4" >= 0) {
+            # Make sure the plan for hadrian is cached (we need it to instanciate ghc).
+            hadrian-plan = final.buildPackages.haskell-nix.compiler.${compiler-nix-name}.hadrianProject.plan-nix;
+            # Also include the same plan evaluated on the eval system.
+            hadrian-plan-eval = ghc.hadrianProject.plan-nix;
           } // final.lib.optionalAttrs (ifdLevel > 0) {
             # Things that require one IFD to build (the inputs should be in level 0)
-            ghc = final.buildPackages.haskell-nix.compiler.${compiler-nix-name};
+            inherit ghc;
             ghc-boot-packages-nix = final.recurseIntoAttrs
               final.ghc-boot-packages-nix.${compiler-nix-name};
           } // final.lib.optionalAttrs (ifdLevel > 1) {