Updated Haskell packages.

 - cryptocipher: updated to version 0.3.2
 - Crypto: updated to version 4.2.5
 - darcs: updated to version 2.8.1
 - hamlet: updated to version 1.0.1.3
 - monad-par-extras: updated to version 0.3.2
 - persistent-template: updated to version 0.9.0.2
 - pool-conduit: updated to version 0.1.0.2
 - shakespeare-css: updated to version 1.0.1.2
 - shakespeare-i18n: updated to version 1.0.0.2
 - shakespeare-js: updated to version 1.0.0.2
 - shakespeare-text: updated to version 1.0.0.2
 - shakespeare: updated to version 1.0.0.2
 - warp: updated to version 1.2.1
 - wxcore: updated to version 0.90.0.1
 - wxc: updated to version 0.90.0.3
 - wx: updated to version 0.90.0.1
 - xml-conduit: updated to version 0.7.0.3
 - xss-sanitize: updated to version 0.3.2
 - yesod-auth: updated to version 1.0.2.1
 - yesod-core: updated to version 1.0.1.2
 - yesod-default: updated to version 1.0.1.1
 - yesod-form: updated to version 1.0.0.4
 - yesod-json: updated to version 1.0.0.1
 - yesod-persistent: updated to version 1.0.0.1
 - yesod-routes: updated to version 1.0.1.2
 - yesod-static: updated to version 1.0.0.2
 - yesod: updated to version 1.0.1.6

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

28 files changed, 95 insertions, 120 deletions

diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix
index 4ce820b787600..53cb4b360a0c7 100644
--- a/pkgs/applications/version-management/darcs/default.nix
+++ b/pkgs/applications/version-management/darcs/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "darcs";
-  version = "2.8.0";
-  sha256 = "10yfab7qb20hzikwrgra7zhx7ad2j0s6l7zksmvczf4xm6hw458l";
+  version = "2.8.1";
+  sha256 = "1fz9k9zihb0fz0w2y55iqa1fd604nxzz48r62sx3ixxn8qqsvrd1";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/Crypto/class-constraints.diff b/pkgs/development/libraries/haskell/Crypto/class-constraints.diff
deleted file mode 100644
index 77035322678ad..0000000000000
--- a/pkgs/development/libraries/haskell/Crypto/class-constraints.diff
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/Data/Digest/SHA2.hs
-+++ b/Data/Digest/SHA2.hs
-@@ -106,7 +106,7 @@
- data Hash384 = Hash384 !Word64 !Word64 !Word64 !Word64 !Word64 !Word64 deriving (Eq, Ord)
- data Hash224 = Hash224 !Word32 !Word32 !Word32 !Word32 !Word32 !Word32 !Word32 deriving (Eq, Ord)
- 
--instance (Integral a) => Show (Hash8 a) where
-+instance (Integral a, Show a) => Show (Hash8 a) where
-  showsPrec _ (Hash8 a b c d e f g h) =
-   (showHex a) . (' ':) .
-   (showHex b) . (' ':) .
-@@ -146,7 +146,7 @@
-      where
-       bs = bitSize (head r)
- 
--instance (Integral h, Bits h) => Hash (Hash8 h) where
-+instance (Integral h, Bits h, Show h) => Hash (Hash8 h) where
-   toOctets (Hash8 x0 x1 x2 x3 x4 x5 x6 x7) = bitsToOctets =<< [x0, x1, x2, x3, x4, x5, x6, x7]
- 
- instance Hash Hash384 where
-@@ -282,4 +282,4 @@
- 
- -- Test with:
- -- ghc -no-recomp -O --make Data/Digest/SHA2.hs -main-is Data.Digest.SHA2.moduleTest -o moduleTest && ./moduleTest && rm moduleTest
--moduleTest = runTestTT test_sha2
-\ No newline at end of file
-+moduleTest = runTestTT test_sha2
diff --git a/pkgs/development/libraries/haskell/Crypto/default.nix b/pkgs/development/libraries/haskell/Crypto/default.nix
index 01bc1a1a01265..f6f06b9c283db 100644
--- a/pkgs/development/libraries/haskell/Crypto/default.nix
+++ b/pkgs/development/libraries/haskell/Crypto/default.nix
@@ -2,12 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "Crypto";
-  version = "4.2.4";
-  sha256 = "05wafv8flrh1893rh208azzig5k5pa022s2fg3f8lrqb23c6v63p";
+  version = "4.2.5";
+  sha256 = "0wv48is2jqia8hda6q65y3mhabxlw9hjzmpk3dx70rzh4w44yxb8";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ HUnit QuickCheck random ];
-  patches = [ ./class-constraints.diff ];
   meta = {
     description = "Collects together existing Haskell cryptographic functions into a package";
     license = "unknown";
diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix
index 1b2dc44fbdd94..767891bf18acf 100644
--- a/pkgs/development/libraries/haskell/cryptocipher/default.nix
+++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cryptocipher";
-  version = "0.3.1";
-  sha256 = "14icn1p0mjg4y45q6pbh8qamw5hm1z2z7d424gmiknbf24nq8nmi";
+  version = "0.3.2";
+  sha256 = "0nw7rwlnakdslzg4z6ik9hfylwnrbn103n677w0xr5b81wj19a5j";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
index 5a13b3e888ec8..083e75a87f191 100644
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -1,13 +1,13 @@
-{ cabal, blazeBuilder, blazeHtml, failure, parsec, shakespeare
-, text
+{ cabal, blazeBuilder, blazeHtml, blazeMarkup, failure, parsec
+, shakespeare, text
 }:
 
 cabal.mkDerivation (self: {
   pname = "hamlet";
-  version = "1.0.1.2";
-  sha256 = "1lb1q2nkih7z63gh1rdwl4656ybmpdqic1d09q5jqgm6bjqrgw53";
+  version = "1.0.1.3";
+  sha256 = "0pdnq8kvln6jr5gwzd1fj0knd2ph1a76ra1njwaccliqig1s7j3n";
   buildDepends = [
-    blazeBuilder blazeHtml failure parsec shakespeare text
+    blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text
   ];
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";
diff --git a/pkgs/development/libraries/haskell/monad-par-extras/default.nix b/pkgs/development/libraries/haskell/monad-par-extras/default.nix
index 2be599a7c5c5d..fb87733722125 100644
--- a/pkgs/development/libraries/haskell/monad-par-extras/default.nix
+++ b/pkgs/development/libraries/haskell/monad-par-extras/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-par-extras";
-  version = "0.3";
-  sha256 = "1nrxzqswb265slxq4dhm6bav7zb4zglbrh99w5x6hwx6drgsw10d";
+  version = "0.3.2";
+  sha256 = "1k0j3n803z4lv5impz6xd1nzav35dl5f68nlw2ppgg1bbfpvdv6b";
   buildDepends = [
     abstractPar cereal deepseq mtl random transformers
   ];
diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
index b83a32385dec7..a4bbb10a5ddb6 100644
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-template";
-  version = "0.9.0.1";
-  sha256 = "0hxv69qifkmv36zkzlhlw40s6zzv4jf977iqim069b4v8824r9pc";
+  version = "0.9.0.2";
+  sha256 = "1x3xn5dxv41hbadb0riss046lcr3k0h4rg6cvk60x8zxblrswabw";
   buildDepends = [ aeson monadControl persistent text transformers ];
   meta = {
     homepage = "http://www.yesodweb.com/book/persistent";
diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix
index abb5d83f5e7ad..73966514e49ac 100644
--- a/pkgs/development/libraries/haskell/pool-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/pool-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pool-conduit";
-  version = "0.1.0.1";
-  sha256 = "1a88x8yi5p99qpq262idfzn9f5cjjdq417rbayp0kknm5c6d9n5c";
+  version = "0.1.0.2";
+  sha256 = "1fs2kskvsvck9n011f2pv0s3mxd2hh71p61dxrskz79mfvks5yky";
   buildDepends = [ resourcePool resourcet transformers ];
   meta = {
     homepage = "http://www.yesodweb.com/book/persistent";
diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
index 1fd81d9d6a525..1fd00e5e08a46 100644
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-css";
-  version = "1.0.1.1";
-  sha256 = "1janifi0sqdvxwq8ywk6g1y9r8qgy2jvizlm0drp09lnw1dlss25";
+  version = "1.0.1.2";
+  sha256 = "055nzffn5zlbwilm8624iaqzxchi247rwpca8adbxai1n2ja9fh7";
   buildDepends = [ parsec shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";
diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
index 5ef05d877e307..1150ead039416 100644
--- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-i18n";
-  version = "1.0.0.1";
-  sha256 = "1g4jczz3kvfvdk2w64kbphmv451g8khx5d1bxmhscqkmlh6zgqjz";
+  version = "1.0.0.2";
+  sha256 = "11ydkl6v31v79q8a8fqf4p99p7dv9dlimr3rhi9cs5lrxz9gmf5z";
   buildDepends = [ parsec shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";
diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
index f6b7fbbea4b33..1b8605bb8021b 100644
--- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-js";
-  version = "1.0.0.1";
-  sha256 = "13l1hsc6b87lbz10xhihvmzf1922mwmrbinr4rhkrn48hlxf2fii";
+  version = "1.0.0.2";
+  sha256 = "1qygxihhfl7wzv3djxmldh82pwk8rhnk54zfvwy1pxhxb8y30wkm";
   buildDepends = [ shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";
diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
index ad12fdd1d07ad..04f9a1006198b 100644
--- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-text";
-  version = "1.0.0.1";
-  sha256 = "0afbxjz6ma0fk4m3xp8cx9sfaxdnsxzbj3ikyfn6vmx4ivid299f";
+  version = "1.0.0.2";
+  sha256 = "1dnw6aipx68cd832vs5rwxv2hr7kfk1y83mzd1xl2b3am1g0izfc";
   buildDepends = [ shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";
diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix
index f8a88002f71c9..c5fd290f08ded 100644
--- a/pkgs/development/libraries/haskell/shakespeare/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare";
-  version = "1.0.0.1";
-  sha256 = "1x682irbxr7wwrpz4ri2j4pl85r8s8hs0draf9bfaskagp14d522";
+  version = "1.0.0.2";
+  sha256 = "04nk9l7c5wk3rbkk57s5as30zvsa7wzrsmhdak59i6v30ww22c9f";
   buildDepends = [ parsec text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";
diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index 47d91c4172f97..18633f4cc1b1b 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "1.2.0.2";
-  sha256 = "08gd0xzx3j47adl2pgvcc0dj7vvfj2igbvrgnl8rifz8r5gj17lq";
+  version = "1.2.1";
+  sha256 = "0yjvd9dc0rwczj3041s55lhfn46zhymgibrawl84ssxky68syhx4";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit httpTypes
     liftedBase network networkConduit simpleSendfile transformers
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix
index 98dcc20feb0f6..dc030f68059ae 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wx";
-  version = "0.90";
-  sha256 = "01rr8n99mas5x0vfxh8wf01vbh29vil860waxnsn6xdqc9fm5jj2";
+  version = "0.90.0.1";
+  sha256 = "116vlpssjcyzil99xmz3azc2vl97iban3gdpxd593q5gi24l838m";
   buildDepends = [ stm wxcore ];
   meta = {
     homepage = "http://haskell.org/haskellwiki/WxHaskell";
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
index b96ecfb4d9d83..7bfd121a13fd9 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wxc";
-  version = "0.90.0.2";
-  sha256 = "1vqs9517qacm04d2bxpbpcdgfmlhpblm6af45nmcdikvlfa1v0jp";
+  version = "0.90.0.3";
+  sha256 = "14b8g2w4knwxj5vkp759y8m3nmsi4n1zy57ma1kz7lw6jklb7dlq";
   buildDepends = [ wxdirect ];
   extraLibraries = [ libX11 mesa wxGTK ];
   noHaddock = true;
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
index 4627e7fcf1d7e..9fa98d47f91e0 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wxcore";
-  version = "0.90";
-  sha256 = "1vrv683576cdvxfiriw2aw5kw1gzrddd27pxa06rrg5nny0jni46";
+  version = "0.90.0.1";
+  sha256 = "031947805bjw32f1a8w2ra8714ysq5k0pxp11cr9hgcc93l9f3pq";
   buildDepends = [ filepath parsec stm time wxc wxdirect ];
   extraLibraries = [ libX11 mesa wxGTK ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
index 192d836686d3d..9e2d0c59a5222 100644
--- a/pkgs/development/libraries/haskell/xml-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xml-conduit";
-  version = "0.7.0.2";
-  sha256 = "0qrfl946db56p2bfjrnmkl816fncn598g5jg1s1q4xq4jp7mm70k";
+  version = "0.7.0.3";
+  sha256 = "143cd8mjxckknlza327cmn63prw89ypnw32bk762s72vbqm1xvvv";
   buildDepends = [
     attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
     conduit dataDefault failure monadControl resourcet systemFilepath
diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
index 6df83a35723b4..0fac2ad63727a 100644
--- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix
+++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xss-sanitize";
-  version = "0.3.1.1";
-  sha256 = "1nv28nk1fdxym1vv50wgkyfkinpr3bd7cn6vwi41x5iqy9vgjjpl";
+  version = "0.3.2";
+  sha256 = "0m7gl232i06i090kbrlz67cs4q3pqf8169m9kjdj41kj6jay1dcx";
   buildDepends = [
     attoparsec cssText network tagsoup text utf8String
   ];
diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index 4ee7f77e52633..3b92570989e88 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -1,19 +1,20 @@
-{ cabal, aeson, authenticate, blazeHtml, hamlet, httpConduit
-, liftedBase, mimeMail, persistent, persistentTemplate, pureMD5
-, pwstoreFast, random, SHA, shakespeareCss, text, transformers
-, unorderedContainers, wai, yesodCore, yesodForm, yesodJson
-, yesodPersistent
+{ cabal, aeson, authenticate, blazeHtml, blazeMarkup, hamlet
+, httpConduit, liftedBase, mimeMail, persistent, persistentTemplate
+, pureMD5, pwstoreFast, random, SHA, shakespeareCss, text
+, transformers, unorderedContainers, wai, yesodCore, yesodForm
+, yesodJson, yesodPersistent
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.0.2";
-  sha256 = "1rbp62phyzlxm458xgqxg3qg5fvivmhcgzd8pprqy9ya0v58wwlr";
+  version = "1.0.2.1";
+  sha256 = "0fkk9vyb8z9hr77d771f74ka6s95fbzk5zw359cx8m2d5rc9fqvr";
   buildDepends = [
-    aeson authenticate blazeHtml hamlet httpConduit liftedBase mimeMail
-    persistent persistentTemplate pureMD5 pwstoreFast random SHA
-    shakespeareCss text transformers unorderedContainers wai yesodCore
-    yesodForm yesodJson yesodPersistent
+    aeson authenticate blazeHtml blazeMarkup hamlet httpConduit
+    liftedBase mimeMail persistent persistentTemplate pureMD5
+    pwstoreFast random SHA shakespeareCss text transformers
+    unorderedContainers wai yesodCore yesodForm yesodJson
+    yesodPersistent
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";
diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index ac5f201a028cd..b21ce4b00f065 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -1,21 +1,22 @@
-{ cabal, aeson, blazeBuilder, blazeHtml, caseInsensitive, cereal
-, clientsession, conduit, cookie, failure, fastLogger, hamlet
-, httpTypes, liftedBase, monadControl, parsec, pathPieces, random
-, resourcet, shakespeare, shakespeareCss, shakespeareI18n
-, shakespeareJs, text, time, transformers, transformersBase, vector
-, wai, waiExtra, waiLogger, yesodRoutes
+{ cabal, aeson, blazeBuilder, blazeHtml, blazeMarkup
+, caseInsensitive, cereal, clientsession, conduit, cookie, failure
+, fastLogger, hamlet, httpTypes, liftedBase, monadControl, parsec
+, pathPieces, random, resourcet, shakespeare, shakespeareCss
+, shakespeareI18n, shakespeareJs, text, time, transformers
+, transformersBase, vector, wai, waiExtra, waiLogger, yesodRoutes
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.0.1.1";
-  sha256 = "05zspm7dfkjzb40839qnf002hxsav01vxkv3dccidvp0q340j0vz";
+  version = "1.0.1.2";
+  sha256 = "1c9ay0xv2s1kcj92ai0bj1gbml4k4w62n2mw7c5r6m88k8wmxh6z";
   buildDepends = [
-    aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession
-    conduit cookie failure fastLogger hamlet httpTypes liftedBase
-    monadControl parsec pathPieces random resourcet shakespeare
-    shakespeareCss shakespeareI18n shakespeareJs text time transformers
-    transformersBase vector wai waiExtra waiLogger yesodRoutes
+    aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal
+    clientsession conduit cookie failure fastLogger hamlet httpTypes
+    liftedBase monadControl parsec pathPieces random resourcet
+    shakespeare shakespeareCss shakespeareI18n shakespeareJs text time
+    transformers transformersBase vector wai waiExtra waiLogger
+    yesodRoutes
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";
diff --git a/pkgs/development/libraries/haskell/yesod-default/default.nix b/pkgs/development/libraries/haskell/yesod-default/default.nix
index 50896ae3c0edb..d801d36e9c415 100644
--- a/pkgs/development/libraries/haskell/yesod-default/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-default/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-default";
-  version = "1.0.1";
-  sha256 = "1b9qxfs9pbgn090cipnnbd6vf1ajyhs0xjfynkj87k8fx6j2lqb9";
+  version = "1.0.1.1";
+  sha256 = "0jv7fxrgh2x93saz0vrba0mzafq3wmq85b3idcsny4d8mgj6ngv0";
   buildDepends = [
     networkConduit shakespeareCss shakespeareJs text transformers
     unorderedContainers wai waiExtra warp yaml yesodCore
diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index 85a6228e79359..512c0ca1b6d15 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -1,16 +1,17 @@
-{ cabal, blazeBuilder, blazeHtml, dataDefault, emailValidate
-, hamlet, network, persistent, shakespeareCss, shakespeareJs, text
-, time, transformers, wai, xssSanitize, yesodCore, yesodPersistent
+{ cabal, blazeBuilder, blazeHtml, blazeMarkup, dataDefault
+, emailValidate, hamlet, network, persistent, shakespeareCss
+, shakespeareJs, text, time, transformers, wai, xssSanitize
+, yesodCore, yesodPersistent
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "1.0.0.3";
-  sha256 = "0xqgvmpxv9lrpl06qh3pqn53f5pa02k8v5c4z6brzb8s44ppw1pq";
+  version = "1.0.0.4";
+  sha256 = "1wc7nrsf7r9zs24q2amy1zij5sfycs1arnrf8g769c7gihjhdqfd";
   buildDepends = [
-    blazeBuilder blazeHtml dataDefault emailValidate hamlet network
-    persistent shakespeareCss shakespeareJs text time transformers wai
-    xssSanitize yesodCore yesodPersistent
+    blazeBuilder blazeHtml blazeMarkup dataDefault emailValidate hamlet
+    network persistent shakespeareCss shakespeareJs text time
+    transformers wai xssSanitize yesodCore yesodPersistent
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";
diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix
index debc3d7cb0967..7ff0abedc1a80 100644
--- a/pkgs/development/libraries/haskell/yesod-json/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-json/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-json";
-  version = "1.0.0";
-  sha256 = "159j303yd3d5n2iqkbi55vj9d5d3jdnpnz115m9p6nf60qqmhj97";
+  version = "1.0.0.1";
+  sha256 = "0dh294y067xa1y9lxamspbq21npv66ilsiayynsiykzik86k6vph";
   buildDepends = [
     aeson attoparsecConduit blazeBuilder conduit safe shakespeareJs
     text transformers vector wai waiExtra yesodCore yesodRoutes
diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix
index 42f3f93c5076c..c6cf7f22159a1 100644
--- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-persistent";
-  version = "1.0.0";
-  sha256 = "1dawhs9ab2z5njq9m37p9zrr5wdzrmw4i0ixb2j4rhff8z50hjaf";
+  version = "1.0.0.1";
+  sha256 = "1v4ip4g9x2a5byl0a9a1raad3aba7hs618vx7fnc5n2ajjji84mx";
   buildDepends = [
     persistent persistentTemplate transformers yesodCore
   ];
diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix
index adf9ed5f2c643..8b3a685105a72 100644
--- a/pkgs/development/libraries/haskell/yesod-routes/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-routes";
-  version = "1.0.1";
-  sha256 = "12m2j7sl7gr8755xza7k5nlqxl4g7az3vin5vdl8km5aw754761w";
+  version = "1.0.1.2";
+  sha256 = "15ar99ywxrsd6pgqwmql7vg801n53l3jw0s2iynddq9jjl4yqpf7";
   buildDepends = [ pathPieces text vector ];
   meta = {
     homepage = "http://www.yesodweb.com/";
diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix
index a921e621f5cb8..c37287cd241d3 100644
--- a/pkgs/development/libraries/haskell/yesod-static/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-static/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-static";
-  version = "1.0.0.1";
-  sha256 = "1zrpwd9dfqw5bzmrcsny4xkrw3y71ki8xhdfcyznf1bkmbnbim5n";
+  version = "1.0.0.2";
+  sha256 = "12r3i4s1g9wlf5jmbvqw9qzcgw96zdlky6zisdipy40yzpg6m07v";
   buildDepends = [
     base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed
     httpTypes text transformers unixCompat wai waiAppStatic yesodCore
diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index b8ffdba7c6ede..256c398cfe4cb 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -1,21 +1,21 @@
-{ cabal, attoparsec, blazeBuilder, blazeHtml, Cabal, fastLogger
-, filepath, hamlet, httpTypes, monadControl, parsec, shakespeareCss
-, shakespeareJs, shakespeareText, text, time, transformers
-, unixCompat, wai, waiExtra, waiLogger, warp, yesodAuth, yesodCore
-, yesodForm, yesodJson, yesodPersistent
+{ cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup, Cabal
+, fastLogger, filepath, hamlet, httpTypes, monadControl, parsec
+, shakespeareCss, shakespeareJs, shakespeareText, text, time
+, transformers, unixCompat, wai, waiExtra, waiLogger, warp
+, yesodAuth, yesodCore, yesodForm, yesodJson, yesodPersistent
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod";
-  version = "1.0.1.5";
-  sha256 = "1va0pq5gn10anh333fqv8a99gngjip5w5lwl4i5q7lbparz93iji";
+  version = "1.0.1.6";
+  sha256 = "0w5k5bcv50fjpyja6ydknk78dk50swx6b0myhizj8rcf851xga43";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    attoparsec blazeBuilder blazeHtml Cabal fastLogger filepath hamlet
-    httpTypes monadControl parsec shakespeareCss shakespeareJs
-    shakespeareText text time transformers unixCompat wai waiExtra
-    waiLogger warp yesodAuth yesodCore yesodForm yesodJson
+    attoparsec blazeBuilder blazeHtml blazeMarkup Cabal fastLogger
+    filepath hamlet httpTypes monadControl parsec shakespeareCss
+    shakespeareJs shakespeareText text time transformers unixCompat wai
+    waiExtra waiLogger warp yesodAuth yesodCore yesodForm yesodJson
     yesodPersistent
   ];
   meta = {