From 126f891d113c6e2166cc7ed80b9e9a961f0d65d7 Mon Sep 17 00:00:00 2001
From: Michiel Derhaeg <derhaeg.michiel@gmail.com>
Date: Sat, 17 Mar 2018 23:19:23 +0100
Subject: [PATCH 1/2] restored compatability with GHC versions prior to 8.0.1

---
 CHANGES.md         |  3 +++
 src/XMonad/Core.hs | 28 +++++++++++++++++++++++++---
 xmonad.cabal       |  2 +-
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index e8c362c..dddae7f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,6 +18,9 @@
     the focus follows when the mouse enters another workspace
     but not moving into any window.
 
+  * Restored compatability with GHC version prior to 8.0.1 by removing the
+    dependency on directory version 1.2.3.
+
 ## 0.13 (February 10, 2017)
 
 ### Breaking Changes
diff --git a/src/XMonad/Core.hs b/src/XMonad/Core.hs
index 138d735..a02657e 100644
--- a/src/XMonad/Core.hs
+++ b/src/XMonad/Core.hs
@@ -57,6 +57,7 @@ import Data.Typeable
 import Data.List ((\\))
 import Data.Maybe (isJust,fromMaybe)
 import Data.Monoid
+import System.Environment (lookupEnv)
 
 import qualified Data.Map as M
 import qualified Data.Set as S
@@ -460,7 +461,7 @@ getXMonadDir :: MonadIO m => m String
 getXMonadDir =
     findFirstDirWithEnv "XMONAD_CONFIG_DIR"
       [ getAppUserDataDirectory "xmonad"
-      , getXdgDirectory XdgConfig "xmonad"
+      , getXDGDirectory XDGConfig "xmonad"
       ]
 
 -- | Return the path to the xmonad cache directory.  This directory is
@@ -480,7 +481,7 @@ getXMonadCacheDir :: MonadIO m => m String
 getXMonadCacheDir =
     findFirstDirWithEnv "XMONAD_CACHE_DIR"
       [ getAppUserDataDirectory "xmonad"
-      , getXdgDirectory XdgCache "xmonad"
+      , getXDGDirectory XDGCache "xmonad"
       ]
 
 -- | Return the path to the xmonad data directory.  This directory is
@@ -500,7 +501,7 @@ getXMonadDataDir :: MonadIO m => m String
 getXMonadDataDir =
     findFirstDirWithEnv "XMONAD_DATA_DIR"
       [ getAppUserDataDirectory "xmonad"
-      , getXdgDirectory XdgData "xmonad"
+      , getXDGDirectory XDGData "xmonad"
       ]
 
 -- | Helper function that will find the first existing directory and
@@ -536,6 +537,27 @@ findFirstDirWithEnv envName paths = do
       Nothing      -> findFirstDirOf paths
       Just envPath -> findFirstDirOf (return envPath:paths)
 
+-- | Helper function to retrieve the various XDG directories.
+-- This has been based on the implementation shipped with GHC version 8.0.1 or
+-- higher. Put here to preserve compatibility with older GHC versions.
+getXDGDirectory :: XDGDirectory -> FilePath -> IO FilePath
+getXDGDirectory xdgDir suffix =
+  normalise . (</> suffix) <$>
+  case xdgDir of
+    XDGData   -> get False "XDG_DATA_HOME"   ".local/share"
+    XDGConfig -> get False "XDG_CONFIG_HOME" ".config"
+    XDGCache  -> get True  "XDG_CACHE_HOME"  ".cache"
+  where
+    get _ name fallback = do
+      env <- lookupEnv name
+      case env of
+        Nothing -> fallback'
+        Just path
+          | isRelative path -> fallback'
+          | otherwise -> return path
+      where
+        fallback' = (</> fallback) <$> getHomeDirectory
+data XDGDirectory = XDGData | XDGConfig | XDGCache
 
 -- | Get the name of the file used to store the xmonad window state.
 stateFileName :: (Functor m, MonadIO m) => m FilePath
diff --git a/xmonad.cabal b/xmonad.cabal
index dbcdb4a..b6380ba 100644
--- a/xmonad.cabal
+++ b/xmonad.cabal
@@ -70,7 +70,7 @@ library
     build-depends: base < 5 && >=3,
                    containers,
                    data-default,
-                   directory >= 1.2.3,
+                   directory,
                    extensible-exceptions,
                    filepath,
                    setlocale,

From c3cb4ad65fbf37133207ca7ac838dead3bbe35ab Mon Sep 17 00:00:00 2001
From: Michiel Derhaeg <derhaeg.michiel@gmail.com>
Date: Sun, 18 Mar 2018 00:08:03 +0100
Subject: [PATCH 2/2] forgot to remote windows specific code

---
 src/XMonad/Core.hs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/XMonad/Core.hs b/src/XMonad/Core.hs
index a02657e..a29818b 100644
--- a/src/XMonad/Core.hs
+++ b/src/XMonad/Core.hs
@@ -544,11 +544,11 @@ getXDGDirectory :: XDGDirectory -> FilePath -> IO FilePath
 getXDGDirectory xdgDir suffix =
   normalise . (</> suffix) <$>
   case xdgDir of
-    XDGData   -> get False "XDG_DATA_HOME"   ".local/share"
-    XDGConfig -> get False "XDG_CONFIG_HOME" ".config"
-    XDGCache  -> get True  "XDG_CACHE_HOME"  ".cache"
+    XDGData   -> get "XDG_DATA_HOME"   ".local/share"
+    XDGConfig -> get "XDG_CONFIG_HOME" ".config"
+    XDGCache  -> get "XDG_CACHE_HOME"  ".cache"
   where
-    get _ name fallback = do
+    get name fallback = do
       env <- lookupEnv name
       case env of
         Nothing -> fallback'