From 17b80ebf0699085e3ea003107e0ee2f052e2fca7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:12:02 +0200
Subject: [PATCH] haskell-HTTP: update to version 4000.2.15

---
 .../libraries/haskell/HTTP/4000.2.14.nix      | 24 -------------------
 .../libraries/haskell/HTTP/4000.2.15.nix      | 23 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  4 ++--
 3 files changed, 25 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/HTTP/4000.2.14.nix
 create mode 100644 pkgs/development/libraries/haskell/HTTP/4000.2.15.nix

diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.14.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.14.nix
deleted file mode 100644
index 1aaa048eefc3..000000000000
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.14.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ cabal, caseInsensitive, conduit, deepseq, httpdShed, httpTypes
-, HUnit, mtl, network, parsec, pureMD5, split, testFramework
-, testFrameworkHunit, wai, warp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "HTTP";
-  version = "4000.2.14";
-  sha256 = "1js5r3rpy5wx0h29qsd3sfazqj0svfdcv13nsvwqi9jnwik8041c";
-  buildDepends = [ mtl network parsec ];
-  testDepends = [
-    caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl
-    network pureMD5 split testFramework testFrameworkHunit wai warp
-  ];
-  jailbreak = true;
-  doCheck = false;
-  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
-  meta = {
-    homepage = "https://github.com/haskell/HTTP";
-    description = "A library for client-side HTTP";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.15.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.15.nix
new file mode 100644
index 000000000000..2147cf5c417a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.15.nix
@@ -0,0 +1,23 @@
+{ cabal, caseInsensitive, conduit, conduitExtra, deepseq, httpdShed
+, httpTypes, HUnit, mtl, network, parsec, pureMD5, split
+, testFramework, testFrameworkHunit, wai, warp
+}:
+
+cabal.mkDerivation (self: {
+  pname = "HTTP";
+  version = "4000.2.15";
+  sha256 = "1bw79hq5nzx1gab9p3d3szr0wkiv9zvf2ld9d4i48z6fnmil4qwj";
+  buildDepends = [ mtl network parsec ];
+  testDepends = [
+    caseInsensitive conduit conduitExtra deepseq httpdShed httpTypes
+    HUnit mtl network pureMD5 split testFramework testFrameworkHunit
+    wai warp
+  ];
+  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
+  meta = {
+    homepage = "https://github.com/haskell/HTTP";
+    description = "A library for client-side HTTP";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 21f1554c89ad..168eb7001650 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -981,8 +981,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {};
   HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix { network = self.network_2_4_1_2; };
   HTTP_4000_2_8 = callPackage ../development/libraries/haskell/HTTP/4000.2.8.nix {};
-  HTTP_4000_2_14 = callPackage ../development/libraries/haskell/HTTP/4000.2.14.nix {};
-  HTTP = self.HTTP_4000_2_14;
+  HTTP_4000_2_15 = callPackage ../development/libraries/haskell/HTTP/4000.2.15.nix {};
+  HTTP = self.HTTP_4000_2_15;
 
   httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {};