Updated Haskell packages.

- attoparsec-conduit: updated to version 0.4.0.1
 - conduit: updated to version 0.4.2
 - network-conduit: updated to version 0.4.0.1
 - persistent-sqlite: updated to version 0.9.0.2
 - persistent: updated to version 0.9.0.4
 - semigroups: updated to version 0.8.3.1
 - wai-app-static: updated to version 1.2.0.3
 - wai-extra: updated to version 1.2.0.4
 - wai: updated to version 1.2.0.2
 - warp: updated to version 1.2.0.2
 - xml-conduit: updated to version 0.7.0.2

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

pkgs/development/libraries/haskell/attoparsec-conduit/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "attoparsec-conduit";
-  version = "0.4.0";
+  version = "0.4.0.1";
-  sha256 = "1vlgpa90sgaym754w5wr3jjqjra9yrn3yn4fhi148v25y4ijrrc0";
+  sha256 = "1r01xaaw439qpbfnanv2yfw9fz6id8cy17yqdm6x6vk35hmv59kc";
   buildDepends = [ attoparsec conduit text transformers ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";

pkgs/development/libraries/haskell/conduit/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "0.4.1.1";
+  version = "0.4.2";
-  sha256 = "1y5bccjd3r1kakwiq0nlp3dk2jwrdsm3f8dncnfsmnlk093ajyxa";
+  sha256 = "1v8s80g8gyxb139dzqbbh4qv6ax08g5smrvx2zc5sd2773wwqwz0";
   buildDepends = [
     liftedBase monadControl resourcet text transformers
     transformersBase void

pkgs/development/libraries/haskell/network-conduit/default.nix

@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network-conduit";
-  version = "0.4.0";
+  version = "0.4.0.1";
-  sha256 = "0h0s33nxihd4zy9mvy2vpdrpvjapacbl69ndsw5zrbqhwbpz3mzs";
+  sha256 = "0xmfhar4knyn01xyigrp4lymb1vcsahd9v12i6rrqzi10mdcz6bl";
   buildDepends = [
     conduit liftedBase monadControl network transformers
   ];

pkgs/development/libraries/haskell/persistent-sqlite/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-sqlite";
-  version = "0.9.0.1";
+  version = "0.9.0.2";
-  sha256 = "19bwkaazg3c822n3308awy70ml40jvncr4c3rvidq72zzdvql9c2";
+  sha256 = "19wmz13k3qbpam2siykczgacgaj48yw4p7iz3y6v8a2z8wha73zb";
   buildDepends = [
     aeson conduit monadControl persistent text transformers
   ];

pkgs/development/libraries/haskell/persistent/default.nix

@@ -1,16 +1,16 @@
-{ cabal, aeson, attoparsec, base64Bytestring, blazeHtml, conduit
+{ cabal, aeson, attoparsec, base64Bytestring, blazeHtml
-, liftedBase, monadControl, pathPieces, poolConduit, resourcet
+, blazeMarkup, conduit, liftedBase, monadControl, pathPieces
-, sqlite, text, time, transformers, transformersBase
+, poolConduit, resourcet, sqlite, text, time, transformers
-, unorderedContainers, vector
+, transformersBase, unorderedContainers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "0.9.0.3";
+  version = "0.9.0.4";
-  sha256 = "07w2d5x4wlbs8smkq2mini4rkmdd38zmapwqcn59vna8cq9wslz6";
+  sha256 = "1igml2hmc8ga9871dfq4mxqvy639vvlgl3cs48j3b27ci3qwd9jr";
   buildDepends = [
-    aeson attoparsec base64Bytestring blazeHtml conduit liftedBase
+    aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
-    monadControl pathPieces poolConduit resourcet text time
+    liftedBase monadControl pathPieces poolConduit resourcet text time
     transformers transformersBase unorderedContainers vector
   ];
   extraLibraries = [ sqlite ];

pkgs/development/libraries/haskell/semigroups/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "semigroups";
-  version = "0.8.3";
+  version = "0.8.3.1";
-  sha256 = "179m5vvhf8rf01fnq8b2lg7v8i70yx6yq975jiazghm0qnsm32ji";
+  sha256 = "0gl2s6vd2cswb4qmkndfgnx9a747f4vhbx52lvixyq3sbgz1vain";
   meta = {
     homepage = "http://github.com/ekmett/semigroups/";
     description = "Haskell 98 semigroups";

pkgs/development/libraries/haskell/wai-app-static/default.nix

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-app-static";
-  version = "1.2.0.2";
+  version = "1.2.0.3";
-  sha256 = "15rd2vlx3ag5bavrivscah7yqm9lv14v68wr3p9incg2ksf8h7d7";
+  sha256 = "1hn4k28aa15vwvvay62rvi796fma7p3j31z6bfa9im0dxdy7sf9l";
   buildDepends = [
     base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed
     httpDate httpTypes text time transformers unixCompat wai

pkgs/development/libraries/haskell/wai-extra/default.nix

@@ -1,16 +1,16 @@
 { cabal, ansiTerminal, blazeBuilder, blazeBuilderConduit
 , caseInsensitive, conduit, dataDefault, fastLogger, httpTypes
-, network, text, time, transformers, wai, zlibConduit
+, network, resourcet, text, time, transformers, wai, zlibConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "1.2.0.3";
+  version = "1.2.0.4";
-  sha256 = "0iigswknh5w5zi6r99jks3bppylnw9hca9by2klwr2biw07nf09d";
+  sha256 = "10nd87bs6q1827ihwm13czflha2g8dhza443n55xpakba1sdgsaz";
   buildDepends = [
     ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive
-    conduit dataDefault fastLogger httpTypes network text time
+    conduit dataDefault fastLogger httpTypes network resourcet text
-    transformers wai zlibConduit
+    time transformers wai zlibConduit
   ];
   meta = {
     homepage = "http://github.com/yesodweb/wai";

pkgs/development/libraries/haskell/wai/default.nix

@@ -4,14 +4,11 @@
 
 cabal.mkDerivation (self: {
   pname = "wai";
-  version = "1.2.0.1";
+  version = "1.2.0.2";
-  sha256 = "00f95r1g2s689s1b0div28v7dnjiqz01d66acz77acp28cm0bnmc";
+  sha256 = "07h0znwlnfpikw9zxk7cxnyvsgqyix7lv8rylxzj259ylwfpk9fp";
   buildDepends = [
     blazeBuilder conduit httpTypes network text transformers vault
   ];
-  patchPhase = ''
-    sed -i -e 's|, vault.*|, vault|' wai.cabal
-  '';
   meta = {
     homepage = "https://github.com/yesodweb/wai";
     description = "Web Application Interface";

pkgs/development/libraries/haskell/warp/default.nix

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "1.2.0.1";
+  version = "1.2.0.2";
-  sha256 = "0lbyi6xchjkf6fx3d7dh5hg8gfq041hb0yls6vq8svd75dr0x5nv";
+  sha256 = "08gd0xzx3j47adl2pgvcc0dj7vvfj2igbvrgnl8rifz8r5gj17lq";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit httpTypes
     liftedBase network networkConduit simpleSendfile transformers

pkgs/development/libraries/haskell/xml-conduit/default.nix

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xml-conduit";
-  version = "0.7.0.1";
+  version = "0.7.0.2";
-  sha256 = "0ikkdgzvvadz7787jii8hwx8rls95jwvk7p4g2lw3ib8372hz4ly";
+  sha256 = "0qrfl946db56p2bfjrnmkl816fncn598g5jg1s1q4xq4jp7mm70k";
   buildDepends = [
     attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
     conduit dataDefault failure monadControl resourcet systemFilepath