xmobar 0.22 → 0.22.1

raw patch · 5 files changed

+27/−4 lines, 5 filesdep +transformersdep ~mtl

Dependencies added: transformers

Dependency ranges changed: mtl

Files

news.md +7/−0
readme.md +1/−1
src/Bitmap.hs +12/−1
src/XPMFile.hsc +4/−0
xmobar.cabal +3/−2

news.md view

@@ -1,5 +1,12 @@ % xmobar - Release notes +## Version 0.22.1 (Oct 11, 2014)++_Bug fixes_++  - Fix compilation in systems that don't need mtl newer than the one+    shipped with GHC.+ ## Version 0.22 (Oct 9, 2014)  _New features_

readme.md view

@@ -11,7 +11,7 @@ features, like dynamic color management, icons, output templates, and extensibility through plugins. -This page documents xmobar 0.22 (see [release notes]).+This page documents xmobar 0.22.1 (see [release notes]).  [This screenshot] shows xmobar running under [sawfish], with antialiased fonts. And [this one] is my desktop with [xmonad] and two

src/Bitmap.hs view

@@ -18,7 +18,6 @@  import Control.Applicative((<|>)) import Control.Monad-import Control.Monad.Except(MonadError(..), runExceptT) import Control.Monad.Trans(MonadIO(..)) import Data.Map hiding (foldr, map, filter) import Graphics.X11.Xlib@@ -31,6 +30,18 @@  #ifdef XPM import XPMFile(readXPMFile)+#endif++#if MIN_VERSION_mtl(2, 2, 1)+import Control.Monad.Except(MonadError(..), runExceptT)++#else+import Control.Monad.Error(MonadError(..))+import Control.Monad.Trans.Error(ErrorT, runErrorT)++runExceptT :: ErrorT e m a -> m (Either e a)+runExceptT = runErrorT+ #endif  data BitmapType = Mono Pixel | Poly

src/XPMFile.hsc view

@@ -13,7 +13,11 @@  module XPMFile(readXPMFile) where +#if MIN_VERSION_mtl(2, 2, 1) import Control.Monad.Except(MonadError(..))+#else+import Control.Monad.Error(MonadError(..))+#endif import Control.Monad.Trans(MonadIO(..)) import Graphics.X11.Xlib(Dimension, Display(..), Drawable, Pixmap) import Foreign.C.String(CString, withCString)

xmobar.cabal view

@@ -1,5 +1,5 @@ name:               xmobar-version:            0.22+version:            0.22.1 homepage:           http://xmobar.org synopsis:           A Minimalistic Text Based Status Bar description: 	    Xmobar is a minimalistic text based status bar.@@ -110,8 +110,9 @@       unix,       time,       filepath,+      transformers,       X11 >= 1.6.1,-      mtl >= 2.2.1 && < 2.3,+      mtl >= 2.1 && < 2.3,       parsec == 3.1.*,       HTTP >= 4000,       stm >= 2.3 && < 2.5