From 72cbe0667d9ff5e624f692f666822f1f4c3af345 Mon Sep 17 00:00:00 2001
From: Tomas Janousek <tomi@nomi.cz>
Date: Mon, 7 Jun 2021 14:38:35 +0100
Subject: [PATCH] Revise dependencies a bit

utf8-string isn't needed since d9e3ebf53194d1cf02bae28f0c885b5c75610cfa
(late 2014).

Most of the executable xmonad deps are unnecessary since
307b82a53d519f5c86c009eb1a54044a616e4a5c (early 2015).

Switch from data-default to data-default-class to avoid bringing in deps
and instances we don't need.
---
 src/XMonad/Config.hs | 2 +-
 src/XMonad/Core.hs   | 2 +-
 xmonad.cabal         | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/XMonad/Config.hs b/src/XMonad/Config.hs
index f35fc50..8d50092 100644
--- a/src/XMonad/Config.hs
+++ b/src/XMonad/Config.hs
@@ -39,7 +39,7 @@ import XMonad.Operations
 import XMonad.ManageHook
 import qualified XMonad.StackSet as W
 import Data.Bits ((.|.))
-import Data.Default
+import Data.Default.Class
 import Data.Monoid
 import qualified Data.Map as M
 import System.Exit
diff --git a/src/XMonad/Core.hs b/src/XMonad/Core.hs
index 07fa95c..9c7a280 100644
--- a/src/XMonad/Core.hs
+++ b/src/XMonad/Core.hs
@@ -43,7 +43,7 @@ import Control.Monad.State
 import Control.Monad.Reader
 import Data.Semigroup
 import Data.Traversable (for)
-import Data.Default
+import Data.Default.Class
 import System.FilePath
 import System.IO
 import System.Info
diff --git a/xmonad.cabal b/xmonad.cabal
index 85382ff..e0a98b9 100644
--- a/xmonad.cabal
+++ b/xmonad.cabal
@@ -71,7 +71,7 @@ library
   build-depends:   base                  >= 4.9 && < 5
                  , X11                   >= 1.10 && < 1.11
                  , containers
-                 , data-default
+                 , data-default-class
                  , directory
                  , filepath
                  , mtl
@@ -79,7 +79,6 @@ library
                  , setlocale
                  , transformers          >= 0.3
                  , unix
-                 , utf8-string           >= 0.3 && < 1.1
   ghc-options:     -funbox-strict-fields -Wall -Wno-unused-do-bind
 
   -- Keep this in sync with the oldest version in 'tested-with'
@@ -91,7 +90,7 @@ library
 
 executable xmonad
   main-is:       Main.hs
-  build-depends: base, X11, mtl, unix, xmonad
+  build-depends: base, xmonad
   ghc-options:   -Wall -Wno-unused-do-bind
 
   -- Keep this in sync with the oldest version in 'tested-with'