From 372f57cd3361e2be3b19da27cfccfcfc7c121e47 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sat, 11 Oct 2014 12:53:00 +0200
Subject: [PATCH] xmobar needs mtl 2.2.1 and transformers 0.4

---
 pkgs/top-level/all-packages.nix     | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix |  4 ----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e435553eb12a..77f20d8f9cde 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2694,6 +2694,19 @@ 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 e636dc999367..d5ec16197cc0 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -3073,10 +3073,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   xlsx = callPackage ../development/libraries/haskell/xlsx {};
 
-  xmobar = callPackage ../applications/misc/xmobar {
-    libmpd = self.libmpd_0_8_0_5;
-  };
-
   xmonad = callPackage ../applications/window-managers/xmonad {};
 
   xmonadContrib = callPackage ../applications/window-managers/xmonad/xmonad-contrib.nix {};