diff options
| -rw-r--r-- | src/Xmobar.hs | 4 | ||||
| -rw-r--r-- | src/Xmobar/Plugins/Command.hs (renamed from src/Xmobar/Run/Command.hs) | 4 | ||||
| -rw-r--r-- | src/Xmobar/Run/Template.hs | 3 | ||||
| -rw-r--r-- | src/Xmobar/Run/Types.hs | 5 | ||||
| -rw-r--r-- | xmobar.cabal | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/Xmobar.hs b/src/Xmobar.hs index 2a32da1..ced40a5 100644 --- a/src/Xmobar.hs +++ b/src/Xmobar.hs @@ -3,7 +3,7 @@ ----------------------------------------------------------------------------- -- | -- Module : Xmobar --- Copyright : (c) 2011, 2012, 2013, 2014, 2015, 2017, 2018, 2019 Jose Antonio Ortega Ruiz +-- Copyright : (c) 2011, 2012, 2013, 2014, 2015, 2017, 2018, 2019, 2022 Jose Antonio Ortega Ruiz -- (c) 2007 Andrea Rossato -- License : BSD-style (see LICENSE) -- @@ -51,9 +51,9 @@ module Xmobar (xmobar import Xmobar.Run.Runnable import Xmobar.Run.Exec -import Xmobar.Run.Command import Xmobar.Config.Types import Xmobar.Config.Parse +import Xmobar.Plugins.Command import Xmobar.Plugins.BufferedPipeReader import Xmobar.Plugins.CommandReader import Xmobar.Plugins.Date diff --git a/src/Xmobar/Run/Command.hs b/src/Xmobar/Plugins/Command.hs index 430d142..d63f56c 100644 --- a/src/Xmobar/Run/Command.hs +++ b/src/Xmobar/Plugins/Command.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------------ -- | -- Module: Xmobar.Plugins.Command --- Copyright: (c) 2018 Jose Antonio Ortega Ruiz +-- Copyright: (c) 2018, 2022 Jose Antonio Ortega Ruiz -- License: BSD3-style (see LICENSE) -- -- Maintainer: jao@gnu.org @@ -15,7 +15,7 @@ ------------------------------------------------------------------------------ -module Xmobar.Run.Command where +module Xmobar.Plugins.Command where import Control.Exception (handle, SomeException(..)) import System.Process diff --git a/src/Xmobar/Run/Template.hs b/src/Xmobar/Run/Template.hs index 50c3a08..87c84d3 100644 --- a/src/Xmobar/Run/Template.hs +++ b/src/Xmobar/Run/Template.hs @@ -20,8 +20,9 @@ module Xmobar.Run.Template(parseTemplate, splitTemplate) where import qualified Data.Map as Map import Text.ParserCombinators.Parsec +import Xmobar.Plugins.Command + import Xmobar.Run.Exec -import Xmobar.Run.Command import Xmobar.Run.Runnable defaultAlign :: String diff --git a/src/Xmobar/Run/Types.hs b/src/Xmobar/Run/Types.hs index 0d4ed42..69406bb 100644 --- a/src/Xmobar/Run/Types.hs +++ b/src/Xmobar/Run/Types.hs @@ -2,7 +2,7 @@ ------------------------------------------------------------------------------ -- | -- Module: Xmobar.Run.Types --- Copyright: (c) 2018 Jose Antonio Ortega Ruiz +-- Copyright: (c) 2018, 2022 Jose Antonio Ortega Ruiz -- License: BSD3-style (see LICENSE) -- -- Maintainer: jao@gnu.org @@ -19,6 +19,7 @@ module Xmobar.Run.Types(runnableTypes) where import {-# SOURCE #-} Xmobar.Run.Runnable() +import Xmobar.Plugins.Command import Xmobar.Plugins.Monitors import Xmobar.Plugins.Date import Xmobar.Plugins.PipeReader @@ -45,8 +46,6 @@ import Xmobar.Plugins.DateZone import Xmobar.Plugins.Kraken #endif -import Xmobar.Run.Command - -- | An alias for tuple types that is more convenient for long lists. type a :*: b = (a, b) infixr :*: diff --git a/xmobar.cabal b/xmobar.cabal index 193d5ae..cf13839 100644 --- a/xmobar.cabal +++ b/xmobar.cabal @@ -112,7 +112,6 @@ library Xmobar.Run.Types, Xmobar.Run.Template, Xmobar.Run.Exec, - Xmobar.Run.Command, Xmobar.Run.Runnable Xmobar.App.EventLoop, Xmobar.App.Config, @@ -135,6 +134,7 @@ library Xmobar.X11.ColorCache, Xmobar.X11.Window, Xmobar.X11.Draw, + Xmobar.Plugins.Command, Xmobar.Plugins.BufferedPipeReader, Xmobar.Plugins.CommandReader, Xmobar.Plugins.Date, |