From 258a47fcc755fd9f92d29ec0138fa84b3770e913 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 12 Oct 2014 16:12:27 +0200
Subject: [PATCH] haskell-xmobar: update to version 0.22.1

---
 pkgs/applications/misc/xmobar/default.nix | 16 ++++++++--------
 pkgs/top-level/all-packages.nix           | 13 -------------
 pkgs/top-level/haskell-packages.nix       |  2 ++
 3 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix
index 461921f74095..65201f2495b9 100644
--- a/pkgs/applications/misc/xmobar/default.nix
+++ b/pkgs/applications/misc/xmobar/default.nix
@@ -1,23 +1,23 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, alsaCore, alsaMixer, dbus, filepath, hinotify, HTTP
-, libmpd, libXrandr, mtl, parsec, regexCompat, stm, time
-, timezoneOlson, timezoneSeries, utf8String, wirelesstools, X11
-, X11Xft, libXpm
+, libmpd, libXpm, libXrandr, mtl, parsec, regexCompat, stm, time
+, timezoneOlson, timezoneSeries, transformers, utf8String
+, wirelesstools, X11, X11Xft
 }:
 
 cabal.mkDerivation (self: {
   pname = "xmobar";
-  version = "0.22";
-  sha256 = "158q2mcdn58jjli3wh3zlcjchrzz9krdgvx39n8qdl6a9pgmf8bd";
+  version = "0.22.1";
+  sha256 = "0mnwwcfk0xf4fi3cnw19s6lxcg8sbsdlvg7zwvf5xf0y9q365swz";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
     alsaCore alsaMixer dbus filepath hinotify HTTP libmpd mtl parsec
-    regexCompat stm time timezoneOlson timezoneSeries utf8String X11
-    X11Xft
+    regexCompat stm time timezoneOlson timezoneSeries transformers
+    utf8String X11 X11Xft
   ];
-  extraLibraries = [ libXrandr wirelesstools libXpm ];
+  extraLibraries = [ libXpm libXrandr wirelesstools ];
   configureFlags = "-fall_extensions";
   meta = {
     homepage = "http://xmobar.org";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a399ab993c04..8271bcdb8980 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2698,19 +2698,6 @@ let
 
   xmltv = callPackage ../tools/misc/xmltv { };
 
-  xmobar = let haskellPackagesExt = haskellPackages.override {
-      extension = self : super : {
-        # We need to disable tests unfortunately because doctest
-        # does not work with transformers-overrides, because it
-        # uses the GHC API.
-        cabal = super.cabal.override { enableCheckPhase = false; };
-
-        transformers = self.transformers_0_4_1_0;
-        mtl = self.mtl_2_2_1;
-      };
-    };
-    in haskellPackagesExt.callPackage ../applications/misc/xmobar {};
-
   xmpppy = builderDefsPackage (import ../development/python-modules/xmpppy) {
     inherit python setuptools;
   };
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 59a4a290e0d9..189e472521b0 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -3069,6 +3069,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   xlsx = callPackage ../development/libraries/haskell/xlsx {};
 
+  xmobar = callPackage ../applications/misc/xmobar {};
+
   xmonad = callPackage ../applications/window-managers/xmonad {};
 
   xmonadContrib = callPackage ../applications/window-managers/xmonad/xmonad-contrib.nix {};