From 229d52ff0735e1d1d8a949d221560ccdd9872e5d Mon Sep 17 00:00:00 2001
From: Tomas Janousek <tomi@nomi.cz>
Date: Tue, 1 Jun 2021 17:43:03 +0100
Subject: [PATCH] Bump X11, xmonad dependencies
---
.github/workflows/stack.yml | 13 +++++++------
stack-master.yaml | 2 ++
stack.yaml | 3 ++-
xmonad-contrib.cabal | 8 ++++----
4 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml
index 0e6ff475..8d3f8a7a 100644
--- a/.github/workflows/stack.yml
+++ b/.github/workflows/stack.yml
@@ -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
diff --git a/stack-master.yaml b/stack-master.yaml
index ea07bf81..3fa77c94 100644
--- a/stack-master.yaml
+++ b/stack-master.yaml
@@ -7,6 +7,8 @@ packages:
- ./
extra-deps:
+- github: xmonad/X11
+ commit: master@{today}
- github: xmonad/xmonad
commit: master@{today}
diff --git a/stack.yaml b/stack.yaml
index d6e3356e..42f10e1c 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -4,7 +4,8 @@ packages:
- ./
extra-deps:
-- xmonad-0.15
+- X11-0.10
+- xmonad-0.17
nix:
packages:
diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal
index f2ecdf37..2c4879b1 100644
--- a/xmonad-contrib.cabal
+++ b/xmonad-contrib.cabal
@@ -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