summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Minar <miminar@redhat.com>2016-01-01 21:28:19 +0100
committerMichal Minar <miminar@redhat.com>2016-01-01 21:30:50 +0100
commit836eb22d344dba3ec024b5b2ea0f3514e2d8fcf8 (patch)
tree6fa1e61a695cf3b1bfba6765c7e4ea7291b5678f
parent0094b628075b08805fa03691386958b2f33a5f02 (diff)
downloadxminad-836eb22d344dba3ec024b5b2ea0f3514e2d8fcf8.tar.gz
xminad-836eb22d344dba3ec024b5b2ea0f3514e2d8fcf8.tar.xz
xminad-836eb22d344dba3ec024b5b2ea0f3514e2d8fcf8.zip
Require xmonad >=0.12
Signed-off-by: Michal Minar <miminar@redhat.com>
-rw-r--r--Makefile1
-rw-r--r--src/XMonad/Local/Config.hs2
-rw-r--r--src/XMonad/Local/GridSelect.hs2
-rw-r--r--src/XMonad/Local/Layout.hs2
-rw-r--r--src/XMonad/Local/LogHook.hs2
-rw-r--r--src/XMonad/Local/TopicSpace.hs2
-rw-r--r--xminad.cabal40
7 files changed, 25 insertions, 26 deletions
diff --git a/Makefile b/Makefile
index 944972a..8f17c3f 100644
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,6 @@ $(XMINAD): $(SRC) $(SANDBOX)
$(SANDBOX):
$(CABAL_BIN) sandbox init
$(if $(CABAL_ADD_SOURCE),$(CABAL_BIN) sandbox add-source $(CABAL_ADD_SOURCE),)
- $(CABAL_BIN) install $(CABAL_FLAGS) xmonad-extras -fwith_mpd -f-with_hint
$(CABAL_BIN) install --only-dependencies $(CABAL_FLAGS)
$(CABAL_BIN) configure $(CABAL_FLAGS)
touch $@
diff --git a/src/XMonad/Local/Config.hs b/src/XMonad/Local/Config.hs
index 9d3506f..3224404 100644
--- a/src/XMonad/Local/Config.hs
+++ b/src/XMonad/Local/Config.hs
@@ -13,7 +13,7 @@ terminal :: String
terminal = "mate-terminal"
xpConfig :: P.XPConfig
-xpConfig = P.defaultXPConfig
+xpConfig = P.def
{ P.fgColor = "#dfdfdf"
, P.bgColor = "#3c3c3c"
, P.fgHLight = "#ffffff"
diff --git a/src/XMonad/Local/GridSelect.hs b/src/XMonad/Local/GridSelect.hs
index 20dde76..cd4c89c 100644
--- a/src/XMonad/Local/GridSelect.hs
+++ b/src/XMonad/Local/GridSelect.hs
@@ -17,7 +17,7 @@ import qualified XMonad.Local.TopicSpace as Local
gsConfig :: HasColorizer a => GSConfig a
-gsConfig = defaultGSConfig
+gsConfig = def
{ gs_cellheight = 40
, gs_cellwidth = 100
, gs_navigate = navigation'
diff --git a/src/XMonad/Local/Layout.hs b/src/XMonad/Local/Layout.hs
index 0baeb77..4b3d789 100644
--- a/src/XMonad/Local/Layout.hs
+++ b/src/XMonad/Local/Layout.hs
@@ -92,7 +92,7 @@ wineGameL = smartBorders $ simpleFloat ||| trackFloating Full
mySubTabbed x = trackFloating $ Tab.addTabs Tab.shrinkText myTabTheme $ subLayout [] Simplest x
myTabTheme :: Tab.Theme
-myTabTheme = Tab.defaultTheme
+myTabTheme = Tab.def
{ Tab.activeTextColor = "#ffffff"
, Tab.activeBorderColor = "#FBAB2E"
, Tab.activeColor = "#3c3c3c"
diff --git a/src/XMonad/Local/LogHook.hs b/src/XMonad/Local/LogHook.hs
index 5f5109f..f1310fa 100644
--- a/src/XMonad/Local/LogHook.hs
+++ b/src/XMonad/Local/LogHook.hs
@@ -27,7 +27,7 @@ logHook xmobarHandle = do
currentWorkspaceOnTop
ewmhDesktopsLogHook
fadeWindowsLogHook myFadeHook
- UP.updatePointer (UP.Relative 0.9 0.9)
+ UP.updatePointer (0.9, 0.9) (0.1, 0.1)
myPP :: M.Map WorkspaceId Int -> PP
myPP wmap = xmobarPP
diff --git a/src/XMonad/Local/TopicSpace.hs b/src/XMonad/Local/TopicSpace.hs
index 17f0e58..61ca99b 100644
--- a/src/XMonad/Local/TopicSpace.hs
+++ b/src/XMonad/Local/TopicSpace.hs
@@ -46,7 +46,7 @@ topicDirs = M.fromList $
, "ciV", "scrum", "BG", "witcher", "calendar"]
topicConfig :: TS.TopicConfig
-topicConfig = TS.defaultTopicConfig
+topicConfig = TS.def
{ TS.topicDirs = topicDirs
, TS.topicActions = M.fromList $
[ ("music", spawn "gmpc")
diff --git a/xminad.cabal b/xminad.cabal
index ad015c6..096da55 100644
--- a/xminad.cabal
+++ b/xminad.cabal
@@ -10,7 +10,7 @@ name: xminad
-- PVP summary: +-+------- breaking API changes
-- | | +----- non-breaking API additions
-- | | | +--- code changes with no API change
-version: 0.2.0.0
+version: 0.2.0.1
-- A short (one-line) description of the package.
synopsis: Minar's XMonad window manager
@@ -70,19 +70,19 @@ Library
ghc-options: -Wall
build-depends:
- base >=4.6 && <4.9
- , containers >=0.5 && <0.6
- , dbus >=0.10 && <0.12
+ base >=4.6 && <5.0
+ , containers >=0.5 && <0.7
+ , dbus >=0.10 && <0.13
, directory >=1.2 && <1.3
- , libmpd >=0.9 && <0.10
- , MissingH >=1.2 && <1.4
+ , libmpd >=0.9 && <0.11
+ , MissingH >=1.2 && <1.5
, regex-compat >=0.90 && <1.0
, regex-posix >=0.90 && <1.0
, unix >=2.0 && <3.0
, utf8-string >=0.3 && <1.1
- , xmonad >=0.11 && <0.12
- , xmonad-contrib >=0.11 && <0.12
- , xmonad-extras >=0.11 && <0.13
+ , xmonad >=0.12 && <0.13
+ , xmonad-contrib >=0.12 && <0.13
+ , xmonad-extras >=0.12 && <0.13
-- Base language which the package is written in.
default-language: Haskell2010
@@ -107,21 +107,21 @@ executable xminad
-- Other library packages from which modules are imported.
build-depends:
- base >=4.6 && <4.9
- , containers >=0.5 && <0.6
- , dbus >=0.10 && < 0.12
+ base >=4.6 && <5.0
+ , containers >=0.5 && <0.7
+ , dbus >=0.10 && <0.13
, directory >=1.2 && <1.3
- , libmpd >=0.9 && <0.10
- , MissingH >=1.2 && <1.4
- , regex-compat >=0.90 && <1.0
- , regex-posix >=0.90 && <1.0
- , text >=0.11 && <1.3
+ , libmpd >=0.9 && <0.11
+ , MissingH >=1.2 && <1.5
+ , regex-compat >=0.90 && <1.1
+ , regex-posix >=0.90 && <1.1
+ , text >=0.11 && <2.0
, utf8-string >=0.3 && <1.1
, X11 >=1.6 && <2.0
, xminad
- , xmonad >=0.11 && <0.12
- , xmonad-contrib >=0.11 && <0.12
- , xmonad-extras >=0.11 && <0.13
+ , xmonad >=0.12 && <0.13
+ , xmonad-contrib >=0.12 && <0.13
+ , xmonad-extras >=0.12 && <0.13
-- Base language which the package is written in.
default-language: Haskell2010