Skip to content

Commit 8401e80

Browse files
authored
Merge pull request #124 from TeofilC/ghc-9.2-compat
2 parents 8f51f5c + 4e7965c commit 8401e80

File tree

3 files changed

+13
-16
lines changed

3 files changed

+13
-16
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: CI
22
on:
3-
# - pull_request
3+
- pull_request
44
- push
55
jobs:
66
build_posix:
@@ -9,13 +9,12 @@ jobs:
99
strategy:
1010
matrix:
1111
ghc:
12+
- '9.2.2'
13+
- '9.0.2'
1214
- '8.10.3'
1315
- '8.8.4'
14-
- '8.6.5'
15-
- '8.4.4'
16-
- '8.2.2'
1716
cabal:
18-
- '3.2'
17+
- '3.6'
1918
os:
2019
- ubuntu-latest
2120
- macOS-latest
@@ -99,13 +98,12 @@ jobs:
9998
strategy:
10099
matrix:
101100
ghc:
101+
- '9.2.2'
102+
- '9.0.2'
102103
- '8.10.3'
103104
- '8.8.4'
104-
- '8.6.5'
105-
- '8.4.4'
106-
- '8.2.2'
107105
cabal:
108-
- '3.2'
106+
- '3.6'
109107
os:
110108
- windows-latest
111109
fail-fast: false

GUI/SaveAs.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import Graphics.Rendering.Cairo
2727

2828
saveAs :: HECs -> ViewParameters -> Double -> DrawingArea
2929
-> (Int, Int, Render ())
30-
saveAs hecs params' @ViewParameters{xScaleAreaHeight, width,
30+
saveAs hecs params'@ViewParameters{xScaleAreaHeight, width,
3131
height = oldHeight {-, histogramHeight-}}
3232
yScaleAreaWidth yScaleArea =
3333
let histTotalHeight = histXScaleHeight -- + histogramHeight

threadscope.cabal

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,10 @@ Data-files: threadscope.ui, threadscope.png
3636
Extra-source-files: include/windows_cconv.h
3737
README.md
3838
CHANGELOG.md
39-
Tested-with: GHC == 8.2.2
40-
GHC == 8.4.4
41-
GHC == 8.6.5
42-
GHC == 8.8.4
39+
Tested-with: GHC == 8.8.4
4340
GHC == 8.10.3
41+
GHC == 9.0.2
42+
GHC == 9.2.2
4443

4544
source-repository head
4645
type: git
@@ -57,14 +56,14 @@ Executable threadscope
5756
array < 0.6,
5857
mtl < 2.3,
5958
filepath < 1.5,
60-
ghc-events >= 0.13 && < 0.16,
59+
ghc-events >= 0.13 && < 0.18,
6160
containers >= 0.2 && < 0.7,
6261
deepseq >= 1.1,
6362
text < 1.3,
6463
time >= 1.1 && < 1.12,
6564
bytestring < 0.12,
6665
file-embed < 0.1,
67-
template-haskell < 2.17,
66+
template-haskell < 2.19,
6867
temporary >= 1.1 && < 1.4
6968

7069
include-dirs: include

0 commit comments

Comments
 (0)