From b0a42925f191a3900932e47565f960893b11012d Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 18 Jul 2021 15:17:02 +0900 Subject: [PATCH] release-haskell: stop building musl integer-simple GHCs integer-simple GHCs appear to be broken when linking against musl and non-static-linking. --- pkgs/top-level/release-haskell.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index c2e81ddbb428..55824ff10001 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -94,13 +94,6 @@ let nixosTests.agda = (packagePlatforms pkgs.nixosTests).agda; agdaPackages = packagePlatforms pkgs.agdaPackages; - pkgsMusl.haskell.compiler = packagePlatforms pkgs.pkgsMusl.haskell.compiler // { - # remove musl ghc865Binary since it is known to be broken and - # causes an evaluation error on darwin. - # TODO: remove ghc865Binary altogether and use ghc8102Binary - ghc865Binary = {}; - }; - # top-level packages that depend on haskellPackages inherit (pkgsPlatforms) agda @@ -208,6 +201,18 @@ let elmPackages.elm = pkgsPlatforms.elmPackages.elm; + # GHCs linked to musl. + pkgsMusl.haskell.compiler = packagePlatforms pkgs.pkgsMusl.haskell.compiler // { + # remove musl ghc865Binary since it is known to be broken and + # causes an evaluation error on darwin. + # TODO: remove ghc865Binary altogether and use ghc8102Binary + ghc865Binary = {}; + + # remove integer-simple because it appears to be broken with + # musl and non-static-linking. + integer-simple = {}; + }; + # Test some statically linked packages to catch regressions # and get some cache going for static compilation with GHC. # Use integer-simple to avoid GMP linking problems (LGPL)