twin/xmonad
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad.git synced 2025-05-19 08:30:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

update to work with latest GHC

Browse Source
This commit is contained in:
Vanessa McHale 2018-02-05 17:46:57 -06:00
parent 12a45b4b99
commit c96a59fa0d
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/XMonad/Core.hs
View File

@ -39,6 +39,7 @@ import qualified Control.Exception.Extensible as E
import Control.Applicative import Control.Applicative
import Control.Monad.State import Control.Monad.State
import Control.Monad.Reader import Control.Monad.Reader
import Data.Semigroup
import Data.Default import Data.Default
import System.FilePath import System.FilePath
import System.IO import System.IO
@ -56,7 +57,7 @@ import Graphics.X11.Xlib.Extras (getWindowAttributes, WindowAttributes, Event)
import Data.Typeable import Data.Typeable
import Data.List ((\\)) import Data.List ((\\))
import Data.Maybe (isJust,fromMaybe) import Data.Maybe (isJust,fromMaybe)
import Data.Monoid import Data.Monoid hiding ((<>))
import qualified Data.Map as M import qualified Data.Map as M
import qualified Data.Set as S import qualified Data.Set as S
@ -151,6 +152,9 @@ instance Applicative X where
pure = return pure = return
(<*>) = ap (<*>) = ap
instance Semigroup a => Semigroup (X a) where
(<>) = liftM2 (<>)
instance (Monoid a) => Monoid (X a) where instance (Monoid a) => Monoid (X a) where
mempty = return mempty mempty = return mempty
mappend = liftM2 mappend mappend = liftM2 mappend
@ -165,6 +169,9 @@ newtype Query a = Query (ReaderT Window X a)
runQuery :: Query a -> Window -> X a runQuery :: Query a -> Window -> X a
runQuery (Query m) w = runReaderT m w runQuery (Query m) w = runReaderT m w
instance Semigroup a => Semigroup (Query a) where
(<>) = liftM2 (<>)
instance Monoid a => Monoid (Query a) where instance Monoid a => Monoid (Query a) where
mempty = return mempty mempty = return mempty
mappend = liftM2 mappend mappend = liftM2 mappend

8
xmonad.cabal
View File

@ -1,5 +1,5 @@
name: xmonad name: xmonad
version: 0.13 version: 0.14
homepage: http://xmonad.org homepage: http://xmonad.org
synopsis: A tiling window manager synopsis: A tiling window manager
description: description:
@ -32,7 +32,8 @@ tested-with:
GHC==7.6.3, GHC==7.6.3,
GHC==7.8.4, GHC==7.8.4,
GHC==7.10.3, GHC==7.10.3,
GHC==8.0.1 GHC==8.0.1,
GHC==8.2.2
data-files: man/xmonad.hs, man/xmonad.1, man/xmonad.1.html data-files: man/xmonad.hs, man/xmonad.1, man/xmonad.1.html
@ -78,7 +79,8 @@ library
process, process,
unix, unix,
utf8-string >= 0.3 && < 1.1, utf8-string >= 0.3 && < 1.1,
X11>=1.8 && < 1.9 X11>=1.8 && < 1.9,
semigroups
if true if true
ghc-options: -funbox-strict-fields -Wall ghc-options: -funbox-strict-fields -Wall