From 3fd1093d2d07b7c2938602a69f9190e56d683b8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Mon, 20 Apr 2009 13:01:34 +0000
Subject: [PATCH] xmonad and xmobar updates

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

diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix
index 4e767177e29e..7c7fa4c88cc6 100644
--- a/pkgs/applications/misc/xmobar/default.nix
+++ b/pkgs/applications/misc/xmobar/default.nix
@@ -1,11 +1,11 @@
-{cabal, X11}:
+{cabal, X11, mtl, parsec, stm}:
 
 cabal.mkDerivation (self : {
   pname = "xmobar";
   name = "${self.fname}";
-  version = "0.8";
-  sha256 = "88aa5bc0715e2592282e5897bc7938f16580804f56757bc71ed3762bf86c9415";
-  extraBuildInputs = [X11];
+  version = "0.9.2";
+  sha256 = "361295f5dc912512a2eb644ecd331562a271243192be6215cb071e44f50c7c66";
+  extraBuildInputs = [X11 mtl parsec stm];
   meta = {
     description = "xmobar is a minimalistic text based status bar";
   };
diff --git a/pkgs/applications/window-managers/xmonad/default.nix b/pkgs/applications/window-managers/xmonad/default.nix
index ed01ddd3e335..1207f2627faf 100644
--- a/pkgs/applications/window-managers/xmonad/default.nix
+++ b/pkgs/applications/window-managers/xmonad/default.nix
@@ -1,11 +1,11 @@
-{cabal, X11, xmessage}:
+{cabal, X11, mtl, xmessage}:
 
 cabal.mkDerivation (self : {
   pname = "xmonad";
   name = "${self.fname}";
-  version = "0.7";
-  sha256 = "d5ee338eb6d0680082e20eaafa0b23b32358fffe69e2ec4ad7bdf6e03c751d67";
-  extraBuildInputs = [X11];
+  version = "0.8.1";
+  sha256 = "9d58789a0bc08d40b9d14097b079822c7b8290d60efc6aa79144abf47d5db32c";
+  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 2c0e250470fd..9793eba3d76b 100644
--- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
@@ -3,8 +3,8 @@
 cabal.mkDerivation (self : {
   pname = "xmonad-contrib";
   name = "${self.fname}";
-  version = "0.7";
-  sha256 = "4034d0c8ce092fc9b4e9d9ecf89bc9c16c4ac28aad190f074edc9e4201db0697";
+  version = "0.8.1";
+  sha256 = "dedbd2e7718f7383e403f5f0b40d411f27099625e7e1dcddd42f7c12bf6488a9";
   extraBuildInputs = [X11 xmonad];
   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 3b6c87bab589..c9b57dccf4d9 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.2";
-  sha256 = "7a37ba1adee9c30a27013ea7058e907c2348ef08eaa79c9895e62e4f0d73d2aa";
+  version = "1.4.5";
+  sha256 = "6665056b9fe5801ca27bf960a90215c940ae70b549753efed0303d5ed8d89ddb";
   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 13264ee819cd..f044d5f1247c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -307,11 +307,11 @@ rec {
   };
   
   xmobar = import ../applications/misc/xmobar {
-    inherit cabal X11;
+    inherit cabal X11 mtl parsec stm;
   };
 
   xmonad = import ../applications/window-managers/xmonad {
-    inherit cabal X11;
+    inherit cabal X11 mtl;
     inherit (pkgs.xlibs) xmessage;
   };