Skip to content

Commit

Permalink
Merge pull request #336 from erikd/master
Browse files Browse the repository at this point in the history 
Make it build with ghc-9.10
  • Loading branch information
@dcoutts
dcoutts authored May 22, 2024
2 parents 64e2201 + 01f3236 commit 8dabad7
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 26 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/haskell-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ jobs:
strategy:
matrix:
include:
- compiler: ghc-9.10.1
compilerKind: ghc
compilerVersion: 9.10.1
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.8.1
compilerKind: ghc
compilerVersion: 9.8.1
Expand Down
2 changes: 1 addition & 1 deletion binary-serialise-cbor/binary-serialise-cbor.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ library
exposed-modules: Data.Binary.Serialise.CBOR.Read

build-depends:
base >= 4.11 && < 4.20,
base >= 4.11 && < 4.21,
bytestring < 1.0,

cborg == 0.2.*,
Expand Down
4 changes: 2 additions & 2 deletions cbor-tool/cbor-tool.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ executable cbor-tool
other-extensions: CPP, BangPatterns
ghc-options: -Wall
build-depends:
base >=4.11 && <4.20,
filepath >=1.0 && <1.5,
base >=4.11 && <4.21,
filepath >=1.0 && <1.6,
aeson >=0.7 && <2.3,
aeson-pretty >=0.8 && <0.9,
scientific >=0.3 && <0.4,
Expand Down
10 changes: 5 additions & 5 deletions cborg-json/cborg-json.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ library
exposed-modules: Codec.CBOR.JSON
ghc-options: -Wall
build-depends:
base >=4.11 && < 4.20,
base >=4.11 && < 4.21,
aeson >=0.7 && <2.3,
aeson-pretty >=0.8 && <0.9,
base64-bytestring >=1.0 && <1.3,
Expand Down Expand Up @@ -61,11 +61,11 @@ benchmark bench
other-modules:

build-depends:
base >= 4.11 && < 4.20,
base >= 4.11 && < 4.21,
bytestring >= 0.10.4 && < 0.13,
criterion >= 1.0 && < 1.7,
deepseq >= 1.0 && < 1.6,
zlib >= 0.5 && < 0.7,
zlib >= 0.5 && < 0.8,
directory,
process,
aeson,
Expand All @@ -87,14 +87,14 @@ test-suite tests
other-modules:

build-depends:
base >= 4.7 && < 4.20,
base >= 4.7 && < 4.21,
base-orphans,
base16-bytestring >= 1.0 && < 1.1,
bytestring >= 0.10.4 && < 0.13,
cborg,
cborg-json,
aeson >= 0.7 && < 2.3,
QuickCheck >= 2.9 && < 2.15,
QuickCheck >= 2.9 && < 2.16,
tasty >= 0.11 && < 1.6,
tasty-hunit >= 0.9 && < 0.11,
text >= 1.1 && < 2.2
Expand Down
6 changes: 3 additions & 3 deletions cborg/cborg.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ library

build-depends:
array >= 0.4 && < 0.6,
base >= 4.11 && < 4.20,
base >= 4.11 && < 4.21,
bytestring >= 0.10.4 && < 0.13,
containers >= 0.5 && < 0.8,
deepseq >= 1.0 && < 1.6,
Expand Down Expand Up @@ -148,7 +148,7 @@ test-suite tests

build-depends:
array >= 0.4 && < 0.6,
base >= 4.11 && < 4.20,
base >= 4.11 && < 4.21,
base-orphans,
bytestring >= 0.10.4 && < 0.13,
text >= 1.1 && < 2.2,
Expand All @@ -159,7 +159,7 @@ test-suite tests
base16-bytestring >= 1.0 && < 1.1,
deepseq >= 1.0 && < 1.6,
half >= 0.2.2.3 && < 0.4,
QuickCheck >= 2.9 && < 2.15,
QuickCheck >= 2.9 && < 2.16,
random,
scientific >= 0.3 && < 0.4,
tasty >= 0.11 && < 1.6,
Expand Down
30 changes: 15 additions & 15 deletions serialise/serialise.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ library
Codec.Serialise.Internal.GeneralisedUTF8

build-depends:
base >= 4.11 && < 4.20,
base >= 4.11 && < 4.21,
array >= 0.4 && < 0.6,
bytestring >= 0.10.4 && < 0.13,
cborg == 0.2.*,
Expand All @@ -86,10 +86,10 @@ library

if flag(newtime15)
build-depends:
time >= 1.5 && < 1.14
time >= 1.5 && < 1.15
else
build-depends:
time >= 1.4 && < 1.5,
time >= 1.4 && < 1.6,
old-locale

if impl(ghc >= 8.0)
Expand Down Expand Up @@ -124,18 +124,18 @@ test-suite tests
Tests.GeneralisedUTF8

build-depends:
base >= 4.11 && < 4.20,
base >= 4.11 && < 4.21,
bytestring >= 0.10.4 && < 0.13,
directory >= 1.0 && < 1.4,
filepath >= 1.0 && < 1.5,
filepath >= 1.0 && < 1.6,
text >= 1.1 && < 2.2,
time >= 1.4 && < 1.14,
time >= 1.4 && < 1.15,
containers >= 0.5 && < 0.8,
unordered-containers >= 0.2 && < 0.3,
primitive >= 0.5 && < 0.10,
cborg,
serialise,
QuickCheck >= 2.9 && < 2.15,
QuickCheck >= 2.9 && < 2.16,
tasty >= 0.11 && < 1.6,
tasty-hunit >= 0.9 && < 0.11,
tasty-quickcheck >= 0.8 && < 0.11,
Expand All @@ -161,7 +161,7 @@ benchmark instances
Instances.Time

build-depends:
base >= 4.11 && < 4.20,
base >= 4.11 && < 4.21,
binary >= 0.7 && < 0.11,
bytestring >= 0.10.4 && < 0.13,
vector >= 0.10 && < 0.14,
Expand All @@ -173,7 +173,7 @@ benchmark instances

if flag(newtime15)
build-depends:
time >= 1.5 && < 1.14
time >= 1.5 && < 1.15
else
build-depends:
time >= 1.4 && < 1.5,
Expand Down Expand Up @@ -205,7 +205,7 @@ benchmark micro
SimpleVersus

build-depends:
base >= 4.11 && < 4.20,
base >= 4.11 && < 4.21,
binary >= 0.7 && < 0.11,
bytestring >= 0.10.4 && < 0.13,
ghc-prim >= 0.3.1.0 && < 0.12,
Expand Down Expand Up @@ -251,7 +251,7 @@ benchmark versus
Macro.CBOR

build-depends:
base >= 4.11 && < 4.20,
base >= 4.11 && < 4.21,
array >= 0.4 && < 0.6,
binary >= 0.7 && < 0.11,
bytestring >= 0.10.4 && < 0.13,
Expand All @@ -263,22 +263,22 @@ benchmark versus
cborg,
serialise,

filepath >= 1.0 && < 1.5,
filepath >= 1.0 && < 1.6,
containers >= 0.5 && < 0.8,
deepseq >= 1.0 && < 1.6,
aeson >= 0.7 && < 2.3,
cereal >= 0.5.2.0 && < 0.6,
half >= 0.2.2.3 && < 0.4,
tar >= 0.4 && < 0.6,
zlib >= 0.5 && < 0.7,
tar >= 0.4 && < 0.7,
zlib >= 0.5 && < 0.8,
pretty >= 1.0 && < 1.2,
criterion >= 1.0 && < 1.7,
store >= 0.7.1 && < 0.8,
semigroups

if flag(newtime15)
build-depends:
time >= 1.5 && < 1.14
time >= 1.5 && < 1.15
else
build-depends:
time >= 1.4 && < 1.5,
Expand Down

0 comments on commit 8dabad7

Please sign in to comment.