b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

haskell.packages.ghc94.cborg: unrestrict platforms

Browse source 
Revert "haskell.packages.ghc94.cborg: resolve duplicate overlay entry"

This reverts commit 6634553e48.

Revert "haskell.packages.ghc94.weeder: don't test on aarch64"

This reverts commit 600fd969f6.

Reason for reverts: https://github.com/NixOS/nixpkgs/pull/221688 applied
a patch for the compilation failure we were seeing on aarch64.
This commit is contained in:
sternenseemann 2023-03-20 18:02:14 +01:00
parent 6634553e48
commit 25ae272497
1 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
View file

@ -210,6 +210,14 @@ in {
servant-client = doJailbreak super.servant-client;
relude = doJailbreak super.relude;
# Fixes compilation failure with GHC >= 9.4 on aarch64-* due to an API change
cborg = appendPatch (pkgs.fetchpatch {
name = "cborg-support-ghc-9.4.patch";
url = "https://github.com/well-typed/cborg/pull/304.diff";
sha256 = "sha256-W4HldlESKOVkTPhz9nkFrvbj9akCOtF1SbIt5eJqtj8=";
relative = "cborg";
}) super.cborg;
# https://github.com/tweag/ormolu/issues/941
ormolu = doDistribute self.ormolu_0_5_3_0;
fourmolu = overrideCabal (drv: {
@ -230,22 +238,4 @@ in {
# failing during the Setup.hs phase: https://github.com/gtk2hs/gtk2hs/issues/323.
gtk2hs-buildtools = appendPatch ./patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch super.gtk2hs-buildtools;
# https://github.com/well-typed/cborg/pull/307
# https://github.com/well-typed/cborg/pull/304
# https://github.com/well-typed/cborg/issues/309#issuecomment-1471862045
cborg = overrideCabal (old: rec {
patches = old.patches or [] ++ [
(pkgs.fetchpatch {
name = "cborg-support-ghc-9.4.patch";
url = "https://github.com/well-typed/cborg/pull/304.diff";
sha256 = "sha256-W4HldlESKOVkTPhz9nkFrvbj9akCOtF1SbIt5eJqtj8=";
relative = "cborg";
})
];
badPlatforms = lib.platforms.aarch64;
hydraPlatforms = lib.subtractLists badPlatforms lib.platforms.all;
}) super.cborg;
weeder = overrideCabal {
inherit (self.cborg.meta) hydraPlatforms;
} super.weeder;
}