summary refs log tree commit diff
path: root/pkgs/development/libraries/haskell/blaze-html/default.nix
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2012-03-31 20:01:40 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2012-03-31 20:01:40 +0000
commit5299c1f6fb7cc9fa5e6dad9107ccab1417179731 (patch)
tree52d7d482e7310407aa3f48dfd757ec13a6ce413d /pkgs/development/libraries/haskell/blaze-html/default.nix
parent3f44fb8f2f1ab6bb0571eef0fe16748d951b91f1 (diff)
parentd789eb6a05b5eb2bd3c46798a1e7babfcffe1413 (diff)
svn merge ^/nixpkgs/trunk backups/glib-2.30-take2@33502
- 1 conflict (gnome-doc-utils)
- final merge before --reintegrate

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500
Diffstat (limited to 'pkgs/development/libraries/haskell/blaze-html/default.nix')
-rw-r--r--pkgs/development/libraries/haskell/blaze-html/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix
index 7820566e42d68..e4772a1f51cf6 100644
--- a/pkgs/development/libraries/haskell/blaze-html/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-html/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-html";
-  version = "0.4.3.2";
-  sha256 = "1mqfvkmjfqy777h4skvgm9nxjgyi12k8alg7mvsk0aj1i80gvkki";
+  version = "0.4.3.3";
+  sha256 = "0a3g4s4k85h2qvs2kcalv83ma4z5arqdydla64q5d1qlk9c99mzg";
   buildDepends = [ blazeBuilder text ];
   meta = {
     homepage = "http://jaspervdj.be/blaze";