summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorjao <jao@gnu.org>2023-11-11 23:12:45 +0000
committerjao <jao@gnu.org>2023-11-11 23:12:45 +0000
commit220f953b06e2f98a02a4ca1b1db0e36a27e446b9 (patch)
tree138380f1ca071892b2ddd8cb342bc2ad45238146
parentd6b30837621abb8edacc9733d3e080393e35d5c1 (diff)
downloadxmobar-220f953b06e2f98a02a4ca1b1db0e36a27e446b9.tar.gz
xmobar-220f953b06e2f98a02a4ca1b1db0e36a27e446b9.tar.bz2
compatibility with GHC 9.6
-rw-r--r--.woodpecker.yml2
-rw-r--r--changelog.md4
-rw-r--r--src/Xmobar/Plugins/EWMH.hs1
-rw-r--r--src/Xmobar/X11/Loop.hs3
-rw-r--r--xmobar.cabal2
5 files changed, 9 insertions, 3 deletions
diff --git a/.woodpecker.yml b/.woodpecker.yml
index fea5da6..f8aeae3 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,7 +1,7 @@
matrix:
GHC_VERSION:
+ - 9.6
- 9.4
- - 9.2
- 8
steps:
diff --git a/changelog.md b/changelog.md
index f47a5b5..b7bfcfd 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,7 @@
+## Version 0.47.2 (November, 2023)
+
+- Compatibility with GHC 9.6
+
## Version 0.47.1 (September, 2023)
- Allow compilation with libmpd even with GHC > 9.4, by requesting it
diff --git a/src/Xmobar/Plugins/EWMH.hs b/src/Xmobar/Plugins/EWMH.hs
index 94fd7d7..78f1cc0 100644
--- a/src/Xmobar/Plugins/EWMH.hs
+++ b/src/Xmobar/Plugins/EWMH.hs
@@ -19,6 +19,7 @@ module Xmobar.Plugins.EWMH (EWMH(..)) where
import Control.Applicative (Applicative(..))
import Control.Monad.State
+import Control.Monad
import Control.Monad.Reader
import Graphics.X11 hiding (Modifier, Color)
import Graphics.X11.Xlib.Extras
diff --git a/src/Xmobar/X11/Loop.hs b/src/Xmobar/X11/Loop.hs
index da16402..6ddb693 100644
--- a/src/Xmobar/X11/Loop.hs
+++ b/src/Xmobar/X11/Loop.hs
@@ -3,7 +3,7 @@
------------------------------------------------------------------------------
-- |
-- Module: Xmobar.App.X11EventLoop
--- Copyright: (c) 2018, 2020, 2022 Jose Antonio Ortega Ruiz
+-- Copyright: (c) 2018, 2020, 2022, 2023 Jose Antonio Ortega Ruiz
-- License: BSD3-style (see LICENSE)
--
-- Maintainer: jao@gnu.org
@@ -22,6 +22,7 @@ import Prelude hiding (lookup)
import Control.Concurrent as Concurrent
import Control.Concurrent.STM as STM
+import Control.Monad as MR
import Control.Monad.Reader as MR
import Data.Bits (Bits((.|.)))
diff --git a/xmobar.cabal b/xmobar.cabal
index 2518757..84b0ff1 100644
--- a/xmobar.cabal
+++ b/xmobar.cabal
@@ -1,5 +1,5 @@
name: xmobar
-version: 0.47.1
+version: 0.47.2
homepage: https://codeberg.org/xmobar/xmobar
synopsis: A Minimalistic Text Based Status Bar
description: Xmobar is a minimalistic text based status bar.