From a2d2fa31a6bff04e3897dd4349158fc5b670fff1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 10 Feb 2012 11:32:50 +0000
Subject: [PATCH] haskell-persistent: updated to version 0.8.0

svn path=/nixpkgs/trunk/; revision=32179
---
 .../libraries/haskell/persistent/default.nix   | 18 ++++++++++--------
 pkgs/top-level/haskell-packages.nix            |  4 +---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index 59fe42ff65e..51fdacfcf2b 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -1,20 +1,22 @@
-{ cabal, blazeHtml, dataObject, enumerator, monadControl, mtl
-, pathPieces, pool, sqlite, text, time, transformers
-, transformersBase
+{ cabal, aeson, attoparsec, base64Bytestring, blazeHtml, conduit
+, liftedBase, monadControl, mtl, pathPieces, poolConduit, sqlite
+, text, time, transformers, transformersBase, unorderedContainers
+, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "0.6.4.4";
-  sha256 = "0n4zl0r8nmp3pwsgc0kiy7fgk2dfvdvagv1gvjxrs8545c5ycggv";
+  version = "0.8.0";
+  sha256 = "0z70ibicfbfripp1x9csfvfhn7k26j78jvvig9ylsjwldhysr7qr";
   buildDepends = [
-    blazeHtml dataObject enumerator monadControl mtl pathPieces pool
-    text time transformers transformersBase
+    aeson attoparsec base64Bytestring blazeHtml conduit liftedBase
+    monadControl mtl pathPieces poolConduit text time transformers
+    transformersBase unorderedContainers vector
   ];
   extraLibraries = [ sqlite ];
   meta = {
     homepage = "http://www.yesodweb.com/book/persistent";
-    description = "Type-safe, non-relational, multi-backend persistence";
+    description = "Type-safe, multi-backend data serialization";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 0a01ceee171..5ca8288a5c9 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1101,9 +1101,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   pcreLight = callPackage ../development/libraries/haskell/pcre-light {};
 
-  persistent = callPackage ../development/libraries/haskell/persistent {
-    pathPieces = self.pathPieces_0_0_0;
-  };
+  persistent = callPackage ../development/libraries/haskell/persistent {};
 
   persistentSqlite = callPackage ../development/libraries/haskell/persistent-sqlite {};