jaspervdj/patat
1
1
Fork 0
mirror of https://github.com/jaspervdj/patat.git synced 2024-11-22 06:23:46 +03:00
Code Issues Projects Releases Wiki Activity

Bump dependencies for GHC 9.8 etc. (#160)

Browse Source 
Fixes #153
This commit is contained in:
Andreas Abel 2024-01-30 19:28:50 +01:00 committed by GitHub
parent 0ee10c3db8
commit fb740eb235
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 44 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build-and-release.yml vendored
View File

@ -7,7 +7,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macOS-latest]
ghc: ["9.4.7"]
ghc: ["9.4.8"]
steps:
- run: echo "$HOME/.local/bin" >> $GITHUB_PATH
@ -27,7 +27,7 @@ jobs:
restore-keys: |
${{ runner.os }}-${{ matrix.ghc }}-v8-
- uses: haskell/actions/setup@v2
- uses: haskell-actions/setup@v2
with:
ghc-version: ${{ matrix.ghc }}
enable-stack: true

41
.github/workflows/haskell-ci.yml vendored
View File

@ -6,11 +6,11 @@
#
# haskell-ci regenerate
#
# For more information, see https://github.com/haskell-CI/haskell-ci
# For more information, see https://github.com/andreasabel/haskell-ci
#
# version: 0.16.6
# version: 0.17.20231112
#
# REGENDATA ("0.16.6",["github","patat.cabal"])
# REGENDATA ("0.17.20231112",["github","patat.cabal"])
#
name: Haskell-CI
on:
@ -23,24 +23,29 @@ jobs:
timeout-minutes:
60
container:
image: buildpack-deps:bionic
image: buildpack-deps:focal
continue-on-error: ${{ matrix.allow-failure }}
strategy:
matrix:
include:
- compiler: ghc-9.6.2
- compiler: ghc-9.8.1
compilerKind: ghc
compilerVersion: 9.6.2
compilerVersion: 9.8.1
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.4.5
- compiler: ghc-9.6.3
compilerKind: ghc
compilerVersion: 9.4.5
compilerVersion: 9.6.3
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.2.4
- compiler: ghc-9.4.8
compilerKind: ghc
compilerVersion: 9.2.4
compilerVersion: 9.4.8
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.2.8
compilerKind: ghc
compilerVersion: 9.2.8
setup-method: ghcup
allow-failure: false
fail-fast: false
@ -50,10 +55,10 @@ jobs:
apt-get update
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup"
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
env:
HCKIND: ${{ matrix.compilerKind }}
HCNAME: ${{ matrix.compiler }}
@ -65,11 +70,13 @@ jobs:
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
HCDIR=/opt/$HCKIND/$HCVER
HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
echo "HC=$HC" >> "$GITHUB_ENV"
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@ -126,7 +133,7 @@ jobs:
chmod a+x $HOME/.cabal/bin/cabal-plan
cabal-plan --version
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: source
- name: initial cabal.project for sdist

1
.gitignore vendored
View File

@ -5,3 +5,4 @@ extra/patat.1
.stack-work
dist
tags
dist-newstyle/

20
patat.cabal
View File

@ -11,7 +11,7 @@ Copyright: 2016 Jasper Van der Jeugt
Category: Text
Build-type: Simple
Cabal-version: >=1.10
Tested-with: GHC ==9.2.4 || ==9.4.5 || ==9.6.2
Tested-with: GHC ==9.2.8 || ==9.4.8 || ==9.6.3 || ==9.8.1
Extra-source-files:
CHANGELOG.md
@ -19,7 +19,7 @@ Extra-source-files:
Source-repository head
Type: git
Location: git://github.com/jaspervdj/patat.git
Location: https://github.com/jaspervdj/patat.git
Flag patat-make-man
Description: Build the executable to generate the man page
@ -32,17 +32,17 @@ Library
Default-language: Haskell2010
Build-depends:
aeson >= 2.0 && < 2.2,
aeson >= 2.0 && < 2.3,
ansi-terminal >= 0.6 && < 1.1,
ansi-wl-pprint >= 0.6 && < 1.1,
async >= 2.2 && < 2.3,
base >= 4.9 && < 5,
base64-bytestring >= 1.0 && < 1.3,
bytestring >= 0.10 && < 0.12,
bytestring >= 0.10 && < 0.13,
colour >= 2.3 && < 2.4,
containers >= 0.5 && < 0.7,
directory >= 1.2 && < 1.4,
filepath >= 1.4 && < 1.5,
filepath >= 1.4 && < 1.6,
mtl >= 2.2 && < 2.4,
optparse-applicative >= 0.16 && < 0.19,
pandoc >= 3.1 && < 3.2,
@ -51,7 +51,7 @@ Library
random >= 1.2 && < 1.3,
skylighting >= 0.10 && < 0.15,
terminal-size >= 0.3 && < 0.4,
text >= 1.2 && < 2.1,
text >= 1.2 && < 2.2,
time >= 1.4 && < 1.13,
unordered-containers >= 0.2 && < 0.3,
yaml >= 0.8 && < 0.12,
@ -129,11 +129,11 @@ Executable patat-make-man
Build-depends:
base >= 4.9 && < 5,
containers >= 0.6 && < 0.7,
containers >= 0.6 && < 0.8,
doctemplates >= 0.8 && < 0.12,
mtl >= 2.2 && < 2.4,
pandoc >= 3.1 && < 3.2,
text >= 1.2 && < 2.1,
text >= 1.2 && < 2.2,
time >= 1.6 && < 1.13
Test-suite patat-tests
@ -154,8 +154,8 @@ Test-suite patat-tests
base >= 4.8 && < 5,
directory >= 1.2 && < 1.4,
pandoc >= 3.1 && < 3.2,
tasty >= 1.2 && < 1.5,
tasty >= 1.2 && < 1.6,
tasty-hunit >= 0.10 && < 0.11,
tasty-quickcheck >= 0.10 && < 0.11,
text >= 1.2 && < 2.1,
text >= 1.2 && < 2.2,
QuickCheck >= 2.8 && < 2.15

7
stack.yaml
View File

@ -1,5 +1,5 @@
resolver: 'lts-21.0'
compiler: 'ghc-9.4.3'
resolver: 'lts-22.3'
compiler: 'ghc-9.6.3'
save-hackage-creds: false
packages:
@ -9,9 +9,6 @@ flags:
patat:
patat-make-man: true
extra-deps:
- 'pandoc-3.1.2'
nix:
packages:
- 'pkgconfig'

17
stack.yaml.lock
View File

@ -3,17 +3,10 @@
# For more information, please see the documentation at:
# https://docs.haskellstack.org/en/stable/lock_files
packages:
- completed:
hackage: pandoc-3.1.2@sha256:5716177472cdcc043eda0b2db2c9dcc0a9eb78b1139a1050308cd2ea2e997d1f,38005
pantry-tree:
size: 142325
sha256: 08ef3d154019e031c8be9d96d0f19a31701e9c75bf56c32d28d3223b243495c0
original:
hackage: pandoc-3.1.2
packages: []
snapshots:
- completed:
size: 639139
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/0.yaml
sha256: 1867d84255dff8c87373f5dd03e5a5cb1c10a99587e26c8793e750c54e83ffdc
original: lts-21.0
sha256: 53a2800f7fe0c4628af0e7d5e985707dd3af9863ac3983a43c835dbaa8ed5f35
size: 714094
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/3.yaml
original: lts-22.3