3
0
Fork 0
forked from mirrors/nixpkgs

haskellPackages.hakyll: unbreak, jailbreak, patch for pandoc version

This commit is contained in:
Kerstin Humm 2021-05-24 00:19:09 +02:00 committed by sternenseemann
parent 2451208b1b
commit 8f33bb975d
3 changed files with 17 additions and 3 deletions

View file

@ -1144,6 +1144,23 @@ self: super: {
# Therefore we jailbreak it.
hakyll-contrib-hyphenation = doJailbreak super.hakyll-contrib-hyphenation;
# Jailbreak due to bounds on multiple dependencies,
# bound on pandoc needs to be patched since it is conditional
hakyll = doJailbreak (overrideCabal super.hakyll (drv: {
patches = [
# Remove when Hakyll > 4.14.0.0
(pkgs.fetchpatch {
url = "https://github.com/jaspervdj/hakyll/commit/0dc6127d81ff688e27c36ce469230320eee60246.patch";
sha256 = "sha256-YyRz3bAmIBODTEeS5kGl2J2x31SjiPoLzUZUlo3nHvQ=";
})
# Remove when Hakyll > 4.14.0.0
(pkgs.fetchpatch {
url = "https://github.com/jaspervdj/hakyll/commit/af9e29b5456c105dc948bc46c93e989a650b5ed1.patch";
sha256 = "sha256-ghc0V5L9OybNHWKmM0vhjRBN2rIvDlp+ClcK/aQst44=";
})
];
}));
# 2020-06-22: NOTE: > 0.4.0 => rm Jailbreak: https://github.com/serokell/nixfmt/issues/71
nixfmt = doJailbreak super.nixfmt;

View file

@ -1759,7 +1759,6 @@ broken-packages:
- hakismet
- hakka
- hako
- hakyll
- hakyll-shortcode
- HaLeX
- halfs

View file

@ -114880,8 +114880,6 @@ self: {
testToolDepends = [ utillinux ];
description = "A static website compiler library";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) utillinux;};
"hakyll-R" = callPackage