Bump X11, xmonad dependencies

This commit is contained in:
Tomas Janousek 2021-06-01 17:43:03 +01:00
parent 5c73845c68
commit 229d52ff07
4 changed files with 15 additions and 11 deletions

View File

@ -12,9 +12,10 @@ jobs:
fail-fast: false
matrix:
include:
- resolver: lts-12
ghc: 8.4.4
yaml: stack.yaml
# XXX: temporarily disabled until xmonad 0.17 release
# - resolver: lts-12
# ghc: 8.4.4
# yaml: stack.yaml
- resolver: lts-12
ghc: 8.4.4
yaml: stack-master.yaml
@ -24,9 +25,9 @@ jobs:
- resolver: lts-16
ghc: 8.8.4
yaml: stack-master.yaml
- resolver: lts-17
ghc: 8.10.4
yaml: stack.yaml
# - resolver: lts-17
# ghc: 8.10.4
# yaml: stack.yaml
- resolver: lts-17
ghc: 8.10.4
yaml: stack-master.yaml

View File

@ -7,6 +7,8 @@ packages:
- ./
extra-deps:
- github: xmonad/X11
commit: master@{today}
- github: xmonad/xmonad
commit: master@{today}

View File

@ -4,7 +4,8 @@ packages:
- ./
extra-deps:
- xmonad-0.15
- X11-0.10
- xmonad-0.17
nix:
packages:

View File

@ -57,8 +57,8 @@ library
random,
mtl >= 1 && < 3,
unix,
X11>=1.6.1 && < 1.10,
xmonad >= 0.15 && < 0.16,
X11 >= 1.10 && < 1.11,
xmonad >= 0.16.999 && < 0.18,
utf8-string
ghc-options: -Wall -Wno-unused-do-bind
@ -409,7 +409,7 @@ test-suite tests
hs-source-dirs: tests, .
build-depends: base
, QuickCheck >= 2
, X11>=1.6.1 && < 1.10
, X11 >= 1.10 && < 1.11
, containers
, directory
, hspec >= 2.4.0 && < 3
@ -417,7 +417,7 @@ test-suite tests
, process
, unix
, utf8-string
, xmonad >= 0.15 && < 0.16
, xmonad >= 0.16.999 && < 0.18
cpp-options: -DTESTING
ghc-options: -Wall -Wno-unused-do-bind