Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add XF86WLAN special key #921

Merged
merged 3 commits into from
Jan 18, 2025
Merged

add XF86WLAN special key #921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc0e3aa
add XF86WLAN special key
geekosaur Jan 12, 2025
373f875
cabal: Drop support for GHC 8.6
slotThe Jan 18, 2025
43acaeb
fixup! cabal: Drop support for GHC 8.6
slotThe Jan 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions .github/workflows/haskell-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/stack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ jobs:
fail-fast: false
matrix:
include:
- resolver: lts-14 # GHC 8.6
yaml: stack.yaml
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was here to make sure we test compatibility with the latest hackage release of xmonad and X11 on both oldest and newest supported GHC. So only one of these should be dropped, and the stack.yaml one should be moved to a newer resolver.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, so that was what that was :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm on it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I should've added a comment really. It's a small miracle I still remember what the point was. Perhaps I don't and what I said isn't even true 😂

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks correct to me from inspecting both the stack.yaml files. (I'm reminded of the stuff I added to cabal's CI to do much the same thing, but it's a little more involved since of course they don't build with stack.)

- 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
Expand Down
8 changes: 8 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,16 @@

## _unreleased_

### Breaking Changes

* Drop support for GHC 8.6

### 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
Expand Down
1 change: 0 additions & 1 deletion XMonad/Hooks/DebugEvents.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions XMonad/Prelude.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'.
Expand Down
1 change: 1 addition & 0 deletions XMonad/Util/EZConfig.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@ infixl 4 `removeMouseBindings`
-- > <XF86_Next_VMode>
-- > <XF86_Prev_VMode>
-- > <XF86Bluetooth>
-- > <XF86WLAN>

mkKeymap :: XConfig l -> [(String, X ())] -> M.Map (KeyMask, KeySym) (X ())
mkKeymap c = M.fromList . mkSubmaps . readKeymap c
Expand Down
6 changes: 3 additions & 3 deletions xmonad-contrib.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading