alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #22373 from LumiGuide/shelly-ghc802-fix

Browse source 
shelly: fix build on GHC-8.0.2
This commit is contained in:
Peter Simons 2017-02-02 16:08:26 +01:00 committed by GitHub
parent a3a09ee687 9438cc264f
commit 437d236121
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -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;