Skip to content

Commit fb740eb

Browse files
andreasabelandreasabel
authored
Bump dependencies for GHC 9.8 etc. (#160)
Fixes #153
1 parent 0ee10c3 commit fb740eb

File tree

6 files changed

+44
-46
lines changed

6 files changed

+44
-46
lines changed

‎.github/workflows/build-and-release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
strategy:
88
matrix:
99
os: [ubuntu-latest, macOS-latest]
10-
ghc: ["9.4.7"]
10+
ghc: ["9.4.8"]
1111

1212
steps:
1313
- run: echo "$HOME/.local/bin" >> $GITHUB_PATH
@@ -27,7 +27,7 @@ jobs:
2727
restore-keys: |
2828
${{ runner.os }}-${{ matrix.ghc }}-v8-
2929
30-
- uses: haskell/actions/setup@v2
30+
- uses: haskell-actions/setup@v2
3131
with:
3232
ghc-version: ${{ matrix.ghc }}
3333
enable-stack: true

‎.github/workflows/haskell-ci.yml

+24-17
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
#
77
# haskell-ci regenerate
88
#
9-
# For more information, see https://github.com/haskell-CI/haskell-ci
9+
# For more information, see https://github.com/andreasabel/haskell-ci
1010
#
11-
# version: 0.16.6
11+
# version: 0.17.20231112
1212
#
13-
# REGENDATA ("0.16.6",["github","patat.cabal"])
13+
# REGENDATA ("0.17.20231112",["github","patat.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -23,24 +23,29 @@ jobs:
2323
timeout-minutes:
2424
60
2525
container:
26-
image: buildpack-deps:bionic
26+
image: buildpack-deps:focal
2727
continue-on-error: ${{ matrix.allow-failure }}
2828
strategy:
2929
matrix:
3030
include:
31-
- compiler: ghc-9.6.2
31+
- compiler: ghc-9.8.1
3232
compilerKind: ghc
33-
compilerVersion: 9.6.2
33+
compilerVersion: 9.8.1
3434
setup-method: ghcup
3535
allow-failure: false
36-
- compiler: ghc-9.4.5
36+
- compiler: ghc-9.6.3
3737
compilerKind: ghc
38-
compilerVersion: 9.4.5
38+
compilerVersion: 9.6.3
3939
setup-method: ghcup
4040
allow-failure: false
41-
- compiler: ghc-9.2.4
41+
- compiler: ghc-9.4.8
4242
compilerKind: ghc
43-
compilerVersion: 9.2.4
43+
compilerVersion: 9.4.8
44+
setup-method: ghcup
45+
allow-failure: false
46+
- compiler: ghc-9.2.8
47+
compilerKind: ghc
48+
compilerVersion: 9.2.8
4449
setup-method: ghcup
4550
allow-failure: false
4651
fail-fast: false
@@ -50,10 +55,10 @@ jobs:
5055
apt-get update
5156
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
5257
mkdir -p "$HOME/.ghcup/bin"
53-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
58+
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
5459
chmod a+x "$HOME/.ghcup/bin/ghcup"
5560
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
56-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
61+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
5762
env:
5863
HCKIND: ${{ matrix.compilerKind }}
5964
HCNAME: ${{ matrix.compiler }}
@@ -65,11 +70,13 @@ jobs:
6570
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
6671
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
6772
HCDIR=/opt/$HCKIND/$HCVER
68-
HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
73+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
74+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
75+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
6976
echo "HC=$HC" >> "$GITHUB_ENV"
70-
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
71-
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
72-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
77+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
78+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
79+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
7380
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
7481
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
7582
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@@ -126,7 +133,7 @@ jobs:
126133
chmod a+x $HOME/.cabal/bin/cabal-plan
127134
cabal-plan --version
128135
- name: checkout
129-
uses: actions/checkout@v3
136+
uses: actions/checkout@v4
130137
with:
131138
path: source
132139
- name: initial cabal.project for sdist

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ extra/patat.1
55
.stack-work
66
dist
77
tags
8+
dist-newstyle/

‎patat.cabal

+10-10
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ Copyright: 2016 Jasper Van der Jeugt
1111
Category: Text
1212
Build-type: Simple
1313
Cabal-version: >=1.10
14-
Tested-with: GHC ==9.2.4 || ==9.4.5 || ==9.6.2
14+
Tested-with: GHC ==9.2.8 || ==9.4.8 || ==9.6.3 || ==9.8.1
1515

1616
Extra-source-files:
1717
CHANGELOG.md
1818
README.md
1919

2020
Source-repository head
2121
Type: git
22-
Location: git://github.com/jaspervdj/patat.git
22+
Location: https://github.com/jaspervdj/patat.git
2323

2424
Flag patat-make-man
2525
Description: Build the executable to generate the man page
@@ -32,17 +32,17 @@ Library
3232
Default-language: Haskell2010
3333

3434
Build-depends:
35-
aeson >= 2.0 && < 2.2,
35+
aeson >= 2.0 && < 2.3,
3636
ansi-terminal >= 0.6 && < 1.1,
3737
ansi-wl-pprint >= 0.6 && < 1.1,
3838
async >= 2.2 && < 2.3,
3939
base >= 4.9 && < 5,
4040
base64-bytestring >= 1.0 && < 1.3,
41-
bytestring >= 0.10 && < 0.12,
41+
bytestring >= 0.10 && < 0.13,
4242
colour >= 2.3 && < 2.4,
4343
containers >= 0.5 && < 0.7,
4444
directory >= 1.2 && < 1.4,
45-
filepath >= 1.4 && < 1.5,
45+
filepath >= 1.4 && < 1.6,
4646
mtl >= 2.2 && < 2.4,
4747
optparse-applicative >= 0.16 && < 0.19,
4848
pandoc >= 3.1 && < 3.2,
@@ -51,7 +51,7 @@ Library
5151
random >= 1.2 && < 1.3,
5252
skylighting >= 0.10 && < 0.15,
5353
terminal-size >= 0.3 && < 0.4,
54-
text >= 1.2 && < 2.1,
54+
text >= 1.2 && < 2.2,
5555
time >= 1.4 && < 1.13,
5656
unordered-containers >= 0.2 && < 0.3,
5757
yaml >= 0.8 && < 0.12,
@@ -129,11 +129,11 @@ Executable patat-make-man
129129

130130
Build-depends:
131131
base >= 4.9 && < 5,
132-
containers >= 0.6 && < 0.7,
132+
containers >= 0.6 && < 0.8,
133133
doctemplates >= 0.8 && < 0.12,
134134
mtl >= 2.2 && < 2.4,
135135
pandoc >= 3.1 && < 3.2,
136-
text >= 1.2 && < 2.1,
136+
text >= 1.2 && < 2.2,
137137
time >= 1.6 && < 1.13
138138

139139
Test-suite patat-tests
@@ -154,8 +154,8 @@ Test-suite patat-tests
154154
base >= 4.8 && < 5,
155155
directory >= 1.2 && < 1.4,
156156
pandoc >= 3.1 && < 3.2,
157-
tasty >= 1.2 && < 1.5,
157+
tasty >= 1.2 && < 1.6,
158158
tasty-hunit >= 0.10 && < 0.11,
159159
tasty-quickcheck >= 0.10 && < 0.11,
160-
text >= 1.2 && < 2.1,
160+
text >= 1.2 && < 2.2,
161161
QuickCheck >= 2.8 && < 2.15

‎stack.yaml

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
resolver: 'lts-21.0'
2-
compiler: 'ghc-9.4.3'
1+
resolver: 'lts-22.3'
2+
compiler: 'ghc-9.6.3'
33
save-hackage-creds: false
44

55
packages:
@@ -9,9 +9,6 @@ flags:
99
patat:
1010
patat-make-man: true
1111

12-
extra-deps:
13-
- 'pandoc-3.1.2'
14-
1512
nix:
1613
packages:
1714
- 'pkgconfig'

‎stack.yaml.lock

+5-12
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,10 @@
33
# For more information, please see the documentation at:
44
# https://docs.haskellstack.org/en/stable/lock_files
55

6-
packages:
7-
- completed:
8-
hackage: pandoc-3.1.2@sha256:5716177472cdcc043eda0b2db2c9dcc0a9eb78b1139a1050308cd2ea2e997d1f,38005
9-
pantry-tree:
10-
size: 142325
11-
sha256: 08ef3d154019e031c8be9d96d0f19a31701e9c75bf56c32d28d3223b243495c0
12-
original:
13-
hackage: pandoc-3.1.2
6+
packages: []
147
snapshots:
158
- completed:
16-
size: 639139
17-
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/0.yaml
18-
sha256: 1867d84255dff8c87373f5dd03e5a5cb1c10a99587e26c8793e750c54e83ffdc
19-
original: lts-21.0
9+
sha256: 53a2800f7fe0c4628af0e7d5e985707dd3af9863ac3983a43c835dbaa8ed5f35
10+
size: 714094
11+
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/3.yaml
12+
original: lts-22.3

0 commit comments

Comments
 (0)