From 08c7105503b5c5a3e636d9b55577e619e6706db9 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 7 Apr 2014 16:34:29 -0400 Subject: [PATCH] haskell-scotty: fix build with new conduit --- .../libraries/haskell/scotty/default.nix | 5 +++-- .../libraries/haskell/scotty/new-conduit.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/scotty/new-conduit.patch diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix index 278a26d1536..42f4068f9a9 100644 --- a/pkgs/development/libraries/haskell/scotty/default.nix +++ b/pkgs/development/libraries/haskell/scotty/default.nix @@ -1,15 +1,16 @@ { cabal, aeson, blazeBuilder, caseInsensitive, conduit, dataDefault , httpTypes, mtl, regexCompat, text, transformers, wai, waiExtra -, warp +, warp, conduitExtra }: cabal.mkDerivation (self: { pname = "scotty"; version = "0.7.1"; sha256 = "07aj74jq0hh86ik4x5p5q65b47q44rrnd6mkp039wj9l6dmyrv3c"; + patches = [ ./new-conduit.patch ]; buildDepends = [ aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes - mtl regexCompat text transformers wai waiExtra warp + mtl regexCompat text transformers wai waiExtra warp conduitExtra ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/scotty/new-conduit.patch b/pkgs/development/libraries/haskell/scotty/new-conduit.patch new file mode 100644 index 00000000000..74c6ebdc161 --- /dev/null +++ b/pkgs/development/libraries/haskell/scotty/new-conduit.patch @@ -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 +