CVS commit: pkgsrc/wm/xmonad-contrib

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Sat Oct 28 20:30:25 UTC 2023

Modified Files:
        pkgsrc/wm/xmonad-contrib: distinfo
Added Files:
        pkgsrc/wm/xmonad-contrib/patches:
            patch-XMonad_Actions_GroupNavigation.hs
            patch-XMonad_Hooks_WorkspaceByPos.hs patch-XMonad_Util_PureX.hs
            patch-xmonad-contrib.cabal

Log Message:
wm/xmonad-contrib: Fix build with GHC 9.6


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/wm/xmonad-contrib/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/wm/xmonad-contrib/patches/patch-XMonad_Actions_GroupNavigation.hs \
    pkgsrc/wm/xmonad-contrib/patches/patch-XMonad_Hooks_WorkspaceByPos.hs \
    pkgsrc/wm/xmonad-contrib/patches/patch-XMonad_Util_PureX.hs \
    pkgsrc/wm/xmonad-contrib/patches/patch-xmonad-contrib.cabal

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/wm/xmonad-contrib/distinfo
diff -u pkgsrc/wm/xmonad-contrib/distinfo:1.10 pkgsrc/wm/xmonad-contrib/distinfo:1.11
--- pkgsrc/wm/xmonad-contrib/distinfo:1.10      Thu Jan 26 10:01:04 2023
+++ pkgsrc/wm/xmonad-contrib/distinfo   Sat Oct 28 20:30:25 2023
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.10 2023/01/26 10:01:04 pho Exp $
+$NetBSD: distinfo,v 1.11 2023/10/28 20:30:25 pho Exp $
 
 BLAKE2s (xmonad-contrib-0.17.1.tar.gz) = 292c66c3f5ff41a49e305c088f20aad4566205c43cc7cd5c88786ba01ee2d6e4
 SHA512 (xmonad-contrib-0.17.1.tar.gz) = 07f989623f4d9affae564ba36a180721910c1a0acf3d23e0e548fc48bb4dcd9864987c521c28251f6443cdd5134ded8e8bb18c6f78d06cb00c386ff6ad59c97e
 Size (xmonad-contrib-0.17.1.tar.gz) = 646843 bytes
+SHA1 (patch-XMonad_Actions_GroupNavigation.hs) = a60b40d9708c0b9f01d970f4483a1300f1bd0afd
+SHA1 (patch-XMonad_Hooks_WorkspaceByPos.hs) = 118e0e24612b0a2b9bfc4f492468676b38aaec0c
+SHA1 (patch-XMonad_Util_PureX.hs) = 4c10cf166c789cf14ba3f29d3ed30b5d28b222cc
+SHA1 (patch-xmonad-contrib.cabal) = 564514112de4bb750a0638b308e2dbe4ab22b08c

Added files:

Index: pkgsrc/wm/xmonad-contrib/patches/patch-XMonad_Actions_GroupNavigation.hs
diff -u /dev/null pkgsrc/wm/xmonad-contrib/patches/patch-XMonad_Actions_GroupNavigation.hs:1.1
--- /dev/null   Sat Oct 28 20:30:25 2023
+++ pkgsrc/wm/xmonad-contrib/patches/patch-XMonad_Actions_GroupNavigation.hs    Sat Oct 28 20:30:25 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-XMonad_Actions_GroupNavigation.hs,v 1.1 2023/10/28 20:30:25 pho Exp $
+
+Prelude doesn't export >=>. No idea why it worked before.
+
+--- XMonad/Actions/GroupNavigation.hs.orig     2023-10-28 20:25:50.601702893 +0000
++++ XMonad/Actions/GroupNavigation.hs
+@@ -33,6 +33,7 @@ module XMonad.Actions.GroupNavigation ( 
+                                       , isOnAnyVisibleWS
+                                       ) where
+ 
++import Control.Monad ((>=>))
+ import Control.Monad.Reader
+ import Control.Monad.State
+ import Control.DeepSeq
Index: pkgsrc/wm/xmonad-contrib/patches/patch-XMonad_Hooks_WorkspaceByPos.hs
diff -u /dev/null pkgsrc/wm/xmonad-contrib/patches/patch-XMonad_Hooks_WorkspaceByPos.hs:1.1
--- /dev/null   Sat Oct 28 20:30:25 2023
+++ pkgsrc/wm/xmonad-contrib/patches/patch-XMonad_Hooks_WorkspaceByPos.hs       Sat Oct 28 20:30:25 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-XMonad_Hooks_WorkspaceByPos.hs,v 1.1 2023/10/28 20:30:25 pho Exp $
+
+Control.Monad.Except no longer exports lift.
+
+--- XMonad/Hooks/WorkspaceByPos.hs.orig        2023-10-28 20:20:33.648633472 +0000
++++ XMonad/Hooks/WorkspaceByPos.hs
+@@ -26,7 +26,8 @@ import XMonad
+ import XMonad.Prelude
+ import qualified XMonad.StackSet as W
+ 
+-import Control.Monad.Except (lift, runExceptT, throwError)
++import Control.Monad.Except (runExceptT, throwError)
++import Control.Monad.Trans.Class (lift)
+ 
+ -- $usage
+ -- You can use this module with the following in your @~\/.xmonad\/xmonad.hs@:
Index: pkgsrc/wm/xmonad-contrib/patches/patch-XMonad_Util_PureX.hs
diff -u /dev/null pkgsrc/wm/xmonad-contrib/patches/patch-XMonad_Util_PureX.hs:1.1
--- /dev/null   Sat Oct 28 20:30:25 2023
+++ pkgsrc/wm/xmonad-contrib/patches/patch-XMonad_Util_PureX.hs Sat Oct 28 20:30:25 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-XMonad_Util_PureX.hs,v 1.1 2023/10/28 20:30:25 pho Exp $
+
+Prelude no longer exports void or join.
+
+--- XMonad/Util/PureX.hs.orig  2023-10-28 20:24:11.741267584 +0000
++++ XMonad/Util/PureX.hs
+@@ -58,6 +58,7 @@ import qualified XMonad.StackSet as W
+ import qualified XMonad.Actions.FocusNth
+ 
+ -- mtl
++import Control.Monad (void, join)
+ import Control.Monad.State
+ import Control.Monad.Reader
+ 
Index: pkgsrc/wm/xmonad-contrib/patches/patch-xmonad-contrib.cabal
diff -u /dev/null pkgsrc/wm/xmonad-contrib/patches/patch-xmonad-contrib.cabal:1.1
--- /dev/null   Sat Oct 28 20:30:25 2023
+++ pkgsrc/wm/xmonad-contrib/patches/patch-xmonad-contrib.cabal Sat Oct 28 20:30:25 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-xmonad-contrib.cabal,v 1.1 2023/10/28 20:30:25 pho Exp $
+
+Depend on transformers for 'lift' used in XMonad.Hooks.WorkspaceByPos.
+
+--- xmonad-contrib.cabal.orig  2023-10-28 20:22:27.297431551 +0000
++++ xmonad-contrib.cabal
+@@ -60,6 +60,7 @@ library
+                    directory,
+                    filepath,
+                    time >= 1.8 && < 1.13,
++                   transformers,
+                    process,
+                    random,
+                    mtl >= 1 && < 3,