Skip to content

Support ghc-9.12 #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 30, 2025
Merged

Support ghc-9.12 #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9256d71
Support ghc 9.12
erikd Jan 30, 2025
360aaa2
Remove derived Typeable instances
erikd Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ repository cardano-haskell-packages
d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee

index-state:
hackage.haskell.org 2024-08-27T18:06:30Z
, cardano-haskell-packages 2024-07-24T14:16:32Z
hackage.haskell.org 2025-01-30T00:54:30Z
, cardano-haskell-packages 2025-01-29T20:54:25Z

packages: ./typed-protocols
./typed-protocols-cborg
Expand All @@ -22,3 +22,11 @@ packages: ./typed-protocols
-- ./typed-protocols-doc

test-show-details: direct

if impl (ghc >= 9.12)
allow-newer:
-- https://github.com/well-typed/cborg/pull/339
, cborg:base
, cborg:ghc-prim
, serialise:base
, serialise:ghc-prim
2 changes: 1 addition & 1 deletion typed-protocols-cborg/typed-protocols-cborg.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ extra-doc-files: CHANGELOG.md, README.md
library
exposed-modules: Network.TypedProtocol.Codec.CBOR

build-depends: base >=4.12 && <4.21,
build-depends: base >=4.12 && <4.22,
bytestring >=0.10 && <0.13,
cborg >=0.2.1 && <0.3,
singletons,
Expand Down
4 changes: 2 additions & 2 deletions typed-protocols-doc/demo/DemoProtocol.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ instance Codec (DemoCodec a) where
type MonadDecode (DemoCodec a) = Except String

data PongEnum = NormalPong | ComplexPong
deriving (Show, Read, Eq, Ord, Enum, Bounded, Typeable)
deriving (Show, Read, Eq, Ord, Enum, Bounded)

data PingEnum = PingRequest | EndPing
deriving (Show, Read, Eq, Ord, Enum, Bounded, Typeable)
deriving (Show, Read, Eq, Ord, Enum, Bounded)

deriving via (ViaEnum PongEnum)
instance (Codec codec, HasInfo codec (DefEnumEncoding codec)) => HasInfo codec PongEnum
Expand Down
4 changes: 2 additions & 2 deletions typed-protocols-doc/test/Network/TypedProtocol/Tests/TestProtocol.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ instance Codec (TestCodec a) where
type MonadDecode (TestCodec a) = Except String

data PongEnum = NormalPong | ComplexPong
deriving (Show, Read, Eq, Ord, Enum, Bounded, Typeable)
deriving (Show, Read, Eq, Ord, Enum, Bounded)

data PingEnum = PingRequest | EndPing
deriving (Show, Read, Eq, Ord, Enum, Bounded, Typeable)
deriving (Show, Read, Eq, Ord, Enum, Bounded)

deriving via (ViaEnum PongEnum)
instance (Codec codec, HasInfo codec (DefEnumEncoding codec)) => HasInfo codec PongEnum
Expand Down
2 changes: 1 addition & 1 deletion typed-protocols-stateful-cborg/typed-protocols-stateful-cborg.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ extra-doc-files: CHANGELOG.md, README.md
library
exposed-modules: Network.TypedProtocol.Stateful.Codec.CBOR

build-depends: base >=4.12 && <4.21,
build-depends: base >=4.12 && <4.22,
bytestring >=0.10 && <0.13,
cborg >=0.2.1 && <0.3,
singletons,
Expand Down