From 9438cc264f876e3d2b46f35f6f0a0cec6bc69145 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Thu, 2 Feb 2017 15:18:28 +0100 Subject: [PATCH] shelly: fix build on GHC-8.0.2 --- .../haskell-modules/configuration-common.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4d74f453859..a09d4c4a3cd 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -874,7 +874,17 @@ self: super: { # https://github.com/yesodweb/Shelly.hs/issues/106 # https://github.com/yesodweb/Shelly.hs/issues/108 - shelly = dontCheck super.shelly; + # https://github.com/yesodweb/Shelly.hs/issues/130 + shelly = + let drv = appendPatch (dontCheck (doJailbreak super.shelly)) (pkgs.fetchpatch { + url = "https://github.com/k0001/Shelly.hs/commit/32a1e290961755e7b2379f59faa49b13d03dfef6.patch"; + sha256 = "0ccq0qly8bxxv64dk97a44ng6hb01j6ajs0sp3f2nn0hf5j3xv69"; + }); + in overrideCabal drv (drv : { + # doJailbreak doesn't seem to work for build-depends inside an + # if-then-else block so we have to do it manually. + postPatch = "sed -i 's/base >=4\.6 \&\& <4\.9\.1/base -any/' shelly.cabal"; + }); # https://github.com/bos/configurator/issues/22 configurator = dontCheck super.configurator;