JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

haskellPackages: size-based: fix build with template-haskell 2.17

Browse Source
This commit is contained in:
Teo Camarasu 2022-03-01 10:25:10 +00:00
parent 94fb4d49df
commit 551a6e81ba
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -738,9 +738,21 @@ self: super: {
# The tests spuriously fail
libmpd = dontCheck super.libmpd;
# Too strict bounds on template-haskell (doesn't allow 2.16)
# For 2.17 support: https://github.com/JonasDuregard/sized-functors/pull/10
size-based = doJailbreak super.size-based;
# For template-haskell 2.16 and 2.17 support: https://github.com/JonasDuregard/sized-functors/pull/10
size-based = overrideCabal
(drv: {
# make all line endings unix, otherwise patching fails
prePatch = ''
find . -type f -print0 | xargs -0 ${pkgs.buildPackages.dos2unix}/bin/dos2unix
'' + (drv.prePatch or "");
patches = [
(pkgs.fetchpatch {
url = "https://github.com/JonasDuregard/sized-functors/pull/10/commits/fe6bf78a1b97ff7429630d0e8974c9bc40945dcf.patch";
sha256 = "sha256-mMsXOqLqSbGl9Q0txiZiciPtGT7f12lnhlpFsnCwamk=";
})
];
})
super.size-based;
# https://github.com/diagrams/diagrams-braille/issues/1
diagrams-braille = doJailbreak super.diagrams-braille;