|
Removed
Link Here
|
| 1 |
diff --git XMonad/Hooks/FadeWindows.hs XMonad/Hooks/FadeWindows.hs |
| 2 |
index 4b8e62b6..01d06792 100644 |
| 3 |
--- XMonad/Hooks/FadeWindows.hs |
| 4 |
+++ XMonad/Hooks/FadeWindows.hs |
| 5 |
@@ -61,7 +61,8 @@ import Control.Monad.Reader (ask |
| 6 |
,asks) |
| 7 |
import Control.Monad.State (gets) |
| 8 |
import qualified Data.Map as M |
| 9 |
-import Data.Monoid |
| 10 |
+import Data.Monoid hiding ((<>)) |
| 11 |
+import Data.Semigroup |
| 12 |
|
| 13 |
import Graphics.X11.Xlib.Extras (Event(..)) |
| 14 |
|
| 15 |
@@ -134,6 +135,9 @@ instance Monoid Opacity where |
| 16 |
r `mappend` OEmpty = r |
| 17 |
_ `mappend` r = r |
| 18 |
|
| 19 |
+instance Semigroup Opacity where |
| 20 |
+ (<>) = mappend |
| 21 |
+ |
| 22 |
-- | A FadeHook is similar to a ManageHook, but records window opacity. |
| 23 |
type FadeHook = Query Opacity |
| 24 |
|
| 25 |
diff --git XMonad/Hooks/WallpaperSetter.hs XMonad/Hooks/WallpaperSetter.hs |
| 26 |
index 00a3b1c3..d4f5ccb2 100644 |
| 27 |
--- XMonad/Hooks/WallpaperSetter.hs |
| 28 |
+++ XMonad/Hooks/WallpaperSetter.hs |
| 29 |
@@ -41,7 +41,8 @@ import Data.Ord (comparing) |
| 30 |
import Control.Monad |
| 31 |
import Control.Applicative |
| 32 |
import Data.Maybe |
| 33 |
-import Data.Monoid |
| 34 |
+import Data.Monoid hiding ((<>)) |
| 35 |
+import Data.Semigroup |
| 36 |
|
| 37 |
-- $usage |
| 38 |
-- This module requires imagemagick and feh to be installed, as these are utilized |
| 39 |
@@ -86,6 +87,9 @@ instance Monoid WallpaperList where |
| 40 |
mappend (WallpaperList w1) (WallpaperList w2) = |
| 41 |
WallpaperList $ M.toList $ (M.fromList w2) `M.union` (M.fromList w1) |
| 42 |
|
| 43 |
+instance Semigroup WallpaperList where |
| 44 |
+ (<>) = mappend |
| 45 |
+ |
| 46 |
-- | Complete wallpaper configuration passed to the hook |
| 47 |
data WallpaperConf = WallpaperConf { |
| 48 |
wallpaperBaseDir :: FilePath -- ^ Where the wallpapers reside (if empty, will look in \~\/.wallpapers/) |
| 49 |
diff --git XMonad/Layout/Mosaic.hs XMonad/Layout/Mosaic.hs |
| 50 |
index 05655d4c..da44fc50 100644 |
| 51 |
--- XMonad/Layout/Mosaic.hs |
| 52 |
+++ XMonad/Layout/Mosaic.hs |
| 53 |
@@ -38,7 +38,8 @@ import Control.Monad(mplus) |
| 54 |
import Data.Foldable(Foldable,foldMap, sum) |
| 55 |
import Data.Function(on) |
| 56 |
import Data.List(sortBy) |
| 57 |
-import Data.Monoid(Monoid,mempty, mappend) |
| 58 |
+import Data.Monoid(Monoid,mempty, mappend, (<>)) |
| 59 |
+import Data.Semigroup |
| 60 |
|
| 61 |
|
| 62 |
-- $usage |
| 63 |
@@ -202,6 +203,9 @@ instance Monoid (Tree a) where |
| 64 |
mappend x Empty = x |
| 65 |
mappend x y = Branch x y |
| 66 |
|
| 67 |
+instance Semigroup (Tree a) where |
| 68 |
+ (<>) = mappend |
| 69 |
+ |
| 70 |
makeTree :: (Num a1, Ord a1) => (a -> a1) -> [a] -> Tree a |
| 71 |
makeTree _ [] = Empty |
| 72 |
makeTree _ [x] = Leaf x |
| 73 |
diff --git xmonad-contrib.cabal xmonad-contrib.cabal |
| 74 |
index dde3ccda..c401c6e6 100644 |
| 75 |
--- xmonad-contrib.cabal |
| 76 |
+++ xmonad-contrib.cabal |
| 77 |
@@ -36,7 +36,7 @@ cabal-version: >= 1.6 |
| 78 |
build-type: Simple |
| 79 |
bug-reports: https://github.com/xmonad/xmonad-contrib/issues |
| 80 |
|
| 81 |
-tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1 |
| 82 |
+tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1, GHC==8.2.2, GHC==8.4.1 |
| 83 |
|
| 84 |
source-repository head |
| 85 |
type: git |
| 86 |
@@ -66,7 +66,8 @@ library |
| 87 |
unix, |
| 88 |
X11>=1.6.1 && < 1.9, |
| 89 |
xmonad>=0.13 && < 0.14, |
| 90 |
- utf8-string |
| 91 |
+ utf8-string, |
| 92 |
+ semigroups |
| 93 |
|
| 94 |
if flag(use_xft) |
| 95 |
build-depends: X11-xft >= 0.2 |