Skip to content

Commit

Permalink
X.U.Grab: Hide mkGrabs from XMonad
Browse files Browse the repository at this point in the history
With [1] merged, the XMonad module from core now exports mkGrabs and
setNumlockMask (now cacheNumlockMask).  However, since we want
xmonad-contrib 0.17.1 to compile against xmonad 0.17.0 still, hide the
function for now and continue to use the vendored copies we have in
X.U.Grab currently.  We have to ignore the dodgy-imports warning when
-fpedantic is on, but that seems like a small price to pay.

A breaking change for this is planned for 0.18.0.

[1]: xmonad/xmonad#405
  • Loading branch information
slotThe committed Aug 2, 2022
1 parent 8268cdd commit 0934fe5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion XMonad/Util/Grab.hs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module XMonad.Util.Grab
) where

-- core
import XMonad
import XMonad hiding (mkGrabs)

import Control.Monad ( when )
import Data.Bits ( setBit )
Expand Down
4 changes: 2 additions & 2 deletions xmonad-contrib.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ library
ghc-options: -Wall -Wno-unused-do-bind

if flag(pedantic)
ghc-options: -Werror -Wwarn=deprecations
ghc-options: -Werror -Wwarn=deprecations -Wwarn=dodgy-imports

-- Keep this in sync with the oldest version in 'tested-with'
if impl(ghc > 8.4.4)
Expand Down Expand Up @@ -478,7 +478,7 @@ test-suite tests
default-language: Haskell2010

if flag(pedantic)
ghc-options: -Werror -Wwarn=deprecations
ghc-options: -Werror -Wwarn=deprecations -Wwarn=dodgy-imports

-- Keep this in sync with the oldest version in 'tested-with'
if impl(ghc > 8.4.4)
Expand Down

0 comments on commit 0934fe5

Please sign in to comment.