haskell.packages.ghc94.cborg: unrestrict platforms
Revert "haskell.packages.ghc94.cborg: resolve duplicate overlay entry" This reverts commit6634553e48
. Revert "haskell.packages.ghc94.weeder: don't test on aarch64" This reverts commit600fd969f6
. 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:
parent
6634553e48
commit
25ae272497
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue