From fe366d43e85df82739756ec16fcb5a0d3b77f681 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Sun, 18 Aug 2019 16:54:43 +0200 Subject: [PATCH] haskell-hakyll: patch Cabal file from upstream hakyll complains about our QuickCheck version being too high. Upstream solved that problem already, so let's use that patch [0]. Closes https://github.com/NixOS/nixpkgs/pull/67065. [0] https://github.com/jaspervdj/hakyll/pull/721 --- .../development/haskell-modules/configuration-common.nix | 9 +++++++-- .../haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8c1e1f0191c..f8ddab1023c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -149,11 +149,16 @@ self: super: { else super.halive; # Hakyll's tests are broken on Darwin (3 failures); and they require util-linux - hakyll = if pkgs.stdenv.isDarwin + hakyll = appendPatch + (if pkgs.stdenv.isDarwin then dontCheck (overrideCabal super.hakyll (drv: { 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 then super.double-conversion diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 89f9df7faa5..52be6ef6521 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5360,7 +5360,6 @@ broken-packages: - hakismet - hakka - hako - - hakyll - hakyll-agda - hakyll-blaze-templates - hakyll-contrib