From bc0e3aa20411035d564192cda2f923a99b68c2b8 Mon Sep 17 00:00:00 2001 From: brandon s allbery kf8nh Date: Sat, 11 Jan 2025 23:32:39 -0500 Subject: [PATCH 1/3] add XF86WLAN special key --- CHANGES.md | 4 ++++ XMonad/Prelude.hs | 1 + XMonad/Util/EZConfig.hs | 1 + 3 files changed, 6 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 16c903bd14..fcb6b230d2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,6 +4,10 @@ ### Bug Fixes and Minor Changes + * `XMonad.Util.EZConfig` + + - Added `XF86WLAN` to the list of supported special keys. + * `XMonad.Actions.DynamicProjects` - No longer autodelete projects when `switchProject` is called from diff --git a/XMonad/Prelude.hs b/XMonad/Prelude.hs index 21d0a4f5da..fa9ea7f48d 100644 --- a/XMonad/Prelude.hs +++ b/XMonad/Prelude.hs @@ -472,6 +472,7 @@ multimediaKeys = filter ((/= noSymbol) . snd) . map (id &&& stringToKeysym) $ , "XF86_Next_VMode" , "XF86_Prev_VMode" , "XF86Bluetooth" + , "XF86WLAN" ] -- | The specialized 'W.Screen' derived from 'WindowSet'. diff --git a/XMonad/Util/EZConfig.hs b/XMonad/Util/EZConfig.hs index 1b3aa369db..4c0394d5cd 100644 --- a/XMonad/Util/EZConfig.hs +++ b/XMonad/Util/EZConfig.hs @@ -419,6 +419,7 @@ infixl 4 `removeMouseBindings` -- > -- > -- > +-- > mkKeymap :: XConfig l -> [(String, X ())] -> M.Map (KeyMask, KeySym) (X ()) mkKeymap c = M.fromList . mkSubmaps . readKeymap c From 373f875d92ab035f4fc148612afd9d8a3a496e22 Mon Sep 17 00:00:00 2001 From: Tony Zorman Date: Sat, 18 Jan 2025 16:50:29 +0100 Subject: [PATCH 2/3] cabal: Drop support for GHC 8.6 See /~https://github.com/xmonad/xmonad-contrib/pull/921 --- .github/workflows/haskell-ci.yml | 9 ++------- .github/workflows/stack.yml | 4 ---- CHANGES.md | 4 ++++ xmonad-contrib.cabal | 6 +++--- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index ff51fe4def..d063928b0d 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see /~https://github.com/haskell-CI/haskell-ci # -# version: 0.19.20241114 +# version: 0.19.20250115 # -# REGENDATA ("0.19.20241114",["github","cabal.project"]) +# REGENDATA ("0.19.20250115",["github","cabal.project"]) # name: Haskell-CI on: @@ -76,11 +76,6 @@ jobs: compilerVersion: 8.8.4 setup-method: ghcup allow-failure: false - - compiler: ghc-8.6.5 - compilerKind: ghc - compilerVersion: 8.6.5 - setup-method: ghcup - allow-failure: false fail-fast: false steps: - name: apt-get install diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml index 268b28bcf7..430f08be38 100644 --- a/.github/workflows/stack.yml +++ b/.github/workflows/stack.yml @@ -12,10 +12,6 @@ jobs: fail-fast: false matrix: include: - - resolver: lts-14 # GHC 8.6 - yaml: stack.yaml - - resolver: lts-14 # GHC 8.6 - yaml: stack-master.yaml - resolver: lts-16 # GHC 8.8 yaml: stack-master.yaml - resolver: lts-18 # GHC 8.10 diff --git a/CHANGES.md b/CHANGES.md index fcb6b230d2..b0dcf3a7d8 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,6 +2,10 @@ ## _unreleased_ +### Breaking Changes + + * Drop support for GHC 8.6 + ### Bug Fixes and Minor Changes * `XMonad.Util.EZConfig` diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal index 8ddccfc819..66dbe10c46 100644 --- a/xmonad-contrib.cabal +++ b/xmonad-contrib.cabal @@ -38,7 +38,7 @@ cabal-version: 1.12 build-type: Simple bug-reports: /~https://github.com/xmonad/xmonad-contrib/issues -tested-with: GHC == 8.6.5 || == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.8 || == 9.4.8 || == 9.6.6 || == 9.8.2 || == 9.10.1 +tested-with: GHC == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.8 || == 9.4.8 || == 9.6.6 || == 9.8.2 || == 9.10.1 source-repository head type: git @@ -80,7 +80,7 @@ library ghc-options: -Werror -Wwarn=deprecations -- Keep this in sync with the oldest version in 'tested-with' - if impl(ghc > 8.6.5) + if impl(ghc > 8.8.4) -- don't treat unused-imports warning as errors, they may be necessary -- for compatibility with older versions of base (or other deps) ghc-options: -Wwarn=unused-imports @@ -507,7 +507,7 @@ test-suite tests ghc-options: -Werror -Wwarn=deprecations -- Keep this in sync with the oldest version in 'tested-with' - if impl(ghc > 8.6.5) + if impl(ghc > 8.8.4) -- don't treat unused-imports warning as errors, they may be necessary -- for compatibility with older versions of base (or other deps) ghc-options: -Wwarn=unused-imports From 43acaeb422e674a897c94e9926f88f0a866fe5ff Mon Sep 17 00:00:00 2001 From: Tony Zorman Date: Sat, 18 Jan 2025 17:25:34 +0100 Subject: [PATCH 3/3] fixup! cabal: Drop support for GHC 8.6 --- XMonad/Hooks/DebugEvents.hs | 1 - 1 file changed, 1 deletion(-) diff --git a/XMonad/Hooks/DebugEvents.hs b/XMonad/Hooks/DebugEvents.hs index f200fd1bcb..cc460f1952 100644 --- a/XMonad/Hooks/DebugEvents.hs +++ b/XMonad/Hooks/DebugEvents.hs @@ -33,7 +33,6 @@ import XMonad.Util.DebugWindow (debugWindow) -- import Graphics.X11.Xlib.Extras.GetAtomName (getAtomName) import Control.Exception as E -import Control.Monad.Fail import Control.Monad.State import Control.Monad.Reader import Codec.Binary.UTF8.String