From 471653824c1d2bf42f107c3f7942ba0d72aa7951 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 19 Apr 2022 12:02:01 +0200 Subject: [PATCH] pkgsMusl.haskell.compiler.ghc884: bootstrap using normal binary ghc On non-arm platforms there's no reason to use the minimal GHC for musl bootstrapping, as it doesn't hit the size limit. Additionally this serves as a wonky workaround for ghc#21402 [1], as the minimal GHC 8.10.2 binary currently contains `xxx` in its `outPath`. [1]: https://gitlab.haskell.org/ghc/ghc/-/issues/21402 --- pkgs/top-level/haskell-packages.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c040e8c722ac..c46a7f1bcd24 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -79,9 +79,12 @@ in { ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix { bootPkgs = # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar - # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them - if stdenv.isAarch64 || stdenv.hostPlatform.isMusl then + # 8.10.2 is needed as using 8.10.7 is broken due to RTS-incompatibilities + if stdenv.isAarch64 then packages.ghc8102BinaryMinimal + # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them + else if stdenv.hostPlatform.isMusl then + packages.ghc8102Binary else packages.ghc865Binary; inherit (buildPackages.python3Packages) sphinx;