Skip to content

Commit 04fa591

Browse files
authored
Fix building of GHC 9.4 (#2400)
This was broken by the removal of the index-state pin for hadrian in #2268
1 parent 58cfeb9 commit 04fa591

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

compiler/ghc/default.nix

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ let
272272
then "ghc964"
273273
else "ghc962";
274274
in
275-
buildPackages.haskell-nix.cabalProject' {
275+
buildPackages.haskell-nix.cabalProject' ({
276276
inherit compiler-nix-name;
277277
name = "hadrian";
278278
compilerSelection = p: p.haskell.compiler;
@@ -316,7 +316,9 @@ let
316316
subDir = "hadrian";
317317
includeSiblings = true;
318318
};
319-
};
319+
} // lib.optionalAttrs (builtins.compareVersions ghc-version "9.6" < 0) {
320+
index-state = "2024-10-17T00:00:00Z";
321+
});
320322

321323
hadrian = hadrianProject.hsPkgs.hadrian.components.exes.hadrian;
322324

0 commit comments

Comments
 (0)