Skip to content

Commit 3e4bf04

Browse files
authored
Merge pull request #75 from haskellari/ansi-terminal-1.0
Allow ansi-terminal-1.0
2 parents e7d9153 + efcf226 commit 3e4bf04

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.15.20230321
11+
# version: 0.16.1
1212
#
13-
# REGENDATA ("0.15.20230321",["github","cabal.project"])
13+
# REGENDATA ("0.16.1",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -42,9 +42,9 @@ jobs:
4242
compilerVersion: 9.6.1
4343
setup-method: ghcup
4444
allow-failure: false
45-
- compiler: ghc-9.4.4
45+
- compiler: ghc-9.4.5
4646
compilerKind: ghc
47-
compilerVersion: 9.4.4
47+
compilerVersion: 9.4.5
4848
setup-method: ghcup
4949
allow-failure: false
5050
- compiler: ghc-9.2.7
@@ -220,17 +220,17 @@ jobs:
220220
- name: install cabal-plan
221221
run: |
222222
mkdir -p $HOME/.cabal/bin
223-
curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > cabal-plan.xz
224-
echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
223+
curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.7.3.0/cabal-plan-0.7.3.0-x86_64-linux.xz > cabal-plan.xz
224+
echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
225225
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
226226
rm -f cabal-plan.xz
227227
chmod a+x $HOME/.cabal/bin/cabal-plan
228228
cabal-plan --version
229229
- name: install cabal-docspec
230230
run: |
231231
mkdir -p $HOME/.cabal/bin
232-
curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20211114/cabal-docspec-0.0.0.20211114.xz > cabal-docspec.xz
233-
echo 'e224700d9e8c9ec7ec6bc3f542ba433cd9925a5d356676c62a9bd1f2c8be8f8a cabal-docspec.xz' | sha256sum -c -
232+
curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20230406/cabal-docspec-0.0.0.20230406-x86_64-linux.xz > cabal-docspec.xz
233+
echo '68fa9addd5dc453d533a74a763950499d4593b1297c9a05c3ea5bd1acc04c9dd cabal-docspec.xz' | sha256sum -c -
234234
xz -d < cabal-docspec.xz > $HOME/.cabal/bin/cabal-docspec
235235
rm -f cabal-docspec.xz
236236
chmod a+x $HOME/.cabal/bin/cabal-docspec

tree-diff.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
cabal-version: 2.2
22
name: tree-diff
33
version: 0.3.0.1
4+
x-revision: 1
45
synopsis: Diffing of (expression) trees.
56
category: Data, Testing
67
description:
@@ -56,7 +57,7 @@ tested-with:
5657
|| ==8.10.7
5758
|| ==9.0.2
5859
|| ==9.2.7
59-
|| ==9.4.4
60+
|| ==9.4.5
6061
|| ==9.6.1
6162
, GHCJS ==8.4
6263

@@ -97,7 +98,7 @@ library
9798

9899
build-depends:
99100
, aeson ^>=1.4.6.0 || ^>=1.5.6.0 || ^>=2.0.0.0 || ^>=2.1.0.0
100-
, ansi-terminal >=0.10 && <0.12
101+
, ansi-terminal >=0.10 && <0.12 || ^>=1.0
101102
, ansi-wl-pprint ^>=0.6.8.2
102103
, base-compat >=0 && <0.13 || ^>=0.13
103104
, bytestring-builder ^>=0.10.8.2.0
@@ -179,7 +180,6 @@ test-suite tree-diff-test
179180
, tasty-quickcheck ^>=0.10.1
180181
, trifecta >=2 && <2.2
181182

182-
183183
benchmark tree-diff-bench
184184
default-language: Haskell2010
185185
type: exitcode-stdio-1.0

0 commit comments

Comments
 (0)