twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-05-19 03:20:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bump X11, xmonad dependencies

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.github/workflows/stack.yml vendored
View File

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

2
stack-master.yaml
View File

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

3
stack.yaml
View File

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

8
xmonad-contrib.cabal
View File

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