From 0069e583cd6c53ca840cfeb39157739cb43a920d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 7 Aug 2011 18:23:35 +0000
Subject: [PATCH] happstack-data: updated to version 6.0.0

svn path=/nixpkgs/trunk/; revision=28248
---
 .../haskell/happstack/happstack-data.nix      | 30 +++++++++++--------
 pkgs/top-level/haskell-packages.nix           |  4 +--
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/haskell/happstack/happstack-data.nix b/pkgs/development/libraries/haskell/happstack/happstack-data.nix
index 7ba7f354c6c..9149cb192ea 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-data.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-data.nix
@@ -1,17 +1,21 @@
-{cabal, mtl, syb, sybWithClass, sybWithClassInstancesText, HaXml,
- happstackUtil, binary, text}:
+{cabal, binary, mtl, syb, sybWithClass, sybWithClassInstancesText,
+ text} :
 
 cabal.mkDerivation (self : {
-    pname = "happstack-data";
-    version = "0.5.0.3";
-    sha256 = "0zjsb9n1iawg2jv6i5q52awifly7yi6w0ilndivwp168qvi25awn";
-    propagatedBuildInputs = [
-        mtl syb sybWithClass sybWithClassInstancesText HaXml
-        happstackUtil binary text
+  pname = "happstack-data";
+  version = "6.0.0";
+  sha256 = "1wdvylqgy3iw41ksw2ys4f0vyak8sbk6gginljvz07rrh04klyhl";
+  propagatedBuildInputs = [
+    binary mtl syb sybWithClass sybWithClassInstancesText text
+  ];
+  meta = {
+    homepage = "http://happstack.com";
+    description = "Happstack data manipulation libraries";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.stdenv.lib.platforms.haskellPlatforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.simons
+      self.stdenv.lib.maintainers.andres
     ];
-    meta = {
-        description = "Happstack data manipulation libraries";
-        license = "BSD";
-        maintainers = [self.stdenv.lib.maintainers.andres];
-    };
+  };
 })
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index db9d97f8b76..e77dbe5887a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -595,9 +595,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   hamlet = callPackage ../development/libraries/haskell/hamlet {};
 
-  happstackData = callPackage ../development/libraries/haskell/happstack/happstack-data.nix {
-    HaXml = self.HaXml113;
-  };
+  happstackData = callPackage ../development/libraries/haskell/happstack/happstack-data.nix {};
 
   happstackUtil = callPackage ../development/libraries/haskell/happstack/happstack-util.nix {};