haskell.compiler.ghcHEAD: 9.11.20240423 -> 9.13.20241031

Unfortunately, it won't be possible to build 9.12 nor, in all
likelihood, 9.14 with Cabal 3.12 or 3.14 (which are shipped with GHC 9.8
and 9.10, respectively) due to
<145a647785>.
Since this has been confirmed by upstream, we'll have to bite the bullet
and adjust our hadrian bootstrapping logic to deal with that.
Fortunately, we at least have gotten a hackage released version of Cabal
3.14, so we don't need to bootstrap from an in tree Cabal version.
This commit is contained in:
sternenseemann 2024-11-01 12:46:35 +01:00
parent 71b09ef331
commit c409770da8
2 changed files with 6 additions and 3 deletions

View File

@ -1,5 +1,5 @@
import ./common-hadrian.nix {
version = "9.11.20240423";
rev = "dddc9dff0547733a10e7f505612ab9df3a7c21b6";
sha256 = "0993sdmzzyymllck8mcpa1zgrjqjfxcvk1ykvfc18bvbs4145cm9";
version = "9.13.20241031";
rev = "0b11cdc022ce33d089db95b2b2e7c1f4bb326d37";
sha256 = "0kqnpcgv49ricbr950lffs8gx7jrcg6anzc0qvwy5pb518w0d37i";
}

View File

@ -52,4 +52,7 @@ callPackage' ./hadrian.nix ({
# to build hadrian. (Hackage-released conditional dependencies are handled
# in ./hadrian.nix without requiring intervention here.)
inherit ghc-platform ghc-toolchain;
} // lib.optionalAttrs (lib.versionAtLeast ghcVersion "9.11") {
# See https://gitlab.haskell.org/ghc/ghc/-/commit/145a6477854d4003a07573d5e7ffa0c9a64ae29c
Cabal = bootPkgs.Cabal_3_14_0_0;
})