summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--Plugins/Monitors/Disk.hs2
-rw-r--r--README4
-rw-r--r--StatFS.hsc (renamed from Plugins/Monitors/StatFS.hsc)5
-rw-r--r--xmobar.cabal23
4 files changed, 17 insertions, 17 deletions
diff --git a/Plugins/Monitors/Disk.hs b/Plugins/Monitors/Disk.hs
index 3a9a70f..c0d8de7 100644
--- a/Plugins/Monitors/Disk.hs
+++ b/Plugins/Monitors/Disk.hs
@@ -17,7 +17,7 @@ module Plugins.Monitors.Disk ( diskUConfig, runDiskU
) where
import Plugins.Monitors.Common
-import Plugins.Monitors.StatFS
+import StatFS
import Control.Monad (zipWithM)
import qualified Data.ByteString.Lazy.Char8 as B
diff --git a/README b/README
index 27fdcfb..4fdcf4e 100644
--- a/README
+++ b/README
@@ -433,7 +433,7 @@ Monitors have default aliases.
- Args: list of maildirs in form [("name1","path1"),("name2","path2")]
- This plugin requires INOTIFY support in Linux kernel and hinotify library.
To activate, pass --flags="with_inotify" to "runhaskell Setup configure"
- or to "cabal configure".
+ or to "cabal install".
`MBox Mboxes BaseDir`
@@ -447,7 +447,7 @@ Monitors have default aliases.
absolute.
- This plugin requires INOTIFY support in Linux kernel and hinotify library.
To activate, pass --flags="with_inotify" to "runhaskell Setup
- configure" or to "cabal configure".
+ configure" or to "cabal install".
- Example:
`Run MBox [("I ", "inbox", "red"), ("O ", "/foo/mbox", "")] "/var/mail/"`
will look for mails in /var/mail/inbox and /foo/mbox.
diff --git a/Plugins/Monitors/StatFS.hsc b/StatFS.hsc
index 9c1972c..215be81 100644
--- a/Plugins/Monitors/StatFS.hsc
+++ b/StatFS.hsc
@@ -1,6 +1,6 @@
-----------------------------------------------------------------------------
-- |
--- Module : Plugins.Monitors.StatFS
+-- Module : StatFS
-- Copyright : (c) Jose A Ortega Ruiz
-- License : BSD-style (see LICENSE)
--
@@ -15,8 +15,7 @@
{-# LANGUAGE CPP, ForeignFunctionInterface, EmptyDataDecls #-}
-module Plugins.Monitors.StatFS ( FileSystemStats(..)
- , getFileSystemStats ) where
+module StatFS ( FileSystemStats(..), getFileSystemStats ) where
import Foreign
import Foreign.C.Types
diff --git a/xmobar.cabal b/xmobar.cabal
index f3ded0b..24f6b36 100644
--- a/xmobar.cabal
+++ b/xmobar.cabal
@@ -33,17 +33,19 @@ flag with_inotify
executable xmobar
main-is: Main.hs
- other-Modules: Xmobar, Config, Parsers, Commands, XUtil, Runnable, Plugins, Plugins.Monitors.StatFS
+ other-Modules: Xmobar, Config, Parsers, Commands, XUtil, StatFS, Runnable, Plugins
ghc-prof-options: -prof -auto-all
if true
- ghc-options: -funbox-strict-fields -Wall
+ ghc-options: -funbox-strict-fields -Wall
if impl (ghc == 6.10.1) && arch (x86_64)
- ghc-options: -O0
+ ghc-options: -O0
if impl (ghc >= 6.12.1)
- ghc-options: -fno-warn-unused-do-bind
+ ghc-options: -fno-warn-unused-do-bind
+
+ build-depends: X11>=1.3.0, mtl, unix, parsec, filepath, stm
if flag(small_base)
build-depends: base == 4.*, containers, process, old-time, old-locale, bytestring, directory
@@ -52,15 +54,14 @@ executable xmobar
build-depends: base < 3
if flag(with_xft)
- build-depends: utf8-string, X11-xft >= 0.2
- cpp-options: -DXFT
+ build-depends: utf8-string, X11-xft >= 0.2
+ cpp-options: -DXFT
if flag(with_utf8) && impl (ghc < 6.12.1)
- build-depends: utf8-string
- cpp-options: -DUTF8
+ build-depends: utf8-string
+ cpp-options: -DUTF8
if flag(with_inotify)
- build-depends: hinotify
- cpp-options: -DINOTIFY
+ build-depends: hinotify
+ cpp-options: -DINOTIFY
- build-depends: X11>=1.3.0, mtl, unix, parsec, filepath, stm