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

This reverts commit fe366d43e85df82739756ec16fcb5a0d3b77f681.
2019-09-15 20:00:33 +02:00 · 2019-09-15 20:00:33 +02:00 · d383a4cd91
commit d383a4cd91
parent 348656cea8
2 changed files with 2 additions and 8 deletions
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -146,16 +146,11 @@ self: super: {
    else super.halive;

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

  double-conversion = if !pkgs.stdenv.isDarwin
    then super.double-conversion
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@ -5236,7 +5236,6 @@ broken-packages:
  - hakismet
  - hakka
  - hako
-  - hakyll
  - hakyll-agda
  - hakyll-blaze-templates
  - hakyll-contrib