Fix hadrianEvalPackages

Author: hamishmack

ci.nix

@@ -121,8 +121,9 @@ 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' compiler-nix-name ifdLevel // {
+            ghc = pkgs.buildPackages.haskell-nix.compiler.${compiler-nix-name}.override { hadrianEvalPackages = evalPackages; };
+          };
         } // pkgs.lib.optionalAttrs runTests {
           inherit (build) tests tools maintainer-scripts maintainer-script-cache;
         } // pkgs.lib.optionalAttrs (ifdLevel >= 3) rec {
@@ -142,8 +143,9 @@ 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;
-            ghc = pkgs.buildPackages.haskell-nix.compiler.${compiler-nix-name}.override { hadrianEvalPackages = evalPackages; };
+            roots = pkgs.haskell-nix.roots' compiler-nix-name ifdLevel // {
+              ghc = pkgs.buildPackages.haskell-nix.compiler.${compiler-nix-name}.override { hadrianEvalPackages = evalPackages; };
+            };
             # TODO: look into cross compiling ghc itself
             # ghc = pkgs.haskell-nix.compiler.${compiler-nix-name};
             # TODO: look into making tools work when cross compiling

compiler/ghc/default.nix

@@ -284,8 +284,8 @@ let
       cabalProjectFreeze = null;
       src = haskell-nix.haskellLib.cleanSourceWith {
         src = {
-          outPath = hadrianEvalPackages.srcOnly {
-            stdenv = hadrianEvalPackages.stdenvNoCC;
+          outPath = buildPackages.srcOnly {
+            stdenv = buildPackages.stdenvNoCC;
             name = "hadrian";
             inherit src;
           };
@@ -757,7 +757,9 @@ haskell-nix.haskellLib.makeCompilerDeps (stdenv.mkDerivation (rec {
     smallAddressSpace = lib.makeOverridable self (args // {
       disableLargeAddressSpace = true;
     });
-  } // extra-passthru;
+  } // extra-passthru // {
+    buildGHC = extra-passthru.buildGHC.override { inherit hadrianEvalPackages; };
+  };
 
   meta = {
     homepage = "https://haskell.org/ghc";

lib/call-cabal-project-to-nix.nix

@@ -63,6 +63,7 @@
 , ignorePackageYaml ? false # Ignore package.yaml files even if they exist
 , ...
 }@args:
+assert (evalPackages.system != "x86_64-darwin" || materialized != null);
 let
   inherit (evalPackages.haskell-nix) materialize dotCabal;
 

modules/cabal-project.nix

@@ -22,7 +22,7 @@ in {
     };
     compilerSelection = mkOption {
       type = unspecified;
-      default = p: p.haskell-nix.compiler;
+      default = p: builtins.mapAttrs (_: x: x.override { hadrianEvalPackages = config.evalPackages; }) p.haskell-nix.compiler;
       description = "Use GHC from pkgs.haskell instead of pkgs.haskell-nix";
     };
     index-state = mkOption {