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

haskell-scotty: fix build with new conduit

Browse Source
This commit is contained in:
Shea Levy 2014-04-07 16:34:29 -04:00
parent 7dff8a8aaf
commit 08c7105503
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/haskell/scotty/default.nix
View File

@ -1,15 +1,16 @@
{ cabal, aeson, blazeBuilder, caseInsensitive, conduit, dataDefault { cabal, aeson, blazeBuilder, caseInsensitive, conduit, dataDefault
, httpTypes, mtl, regexCompat, text, transformers, wai, waiExtra , httpTypes, mtl, regexCompat, text, transformers, wai, waiExtra
, warp , warp, conduitExtra
}: }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "scotty"; pname = "scotty";
version = "0.7.1"; version = "0.7.1";
sha256 = "07aj74jq0hh86ik4x5p5q65b47q44rrnd6mkp039wj9l6dmyrv3c"; sha256 = "07aj74jq0hh86ik4x5p5q65b47q44rrnd6mkp039wj9l6dmyrv3c";
patches = [ ./new-conduit.patch ];
buildDepends = [ buildDepends = [
aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes
mtl regexCompat text transformers wai waiExtra warp mtl regexCompat text transformers wai waiExtra warp conduitExtra
]; ];
jailbreak = true; jailbreak = true;
meta = { meta = {

13
pkgs/development/libraries/haskell/scotty/new-conduit.patch Normal file
View File

@ -0,0 +1,13 @@
diff -Naur scotty-0.7.1-orig/scotty.cabal scotty-0.7.1/scotty.cabal
--- scotty-0.7.1-orig/scotty.cabal 2014-03-19 17:27:33.000000000 -0400
+++ scotty-0.7.1/scotty.cabal 2014-04-07 10:59:39.933144140 -0400
@@ -82,7 +82,8 @@
transformers >= 0.3.0.0 && < 0.4,
wai >= 2.0.0 && < 2.2,
wai-extra >= 2.0.1 && < 2.2,
- warp >= 2.1.1 && < 2.2
+ warp >= 2.1.1 && < 2.2,
+ conduit-extra
GHC-options: -Wall -fno-warn-orphans