Updated haskell packages.

 - HDBC-postgresql updated to version 2.3.2.1
 - HsOpenSSL updated to version 0.10.1.3
 - hledger-web updated to version 0.17.1
 - persistent updated to version 0.8.0.2
 - xml-conduit updated to version 0.5.3.1
 - haddock: added version 2.10.0

svn path=/nixpkgs/trunk/; revision=32799

5 files changed, 25 insertions, 23 deletions

diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix
index 8ac9548d6104..a78d46541f74 100644
--- a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix
+++ b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix
@@ -1,15 +1,17 @@
-{ cabal, HDBC, mtl, parsec, postgresql, time, utf8String }:
+{ cabal, convertible, HDBC, mtl, parsec, postgresql, time
+, utf8String
+}:
 
 cabal.mkDerivation (self: {
   pname = "HDBC-postgresql";
-  version = "2.3.2.0";
-  sha256 = "0fwza9h2ghl70x44c4snfybnnfsj1mwlf5a1x12ddl1fbj6fx6gs";
+  version = "2.3.2.1";
+  sha256 = "1ji10w4d91dp3ci7pn1jd8nb3wasszwlsy1lfbb4mqnr15c9vnpb";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ HDBC mtl parsec time utf8String ];
+  buildDepends = [ convertible HDBC mtl parsec time utf8String ];
   extraLibraries = [ postgresql ];
   meta = {
-    homepage = "http://software.complete.org/hdbc-postgresql";
+    homepage = "http://github.com/hdbc/hdbc-postgresql";
     description = "PostgreSQL driver for HDBC";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
index 1ab60436f68a..1c8a1ca9120d 100644
--- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
+++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HsOpenSSL";
-  version = "0.10.1.2";
-  sha256 = "0najn3749s6jxqavpxw7q58jzsvli06sxjgkvs3lidasv6jhwmxh";
+  version = "0.10.1.3";
+  sha256 = "0r6gns729nfaxlig0sxlal5cx4ipyjk62zrmwn5i1i7lighp10y0";
   buildDepends = [ network time ];
   extraLibraries = [ openssl ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix
index 4e032d452262..df16514e91fd 100644
--- a/pkgs/development/libraries/haskell/hledger-web/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-web/default.nix
@@ -1,23 +1,23 @@
 { cabal, aeson, blazeHtml, cabalFileTh, clientsession, cmdargs
 , dataObject, dataObjectYaml, failure, fileEmbed, filepath, hamlet
-, hledger, hledgerLib, HUnit, ioStorage, parsec, regexpr, safe
-, shakespeareCss, shakespeareJs, shakespeareText, text, time
-, transformers, wai, waiExtra, warp, yesod, yesodCore, yesodForm
-, yesodJson, yesodStatic
+, hledger, hledgerLib, httpEnumerator, HUnit, ioStorage, parsec
+, regexpr, safe, shakespeareCss, shakespeareJs, shakespeareText
+, text, time, tlsExtra, transformers, wai, waiExtra, warp, yesod
+, yesodCore, yesodForm, yesodJson, yesodStatic
 }:
 
 cabal.mkDerivation (self: {
   pname = "hledger-web";
-  version = "0.17";
-  sha256 = "1b5k76p27pvxc91gns3aimy3zcy6m366nnpwzbm214v6ka82imfi";
+  version = "0.17.1";
+  sha256 = "0cix0k2skbrcbjhj876cx4mizjvkqnr91s092a3lg4rv40dhgwa9";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     aeson blazeHtml cabalFileTh clientsession cmdargs dataObject
     dataObjectYaml failure fileEmbed filepath hamlet hledger hledgerLib
-    HUnit ioStorage parsec regexpr safe shakespeareCss shakespeareJs
-    shakespeareText text time transformers wai waiExtra warp yesod
-    yesodCore yesodForm yesodJson yesodStatic
+    httpEnumerator HUnit ioStorage parsec regexpr safe shakespeareCss
+    shakespeareJs shakespeareText text time tlsExtra transformers wai
+    waiExtra warp yesod yesodCore yesodForm yesodJson yesodStatic
   ];
   meta = {
     homepage = "http://hledger.org";
diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index d498aa6edd0a..4ddd53ba75a8 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "0.8.0.1";
-  sha256 = "1lsmsx0zxa3h83z29r6h3r94czg7c8apid9mah48f8hxlfynbqhi";
+  version = "0.8.0.2";
+  sha256 = "10v11fnx7dhj2gg09k3ji054iywbpazs789vhfxn56wfg6rz59wb";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeHtml conduit liftedBase
     monadControl mtl pathPieces poolConduit text time transformers
diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
index 056b8d53e652..778986d6a96d 100644
--- a/pkgs/development/libraries/haskell/xml-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix
@@ -1,16 +1,16 @@
 { cabal, attoparsec, attoparsecConduit, blazeBuilder
-, blazeBuilderConduit, conduit, dataDefault, failure
+, blazeBuilderConduit, conduit, dataDefault, failure, monadControl
 , systemFilepath, text, transformers, xmlTypes
 }:
 
 cabal.mkDerivation (self: {
   pname = "xml-conduit";
-  version = "0.5.3";
-  sha256 = "09jphn19g6v9z1b75iyqcdyn75n7inbhib8g9fgfzwd7q8rdd3yc";
+  version = "0.5.3.1";
+  sha256 = "124c88x3ww1414c7s3wx7z1kqy37m9mwihiwyamgz25lg502n8gb";
   buildDepends = [
     attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
-    conduit dataDefault failure systemFilepath text transformers
-    xmlTypes
+    conduit dataDefault failure monadControl systemFilepath text
+    transformers xmlTypes
   ];
   meta = {
     homepage = "http://github.com/snoyberg/xml";