diff options
| -rw-r--r-- | samples/Plugins/HelloWorld.hs | 4 | ||||
| -rw-r--r-- | src/lib/Xmobar.hs | 3 | ||||
| -rw-r--r-- | xmobar.cabal | 22 |
3 files changed, 15 insertions, 14 deletions
diff --git a/samples/Plugins/HelloWorld.hs b/samples/Plugins/HelloWorld.hs index df5cff6..d2267ae 100644 --- a/samples/Plugins/HelloWorld.hs +++ b/samples/Plugins/HelloWorld.hs @@ -12,9 +12,9 @@ -- ----------------------------------------------------------------------------- -module Plugins.HelloWorld where +module Xmobar.Plugins.HelloWorld where -import Plugins +import Xmobar.Plugins data HelloWorld = HelloWorld deriving (Read, Show) diff --git a/src/lib/Xmobar.hs b/src/lib/Xmobar.hs index 722ee72..a90ec3e 100644 --- a/src/lib/Xmobar.hs +++ b/src/lib/Xmobar.hs @@ -15,10 +15,11 @@ -- ----------------------------------------------------------------------------- -module Xmobar (xmobar) where +module Xmobar (xmobar, Runnable (..)) where import Xmobar.EventLoop (startLoop, startCommand) import Xmobar.Config +import Xmobar.Runnable import Data.Foldable (for_) import qualified Data.Map as Map diff --git a/xmobar.cabal b/xmobar.cabal index 9c6fcf7..330704a 100644 --- a/xmobar.cabal +++ b/xmobar.cabal @@ -110,7 +110,6 @@ library Xmobar.Plugins.MarqueePipeReader, Xmobar.Plugins.StdinReader, Xmobar.Plugins.XMonadLog, - Xmobar.Plugins.Utils, Xmobar.Plugins.Kbd, Xmobar.Plugins.Locks, Xmobar.Plugins.Monitors, @@ -141,7 +140,8 @@ library Xmobar.Draw, Xmobar.Signal, Xmobar.Environment, - Xmobar.EventLoop + Xmobar.EventLoop, + Xmobar.Plugins.Utils extra-libraries: Xrandr Xrender @@ -190,36 +190,36 @@ library if flag(with_inotify) || flag(all_extensions) build-depends: hinotify >= 0.3 && < 0.5 - other-modules: Xmobar.Plugins.Mail, Xmobar.Plugins.MBox + exposed-modules: Xmobar.Plugins.Mail, Xmobar.Plugins.MBox cpp-options: -DINOTIFY if flag(with_iwlib) || flag(all_extensions) extra-libraries: iw build-depends: iwlib >= 0.1.0 && < 0.2 - other-modules: Xmobar.Plugins.Monitors.Wireless + exposed-modules: Xmobar.Plugins.Monitors.Wireless cpp-options: -DIWLIB if flag(with_mpd) || flag(all_extensions) build-depends: libmpd >= 0.9.0.6 - other-modules: Xmobar.Plugins.Monitors.MPD + exposed-modules: Xmobar.Plugins.Monitors.MPD cpp-options: -DLIBMPD if flag(with_alsa) || flag(all_extensions) build-depends: alsa-mixer > 0.2.0.2 build-depends: alsa-core == 0.5.*, process >= 1.4.3.0 - other-modules: Xmobar.Plugins.Monitors.Volume - Xmobar.Plugins.Monitors.Alsa + exposed-modules: Xmobar.Plugins.Monitors.Volume + Xmobar.Plugins.Monitors.Alsa cpp-options: -DALSA if flag(with_datezone) || flag(all_extensions) build-depends: timezone-olson == 0.1.*, timezone-series == 0.1.* - other-modules: Xmobar.Plugins.DateZone + exposed-modules: Xmobar.Plugins.DateZone cpp-options: -DDATEZONE if flag(with_mpris) || flag(all_extensions) build-depends: dbus >= 1 - other-modules: Xmobar.Plugins.Monitors.Mpris + exposed-modules: Xmobar.Plugins.Monitors.Mpris cpp-options: -DMPRIS if flag(with_dbus) || flag(all_extensions) @@ -234,7 +234,7 @@ library if flag(with_weather) || flag(all_extensions) build-depends: HTTP >= 4000.2.4 - other-modules: Xmobar.Plugins.Monitors.Weather + exposed-modules: Xmobar.Plugins.Monitors.Weather cpp-options: -DWEATHER if flag(with_conduit) -- use http-conduit instead of simple-http @@ -242,7 +242,7 @@ library cpp-options: -DHTTP_CONDUIT if flag(with_uvmeter) && flag(with_conduit) - other-modules: Xmobar.Plugins.Monitors.UVMeter + exposed-modules: Xmobar.Plugins.Monitors.UVMeter build-depends: http-conduit, http-types cpp-options: -DUVMETER |