From 7d15ad90b9ca4f2d06dd2f9e54c9d26f9926117d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 Jun 2012 08:31:42 +0000
Subject: [PATCH] Updated Haskell packages.

 - http-conduit: updated to version 1.4.1.8
 - leksah-server: updated to version 0.12.1.0
 - leksah: updated to version 0.12.1.0
 - ltk: updated to version 0.12.1.0
 - yaml: updated to version 0.7.0.3

svn path=/nixpkgs/trunk/; revision=34356
---
 pkgs/applications/editors/leksah/default.nix               | 4 ++--
 .../development/libraries/haskell/http-conduit/default.nix | 4 ++--
 .../development/libraries/haskell/leksah/leksah-server.nix | 4 ++--
 pkgs/development/libraries/haskell/ltk/default.nix         | 7 ++-----
 pkgs/development/libraries/haskell/yaml/default.nix        | 4 ++--
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/editors/leksah/default.nix b/pkgs/applications/editors/leksah/default.nix
index 40b5687ea91b..fe9315809a56 100644
--- a/pkgs/applications/editors/leksah/default.nix
+++ b/pkgs/applications/editors/leksah/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "leksah";
-  version = "0.12.0.3";
-  sha256 = "1374ffwban58kabnynacl0fyzs6756kd5q1lcfya46mp26l7syrd";
+  version = "0.12.1.0";
+  sha256 = "1993h74wfrndqgjx7xcfdhh5f2gqhg6kcbvzl1ckdbk8hynkia94";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index ffe5de07db3f..8f347ffa87ba 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "1.4.1.7";
-  sha256 = "0b3iz03y3s30wyj5j0r8s070qwwzjbk4cs7znag5yjxqgph1h22f";
+  version = "1.4.1.8";
+  sha256 = "0vf72r4dpqdkl951bmjq3hjy6wnqyhxkjq9hr2p8scw91606cxyl";
   buildDepends = [
     asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
     blazeBuilderConduit caseInsensitive certificate conduit cookie
diff --git a/pkgs/development/libraries/haskell/leksah/leksah-server.nix b/pkgs/development/libraries/haskell/leksah/leksah-server.nix
index f3658bdfe588..fb088181110a 100644
--- a/pkgs/development/libraries/haskell/leksah/leksah-server.nix
+++ b/pkgs/development/libraries/haskell/leksah/leksah-server.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "leksah-server";
-  version = "0.12.0.5";
-  sha256 = "0kr5xsnjl0brbdysw1rhd7a1gy3i0kn8rq2c5grc2m734ankil6z";
+  version = "0.12.1.0";
+  sha256 = "1jqrlz08ivr521a64cbdkixhgjra69qlfrasch7yac63dvf160i4";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/ltk/default.nix b/pkgs/development/libraries/haskell/ltk/default.nix
index a945512fa1cd..7960395eb098 100644
--- a/pkgs/development/libraries/haskell/ltk/default.nix
+++ b/pkgs/development/libraries/haskell/ltk/default.nix
@@ -2,12 +2,9 @@
 
 cabal.mkDerivation (self: {
   pname = "ltk";
-  version = "0.12.0.0";
-  sha256 = "1hlsfi77yypfnvh1alr3rflbffby9pbmc71m507davr6b09v9w9f";
+  version = "0.12.1.0";
+  sha256 = "12x6nba5bll8fgzpxii1cf87j27jk4mn5gf1bx4ahd9v30h1a0h6";
   buildDepends = [ Cabal filepath glib gtk mtl parsec transformers ];
-  patchPhase = ''
-    sed -i -e 's|mtl >=1.1.0.2 && <2.1|mtl|' -e 's|transformers >=0.2.2.0 && <0.3|transformers|' ltk.cabal
-  '';
   meta = {
     homepage = "http://www.leksah.org";
     description = "Leksah tool kit";
diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
index 8bc76c1baa7a..e3228d039c11 100644
--- a/pkgs/development/libraries/haskell/yaml/default.nix
+++ b/pkgs/development/libraries/haskell/yaml/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yaml";
-  version = "0.7.0.2";
-  sha256 = "0hhxvw3zzra8vkbm9914nq03wpy5x5mg6sipwajqz0hv3j5hlsf3";
+  version = "0.7.0.3";
+  sha256 = "1w9xsg48np3wi859jdg5vm3dxihbdrbvd1i364lsfblbmry964mr";
   buildDepends = [
     aeson attoparsec conduit resourcet text transformers
     unorderedContainers vector