From c3e966b0cb70e268835db2c111bad0140f08f4fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Fri, 6 Nov 2009 13:08:47 +0000
Subject: [PATCH] Updated xmonad to 0.9.

svn path=/nixpkgs/trunk/; revision=18204
---
 pkgs/applications/window-managers/xmonad/default.nix      | 4 ++--
 .../window-managers/xmonad/xmonad-contrib.nix             | 8 ++++----
 pkgs/development/libraries/haskell/X11/default.nix        | 4 ++--
 pkgs/top-level/haskell-packages.nix                       | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/window-managers/xmonad/default.nix b/pkgs/applications/window-managers/xmonad/default.nix
index 1207f2627fa..cda58ee0f25 100644
--- a/pkgs/applications/window-managers/xmonad/default.nix
+++ b/pkgs/applications/window-managers/xmonad/default.nix
@@ -3,8 +3,8 @@
 cabal.mkDerivation (self : {
   pname = "xmonad";
   name = "${self.fname}";
-  version = "0.8.1";
-  sha256 = "9d58789a0bc08d40b9d14097b079822c7b8290d60efc6aa79144abf47d5db32c";
+  version = "0.9";
+  sha256 = "51670f83de211a8ea24ce2724c71ac5c3e4782f25422319d8b5e43f3ae7bf9e8";
   propagatedBuildInputs = [X11 mtl];
   meta = {
     description = "xmonad is a tiling window manager for X";
diff --git a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
index fa29a2afd19..248f74fa61e 100644
--- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
@@ -1,11 +1,11 @@
-{cabal, xmonad, X11}:
+{cabal, xmonad, X11, utf8String}:
 
 cabal.mkDerivation (self : {
   pname = "xmonad-contrib";
   name = "${self.fname}";
-  version = "0.8.1";
-  sha256 = "dedbd2e7718f7383e403f5f0b40d411f27099625e7e1dcddd42f7c12bf6488a9";
-  propagatedBuildInputs = [X11 xmonad];
+  version = "0.9";
+  sha256 = "f67471785eba323ac416f912d3503976ef6ed43e93e53fabf5621b2c93351ae9";
+  propagatedBuildInputs = [X11 xmonad utf8String];
   meta = {
     description = "a huge extension library for xmonad";
   };
diff --git a/pkgs/development/libraries/haskell/X11/default.nix b/pkgs/development/libraries/haskell/X11/default.nix
index c9b57dccf4d..cf54b11977b 100644
--- a/pkgs/development/libraries/haskell/X11/default.nix
+++ b/pkgs/development/libraries/haskell/X11/default.nix
@@ -4,8 +4,8 @@ assert xineramaSupport -> (libXinerama != null && libXext != null);
 
 cabal.mkDerivation (self : {
   pname = "X11";
-  version = "1.4.5";
-  sha256 = "6665056b9fe5801ca27bf960a90215c940ae70b549753efed0303d5ed8d89ddb";
+  version = "1.4.6.1";
+  sha256 = "3e1375d4e53a8366fa2ea12bd9c3033ffe2f7dd00443acd84f722cf0dfff0fa9";
   propagatedBuildInputs = [libX11] ++ (if xineramaSupport then [libXinerama libXext] else []);
   meta = {
     description = "A Haskell binding to the X11 graphics library";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 8ee7ccc0697..779d175070e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -716,7 +716,7 @@ rec {
   };
 
   xmonadContrib = import ../applications/window-managers/xmonad/xmonad-contrib.nix {
-    inherit cabal xmonad X11;
+    inherit cabal xmonad X11 utf8String;
   };