From e77179fd448d72f26b7d6c05e7794b7e525af27d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Jun 2014 11:36:33 +0200
Subject: [PATCH] haskell-conduit: update to version 1.1.5

---
 pkgs/development/libraries/haskell/conduit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index 48422e602b2d..07f43f0eda8c 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.1.4";
-  sha256 = "1fw55rmmhznkpbblc7gqy463lza7fi9yr0n27g38afdfql8mz5mm";
+  version = "1.1.5";
+  sha256 = "107mfkw2jin724cdkn5mkhxgfv2mf1nkhcn12mwaw9cnkxxxx78z";
   buildDepends = [
     exceptions liftedBase mmorph monadControl mtl resourcet
     transformers transformersBase void