From cfc9624c081e562074cdc272851ee6a914a91dd5 Mon Sep 17 00:00:00 2001
From: Tobias Hammerschmidt <tobias.hammerschmidt@gmx.de>
Date: Tue, 15 Apr 2008 20:03:25 +0000
Subject: [PATCH] X11 version 1.4.2, added xmobar a minimalistic status bar
 written in haskell (integrates fine with xmonad)

svn path=/nixpkgs/trunk/; revision=11645
---
 pkgs/applications/misc/xmobar/default.nix          | 12 ++++++++++++
 pkgs/development/libraries/haskell/X11/default.nix |  4 ++--
 pkgs/top-level/all-packages.nix                    |  4 ++++
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/misc/xmobar/default.nix

diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix
new file mode 100644
index 000000000000..4e767177e29e
--- /dev/null
+++ b/pkgs/applications/misc/xmobar/default.nix
@@ -0,0 +1,12 @@
+{cabal, X11}:
+
+cabal.mkDerivation (self : {
+  pname = "xmobar";
+  name = "${self.fname}";
+  version = "0.8";
+  sha256 = "88aa5bc0715e2592282e5897bc7938f16580804f56757bc71ed3762bf86c9415";
+  extraBuildInputs = [X11];
+  meta = {
+    description = "xmobar is a minimalistic text based status bar";
+  };
+})
diff --git a/pkgs/development/libraries/haskell/X11/default.nix b/pkgs/development/libraries/haskell/X11/default.nix
index 39fb56284678..3b6c87bab589 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.1";
-  sha256 = "e51038541415686f0e278ccdbc0b2373cd11f212de99023b7b8f8e776aa09f79";
+  version = "1.4.2";
+  sha256 = "7a37ba1adee9c30a27013ea7058e907c2348ef08eaa79c9895e62e4f0d73d2aa";
   propagatedBuildInputs = [libX11] ++ (if xineramaSupport then [libXinerama libXext] else []);
   meta = {
     description = "A Haskell binding to the X11 graphics library";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f90252cf4c10..c81dc51678ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5882,6 +5882,10 @@ let pkgs = rec {
     stdenv = overrideGCC stdenv gcc34; # due to problems with gcc 4.x
   };
 
+  xmobar = import ../applications/misc/xmobar {
+    inherit cabal X11;
+  };
+
   xmonad = import ../applications/window-managers/xmonad {
     inherit cabal X11;
     inherit (xlibs) xmessage;