From b24a91af8d6a1f7b38012092ee786895b8b6a318 Mon Sep 17 00:00:00 2001
From: Jose Antonio Ortega Ruiz <jao@gnu.org>
Date: Sun, 7 Oct 2012 23:52:13 +0200
Subject: small_base flag eliminated

---
 xmobar.cabal | 50 ++++++++++++++++++--------------------------------
 1 file changed, 18 insertions(+), 32 deletions(-)

diff --git a/xmobar.cabal b/xmobar.cabal
index 3e8caa7..94edc41 100644
--- a/xmobar.cabal
+++ b/xmobar.cabal
@@ -26,9 +26,6 @@ source-repository head
   location:  git://github.com/jaor/xmobar.git
   branch:    master
 
-flag small_base
-  description: Choose the new smaller, split-up base package.
-
 flag with_xft
   description: Use Xft to render text. UTF-8 support included.
   default: False
@@ -93,45 +90,34 @@ executable xmobar
       Plugins.Monitors.Bright
 
     ghc-prof-options:   -prof -auto-all
+    ghc-options: -funbox-strict-fields -Wall -fno-warn-unused-do-bind
+    extra-libraries: Xrandr
 
-    if true
-       ghc-options: -funbox-strict-fields -Wall
-       extra-libraries: Xrandr
+    build-depends:
+      base == 4.*,
+      containers,
+      process,
+      old-locale,
+      bytestring,
+      directory,
+      unix,
+      time,
+      filepath,
+      X11 == 1.6.*,
+      mtl >= 2.0 && < 2.2,
+      parsec == 3.1.*,
+      stm >= 2.3 && < 2.5
 
     if flag(with_threaded)
-       -- -threaded is a workaround 100% CPU busy loop
-       -- (http://hackage.haskell.org/trac/ghc/ticket/4934)
+       -- -threaded is a workaround for 100% CPU busy loop
+       -- (http://hackage.haskell.org/trac/ghc/ticket/4934).
        -- See also comments in https://github.com/jaor/xmobar/pull/36
        ghc-options: -threaded
        cpp-options: -DTHREADED_RUNTIME
 
-    if impl (ghc >= 6.12.1)
-       ghc-options: -fno-warn-unused-do-bind
-
-    --  for instance declaration in src/Plugins/Monitors/CoreCommon.hs
     if impl (ghc < 7)
        cpp-options: -DGHC6
 
-    build-depends:
-      unix,
-      time,
-      filepath,
-      X11 == 1.6.*,
-      mtl >= 2.0 && < 2.2,
-      parsec == 3.1.*,
-      stm >= 2.3 && <2.5
-
-    if flag(small_base)
-       build-depends:
-         base == 4.*,
-         containers,
-         process,
-         old-locale,
-         bytestring,
-         directory
-    else
-       build-depends: base < 3
-
     if flag(with_xft) || flag(all_extensions)
        build-depends: utf8-string == 0.3.*, X11-xft >= 0.2 && < 0.4
        other-modules: MinXft
-- 
cgit v1.2.3