talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

release-haskell.nix: don't try to build pkgsMusl on non x86_64-linux

Browse Source 
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.
This commit is contained in:
sternenseemann 2024-09-09 11:47:55 +02:00
parent fee9184d2e
commit 5cd41e16a6
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pkgs/top-level/release-haskell.nix
View File

@ -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