summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Markus Rothe <markus.rothe@protonmail.com> 2017-02-09 14:11:42 +0100
committerAvatar Markus Rothe <markus.rothe@protonmail.com> 2017-02-09 14:11:42 +0100
commitb6d08d629b17a4e7cdac65618d550e8846ecadb8 (patch)
treea5cea49b30bc020bc11dc725f1bb3a8e950251c9
parent88897c1dd584c2da98e1d12fb677863c84af793b (diff)
downloadhaskell-b6d08d629b17a4e7cdac65618d550e8846ecadb8.tar.gz
haskell-b6d08d629b17a4e7cdac65618d550e8846ecadb8.tar.xz
xmonad-contrib: add patch for compile failure
-rw-r--r--packages/x11-plugins/xmonad-contrib/files/xmonad-contrib-0.12-a681e6860295089f66210f93ff2db3a5047f59b5.patch62
-rw-r--r--packages/x11-plugins/xmonad-contrib/xmonad-contrib-0.12.exheres-04
2 files changed, 66 insertions, 0 deletions
diff --git a/packages/x11-plugins/xmonad-contrib/files/xmonad-contrib-0.12-a681e6860295089f66210f93ff2db3a5047f59b5.patch b/packages/x11-plugins/xmonad-contrib/files/xmonad-contrib-0.12-a681e6860295089f66210f93ff2db3a5047f59b5.patch
new file mode 100644
index 0000000..2c8a8de
--- /dev/null
+++ b/packages/x11-plugins/xmonad-contrib/files/xmonad-contrib-0.12-a681e6860295089f66210f93ff2db3a5047f59b5.patch
@@ -0,0 +1,62 @@
+Source: https://github.com/xmonad/xmonad-contrib/commit/a681e6860295089f66210f93ff2db3a5047f59b5.patch
+Upstream: yes
+Reason: compile failure
+
+From a681e6860295089f66210f93ff2db3a5047f59b5 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <siarheit@google.com>
+Date: Sun, 27 Nov 2016 10:03:17 +0000
+Subject: [PATCH] XMonad/Layout/Groups/Helpers.hs: drop broken
+ ImpredicativeTypes extension (fixes #123)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+ImpredicativeTypes is practically unsupported extension
+on it's way to be removed from GHC:
+ https://mail.haskell.org/pipermail/ghc-devs/2016-September/012826.html
+
+GHC-8.0.2-rc1 already fails to build xmonad-contrib as:
+
+ XMonad/Layout/Groups/Helpers.hs:181:22: error:
+ • Couldn't match type ‘G.WithID l0 Window
+ -> XMonad.Util.Stack.Zipper (G.Group l0 Window)
+ -> XMonad.Util.Stack.Zipper (G.Group l0 Window)’
+ with ‘G.ModifySpec’
+ Expected type: (G.WithID l0 Window
+ -> XMonad.Util.Stack.Zipper (G.Group l0 Window)
+ -> XMonad.Util.Stack.Zipper (G.Group l0 Window))
+ -> G.GroupsMessage
+ Actual type: G.ModifySpec -> G.GroupsMessage
+ • In the second argument of ‘(.)’, namely ‘G.Modify’
+ In the expression: sendMessage . G.Modify
+ In an equation for ‘wrap’: wrap = sendMessage . G.Modify
+
+The workaround is simple: add explicit types to applications
+or open-code direct application (this change).
+
+Bug: https://github.com/xmonad/xmonad-contrib/issues/123
+Signed-off-by: Sergei Trofimovich <siarheit@google.com>
+---
+ XMonad/Layout/Groups/Helpers.hs | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Layout/Groups/Helpers.hs b/XMonad/Layout/Groups/Helpers.hs
+index 4bafdd3..baf4281 100644
+--- a/XMonad/Layout/Groups/Helpers.hs
++++ b/XMonad/Layout/Groups/Helpers.hs
+@@ -1,5 +1,5 @@
+ {-# OPTIONS_GHC -fno-warn-missing-signatures #-}
+-{-# LANGUAGE MultiParamTypeClasses, Rank2Types, ImpredicativeTypes #-}
++{-# LANGUAGE MultiParamTypeClasses, Rank2Types #-}
+
+ -----------------------------------------------------------------------------
+ -- |
+@@ -178,7 +178,7 @@ focusFloatDown = focusHelper id id
+ -- ** Groups-specific actions
+
+ wrap :: G.ModifySpec -> X ()
+-wrap = sendMessage . G.Modify
++wrap x = sendMessage (G.Modify x)
+
+ -- | Swap the focused group with the previous one
+ swapGroupUp :: X ()
diff --git a/packages/x11-plugins/xmonad-contrib/xmonad-contrib-0.12.exheres-0 b/packages/x11-plugins/xmonad-contrib/xmonad-contrib-0.12.exheres-0
index 89c5239..84b9984 100644
--- a/packages/x11-plugins/xmonad-contrib/xmonad-contrib-0.12.exheres-0
+++ b/packages/x11-plugins/xmonad-contrib/xmonad-contrib-0.12.exheres-0
@@ -32,3 +32,7 @@ DEPENDENCIES="
CABAL_SRC_CONFIGURE_PARAMS=( --flags=use_xft )
+DEFAULT_SRC_PREPARE_PATCHES=(
+ "${FILES}"/${PNV}-a681e6860295089f66210f93ff2db3a5047f59b5.patch
+)
+