From 5cd41e16a64f45e8688a0f028bd74f54b8cc6d80 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 9 Sep 2024 11:47:55 +0200 Subject: [PATCH] release-haskell.nix: don't try to build pkgsMusl on non x86_64-linux Since 322bab828488c44c434b2fab7fcb15b640970cc8, ghc no longer self reports its restricted platforms for e.g. pkgsMusl, so we need to reflect this in the jobset in order to keep the evaluation errors tab clean. --- pkgs/top-level/release-haskell.nix | 39 ++++++++++++++++-------------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 65f0ad17b512..f882cb4fa2f4 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -394,19 +394,7 @@ let }; # GHCs linked to musl. - pkgsMusl.haskell.compiler = lib.recursiveUpdate - (packagePlatforms pkgs.pkgsMusl.haskell.compiler) - { - # remove musl ghc865Binary since it is known to be broken and - # causes an evaluation error on darwin. - ghc865Binary = {}; - - ghcjs = {}; - ghcjs810 = {}; - }; - - # Get some cache going for MUSL-enabled GHC. - pkgsMusl.haskellPackages = + pkgsMusl = removePlatforms [ # pkgsMusl is compiled natively with musl. It is not @@ -420,11 +408,26 @@ let "aarch64-darwin" ] { - inherit (packagePlatforms pkgs.pkgsMusl.haskellPackages) - hello - lens - random - ; + haskell.compiler = lib.recursiveUpdate + (packagePlatforms pkgs.pkgsMusl.haskell.compiler) + { + # remove musl ghc865Binary since it is known to be broken and + # causes an evaluation error on darwin. + ghc865Binary = {}; + + ghcjs = {}; + ghcjs810 = {}; + }; + + # Get some cache going for MUSL-enabled GHC. + haskellPackages = + { + inherit (packagePlatforms pkgs.pkgsMusl.haskellPackages) + hello + lens + random + ; + }; }; # Test some statically linked packages to catch regressions