From 9d0fd62cb281c7ed4da7b41bf6d2214990d2c81c Mon Sep 17 00:00:00 2001
From: a5ob7r <12132068+a5ob7r@users.noreply.github.com>
Date: Thu, 3 Nov 2022 14:39:28 +0900
Subject: [PATCH] Fix compatibilities with mtl 2.3.1

No longer the version of mtl re-exports Control.Monad, Control.Monad.Fix
and Data.Monoid modules, so we need to import them directly instead.
---
 src/XMonad/Core.hs       | 3 ++-
 src/XMonad/Main.hs       | 1 +
 src/XMonad/Operations.hs | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/XMonad/Core.hs b/src/XMonad/Core.hs
index e8e610d..de4a9a7 100644
--- a/src/XMonad/Core.hs
+++ b/src/XMonad/Core.hs
@@ -44,9 +44,10 @@ import Control.Exception (fromException, try, bracket_, throw, finally, SomeExce
 import qualified Control.Exception as E
 import Control.Applicative ((<|>), empty)
 import Control.Monad.Fail
+import Control.Monad.Fix (fix)
 import Control.Monad.State
 import Control.Monad.Reader
-import Control.Monad (void)
+import Control.Monad (filterM, guard, liftM2, void, when)
 import Data.Semigroup
 import Data.Traversable (for)
 import Data.Time.Clock (UTCTime)
diff --git a/src/XMonad/Main.hs b/src/XMonad/Main.hs
index 0bc0137..3f6ba73 100644
--- a/src/XMonad/Main.hs
+++ b/src/XMonad/Main.hs
@@ -27,6 +27,7 @@ import qualified Data.Map as M
 import qualified Data.Set as S
 import Control.Monad.Reader
 import Control.Monad.State
+import Control.Monad (filterM, guard, unless, void, when)
 import Data.Maybe (fromMaybe, isJust)
 import Data.Monoid (getAll)
 
diff --git a/src/XMonad/Operations.hs b/src/XMonad/Operations.hs
index 6d9ab5e..7e614fc 100644
--- a/src/XMonad/Operations.hs
+++ b/src/XMonad/Operations.hs
@@ -70,9 +70,10 @@ import qualified Data.Map as M
 import qualified Data.Set as S
 
 import Control.Arrow (second)
+import Control.Monad.Fix (fix)
 import Control.Monad.Reader
 import Control.Monad.State
-import Control.Monad (void)
+import Control.Monad (forM, forM_, guard, join, unless, void, when)
 import qualified Control.Exception as C
 
 import System.IO