From 628d864ba292690ad6a7ccfa76f9ed24c641242e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 23 Sep 2021 15:52:48 +0200 Subject: [PATCH] haskell.compiler.ghc8107: always self-bootstrap Allows us to get rid of the musl special-casing. --- pkgs/top-level/haskell-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f54dfe87854b..bdff57d177f9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -88,10 +88,10 @@ in { # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar # the oldest ghc with aarch64-darwin support is 8.10.5 # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them - if stdenv.isAarch64 || stdenv.isAarch32 || stdenv.targetPlatform.isMusl then + if stdenv.isAarch64 || stdenv.isAarch32 then packages.ghc8107BinaryMinimal else - packages.ghc865Binary; + packages.ghc8107Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and