From 78033ec38ec95cf944a7d2faf723e4d1ec6b744d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 7 Aug 2011 22:00:12 +0000
Subject: [PATCH] haskell-haxr: updated to version 3000.8.4

svn path=/nixpkgs/trunk/; revision=28306
---
 .../libraries/haskell/haxr/default.nix         | 18 ++++++++++++------
 pkgs/top-level/haskell-packages.nix            |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/haxr/default.nix b/pkgs/development/libraries/haskell/haxr/default.nix
index 0f25200516b..bbe6b1773e4 100644
--- a/pkgs/development/libraries/haskell/haxr/default.nix
+++ b/pkgs/development/libraries/haskell/haxr/default.nix
@@ -1,12 +1,18 @@
-{cabal, HaXml, HTTP, dataenc, time}:
+{cabal, HTTP, HaXml, blazeBuilder, dataenc, mtl, network,
+ utf8String} :
 
 cabal.mkDerivation (self : {
   pname = "haxr";
-  version = "3000.1.1.2";
-  sha256 = "c24741a92e27d851a3376158230a52782c1e2b494405ebdde1d256819598c8e8";
+  version = "3000.8.4";
+  sha256 = "0cyf1q1ngz0jqxdrvblcy9iw7l478v0rfr7bgkpq0l4brw0ca1pg";
+  propagatedBuildInputs = [
+    HTTP HaXml blazeBuilder dataenc mtl network utf8String
+  ];
   meta = {
-    description = "a Haskell library for writing XML-RPC client and server applications";
+    homepage = "http://www.haskell.org/haskellwiki/HaXR";
+    description = "XML-RPC client and server library.";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.stdenv.lib.platforms.haskellPlatforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
-  propagatedBuildInputs = [HaXml HTTP dataenc time];
 })
-
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4ae99e45ffe..35b7c7b8365 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -641,7 +641,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   HTTP = self.HTTP_4000_0_6;
 
   haxr = callPackage ../development/libraries/haskell/haxr {
-    HaXml = self.HaXml113;
+    HaXml = self.HaXml_1_22_3;
   };
 
   haxr_th = callPackage ../development/libraries/haskell/haxr-th {};