From 8cd9a5145be6d2a9d3be646baf44bccda07a517a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Apr 2014 12:12:41 +0200
Subject: [PATCH] haskell-scotty: update to version 0.7.2

---
 .../libraries/haskell/scotty/default.nix          | 15 +++++++--------
 .../libraries/haskell/scotty/new-conduit.patch    | 13 -------------
 2 files changed, 7 insertions(+), 21 deletions(-)
 delete 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 42f4068f9a9a..cc5ae2604777 100644
--- a/pkgs/development/libraries/haskell/scotty/default.nix
+++ b/pkgs/development/libraries/haskell/scotty/default.nix
@@ -1,16 +1,15 @@
-{ cabal, aeson, blazeBuilder, caseInsensitive, conduit, dataDefault
-, httpTypes, mtl, regexCompat, text, transformers, wai, waiExtra
-, warp, conduitExtra
+{ cabal, aeson, blazeBuilder, caseInsensitive, conduit
+, conduitExtra, dataDefault, httpTypes, mtl, regexCompat, text
+, transformers, wai, waiExtra, warp
 }:
 
 cabal.mkDerivation (self: {
   pname = "scotty";
-  version = "0.7.1";
-  sha256 = "07aj74jq0hh86ik4x5p5q65b47q44rrnd6mkp039wj9l6dmyrv3c";
-  patches = [ ./new-conduit.patch ];
+  version = "0.7.2";
+  sha256 = "1y14af3qciwycgaxzx6rjan2jgfchjzs4zbxzh8p8s1d0l4gsqlb";
   buildDepends = [
-    aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes
-    mtl regexCompat text transformers wai waiExtra warp conduitExtra
+    aeson blazeBuilder caseInsensitive conduit conduitExtra dataDefault
+    httpTypes mtl regexCompat text transformers wai waiExtra warp
   ];
   jailbreak = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/scotty/new-conduit.patch b/pkgs/development/libraries/haskell/scotty/new-conduit.patch
deleted file mode 100644
index 74c6ebdc161c..000000000000
--- a/pkgs/development/libraries/haskell/scotty/new-conduit.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
-