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

Revert "haskell-hakyll: patch Cabal file from upstream"

Browse Source 
This reverts commit fe366d43e85df82739756ec16fcb5a0d3b77f681.
This commit is contained in:
Justin Humm 2019-09-15 20:00:33 +02:00 committed by Peter Simons
parent 348656cea8
commit d383a4cd91
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,16 +146,11 @@ self: super: {
else super.halive; else super.halive;
# Hakyll's tests are broken on Darwin (3 failures); and they require util-linux # Hakyll's tests are broken on Darwin (3 failures); and they require util-linux
hakyll = appendPatch hakyll = if pkgs.stdenv.isDarwin
(if pkgs.stdenv.isDarwin
then dontCheck (overrideCabal super.hakyll (drv: { then dontCheck (overrideCabal super.hakyll (drv: {
testToolDepends = []; testToolDepends = [];
})) }))
else super.hakyll) else super.hakyll;
(pkgs.fetchpatch {
url = https://github.com/jaspervdj/hakyll/commit/25a4460b75b3c9f3ce339b3311b084d92994f5f1.patch;
sha256 = "sha256-F59WHt52LOKGsGoaD3LAIZFEMe9s9WHfGxQgSh9Q8uQ=";
});
double-conversion = if !pkgs.stdenv.isDarwin double-conversion = if !pkgs.stdenv.isDarwin
then super.double-conversion then super.double-conversion

1
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -5236,7 +5236,6 @@ broken-packages:
- hakismet - hakismet
- hakka - hakka
- hako - hako
- hakyll
- hakyll-agda - hakyll-agda
- hakyll-blaze-templates - hakyll-blaze-templates
- hakyll-contrib - hakyll-contrib