Skip to content

Commit

Permalink
Support ghc 9.12
Browse files Browse the repository at this point in the history
  • Loading branch information
@erikd
erikd committed Jan 8, 2025
1 parent 6cc22b8 commit 2bebb74
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 19 deletions.
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.21,
base >= 4.11 && < 4.22,
bytestring < 1.0,

cborg == 0.2.*,
Expand Down
8 changes: 5 additions & 3 deletions cabal.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ packages:
binary-serialise-cbor/
cborg-json/

-- Needed for serialise benchmarks
allow-newer:
store-core:text
if impl (ghc >= 9.12)
allow-newer:
, aeson:ghc-prim
, aeson:template-haskell
, bytestring:ghc-prim
2 changes: 1 addition & 1 deletion cbor-tool/cbor-tool.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ executable cbor-tool
other-extensions: CPP, BangPatterns
ghc-options: -Wall
build-depends:
base >=4.11 && <4.21,
base >=4.11 && <4.22,
filepath >=1.0 && <1.6,
aeson >=0.7 && <2.3,
aeson-pretty >=0.8 && <0.9,
Expand Down
6 changes: 3 additions & 3 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.21,
base >=4.11 && < 4.22,
aeson >=0.7 && <2.3,
aeson-pretty >=0.8 && <0.9,
base64-bytestring >=1.0 && <1.3,
Expand Down Expand Up @@ -61,7 +61,7 @@ benchmark bench
other-modules:

build-depends:
base >= 4.11 && < 4.21,
base >= 4.11 && < 4.22,
bytestring >= 0.10.4 && < 0.13,
criterion >= 1.0 && < 1.7,
deepseq >= 1.0 && < 1.6,
Expand All @@ -87,7 +87,7 @@ test-suite tests
other-modules:

build-depends:
base >= 4.7 && < 4.21,
base >= 4.7 && < 4.22,
base-orphans,
base16-bytestring >= 1.0 && < 1.1,
bytestring >= 0.10.4 && < 0.13,
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,11 +90,11 @@ library

build-depends:
array >= 0.4 && < 0.6,
base >= 4.11 && < 4.21,
base >= 4.11 && < 4.22,
bytestring >= 0.10.4 && < 0.13,
containers >= 0.5 && < 0.8,
deepseq >= 1.0 && < 1.6,
ghc-prim >= 0.3.1.0 && < 0.12,
ghc-prim >= 0.3.1.0 && < 0.14,
half >= 0.2.2.3 && < 0.4,
primitive >= 0.5 && < 0.10,
text >= 1.1 && < 1.3 || >= 2.0 && <2.2
Expand Down Expand Up @@ -148,7 +148,7 @@ test-suite tests

build-depends:
array >= 0.4 && < 0.6,
base >= 4.11 && < 4.21,
base >= 4.11 && < 4.22,
base-orphans,
bytestring >= 0.10.4 && < 0.13,
text >= 1.1 && < 2.2,
Expand Down
16 changes: 8 additions & 8 deletions serialise/serialise.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ library
Codec.Serialise.Internal.GeneralisedUTF8

build-depends:
base >= 4.11 && < 4.21,
base >= 4.11 && < 4.22,
array >= 0.4 && < 0.6,
bytestring >= 0.10.4 && < 0.13,
cborg == 0.2.*,
containers >= 0.5 && < 0.8,
ghc-prim >= 0.3.1.0 && < 0.12,
ghc-prim >= 0.3.1.0 && < 0.14,
half >= 0.2.2.3 && < 0.4,
hashable >= 1.2 && < 2.0,
primitive >= 0.5 && < 0.10,
Expand Down Expand Up @@ -124,7 +124,7 @@ test-suite tests
Tests.GeneralisedUTF8

build-depends:
base >= 4.11 && < 4.21,
base >= 4.11 && < 4.22,
bytestring >= 0.10.4 && < 0.13,
directory >= 1.0 && < 1.4,
filepath >= 1.0 && < 1.6,
Expand Down Expand Up @@ -161,7 +161,7 @@ benchmark instances
Instances.Time

build-depends:
base >= 4.11 && < 4.21,
base >= 4.11 && < 4.22,
binary >= 0.7 && < 0.11,
bytestring >= 0.10.4 && < 0.13,
vector >= 0.10 && < 0.14,
Expand Down Expand Up @@ -205,10 +205,10 @@ benchmark micro
SimpleVersus

build-depends:
base >= 4.11 && < 4.21,
base >= 4.11 && < 4.22,
binary >= 0.7 && < 0.11,
bytestring >= 0.10.4 && < 0.13,
ghc-prim >= 0.3.1.0 && < 0.12,
ghc-prim >= 0.3.1.0 && < 0.14,
vector >= 0.10 && < 0.14,
cborg,
serialise,
Expand Down Expand Up @@ -251,12 +251,12 @@ benchmark versus
Macro.CBOR

build-depends:
base >= 4.11 && < 4.21,
base >= 4.11 && < 4.22,
array >= 0.4 && < 0.6,
binary >= 0.7 && < 0.11,
bytestring >= 0.10.4 && < 0.13,
directory >= 1.0 && < 1.4,
ghc-prim >= 0.3.1.0 && < 0.12,
ghc-prim >= 0.3.1.0 && < 0.14,
fail >= 4.9.0.0 && < 4.10,
text >= 1.1 && < 2.2,
vector >= 0.10 && < 0.14,
Expand Down
2 changes: 2 additions & 0 deletions serialise/tests/Tests/Orphanage.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,11 @@ instance Arbitrary BSS.ShortByteString where
arbitrary = BSS.pack <$> arbitrary
#endif

#if !MIN_VERSION_quickcheck_instances(0,3,32)
instance (Vector.Primitive.Prim a, Arbitrary a
) => Arbitrary (Vector.Primitive.Vector a) where
arbitrary = Vector.Primitive.fromList <$> arbitrary
#endif

#if MIN_VERSION_base(4,7,0) && !MIN_VERSION_QuickCheck(2,10,0)
instance Arbitrary (Proxy a) where
Expand Down

0 comments on commit 2bebb74

Please sign in to comment.