Skip to content

Commit 9843f86

Browse files
tdammerstdammers
authored
Merge branch 'main' into tdammers/fix-typed-protocols-doc
2 parents be396a3 + a357265 commit 9843f86

File tree

16 files changed

+44
-38
lines changed

16 files changed

+44
-38
lines changed

‎.github/workflows/haskell.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ jobs:
2828
- name: Install LLVM (macOS)
2929
if: runner.os == 'macOS' && matrix.ghc == '8.10'
3030
run: |
31-
brew install llvm@13
32-
echo "LLVM_CONFIG=$(brew --prefix llvm@13)/bin/llvm-config" >> $GITHUB_ENV
33-
echo "$(brew --prefix llvm@13)/bin" >> $GITHUB_PATH
31+
brew install llvm@14
32+
echo "LLVM_CONFIG=$(brew --prefix llvm@14)/bin/llvm-config" >> $GITHUB_ENV
33+
echo "$(brew --prefix llvm@14)/bin" >> $GITHUB_PATH
3434
3535
- name: Verify LLVM installation
3636
if: runner.os == 'macOS' && matrix.ghc == '8.10'

‎cabal.project‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ repository cardano-haskell-packages
1111
d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
1212

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

1717
packages: ./typed-protocols
1818
./typed-protocols-cborg
@@ -22,3 +22,11 @@ packages: ./typed-protocols
2222
./typed-protocols-doc
2323

2424
test-show-details: direct
25+
26+
if impl (ghc >= 9.12)
27+
allow-newer:
28+
-- https://github.com/well-typed/cborg/pull/339
29+
, cborg:base
30+
, cborg:ghc-prim
31+
, serialise:base
32+
, serialise:ghc-prim

‎typed-protocols-cborg/NOTICE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2021 Input Output (Hong Kong) Ltd.
1+
Copyright 2021-2025 Input Output Global Inc (IOG)
22

33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

‎typed-protocols-cborg/typed-protocols-cborg.cabal‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
cabal-version: 3.4
22
name: typed-protocols-cborg
3-
version: 0.3.0.0
3+
version: 0.4.0.0
44
synopsis: CBOR codecs for typed-protocols
55
-- description:
66
license: Apache-2.0
77
license-files:
88
LICENSE
99
NOTICE
10-
copyright: 2019-2023 Input Output Global Inc (IOG)
10+
copyright: 2019-2025 Input Output Global Inc (IOG)
1111
author: Alexander Vieth, Duncan Coutts, Marcin Szamotulski
1212
maintainer: alex@well-typed.com, duncan@well-typed.com, marcin.szamotulski@iohk.io
1313
category: Control
@@ -18,13 +18,13 @@ extra-doc-files: CHANGELOG.md, README.md
1818
library
1919
exposed-modules: Network.TypedProtocol.Codec.CBOR
2020

21-
build-depends: base >=4.12 && <4.21,
21+
build-depends: base >=4.12 && <4.22,
2222
bytestring >=0.10 && <0.13,
2323
cborg >=0.2.1 && <0.3,
2424
singletons,
2525

26-
io-classes ^>=1.5,
27-
typed-protocols ^>=0.3
26+
io-classes:io-classes ^>=1.7,
27+
typed-protocols ^>=0.4
2828

2929
hs-source-dirs: src
3030
default-language: Haskell2010

‎typed-protocols-doc/NOTICE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2019-2024 Input Output Global Inc (IOG)
1+
Copyright 2019-2025 Input Output Global Inc (IOG)
22

33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

‎typed-protocols-doc/demo/DemoProtocol.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ instance Codec (DemoCodec a) where
8080
type MonadDecode (DemoCodec a) = Except String
8181

8282
data PongEnum = NormalPong | ComplexPong
83-
deriving (Show, Read, Eq, Ord, Enum, Bounded, Typeable)
83+
deriving (Show, Read, Eq, Ord, Enum, Bounded)
8484

8585
data PingEnum = PingRequest | EndPing
86-
deriving (Show, Read, Eq, Ord, Enum, Bounded, Typeable)
86+
deriving (Show, Read, Eq, Ord, Enum, Bounded)
8787

8888
deriving via (ViaEnum PongEnum)
8989
instance (Codec codec, HasInfo codec (DefEnumEncoding codec)) => HasInfo codec PongEnum

‎typed-protocols-doc/test/Network/TypedProtocol/Tests/TestProtocol.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ instance Serializable TestCodec a where
7979
decode _ = throwError "this is a mock codec"
8080

8181
data PongEnum = NormalPong | ComplexPong
82-
deriving (Show, Read, Eq, Ord, Enum, Bounded, Typeable)
82+
deriving (Show, Read, Eq, Ord, Enum, Bounded)
8383

8484
data PingEnum = PingRequest | EndPing
85-
deriving (Show, Read, Eq, Ord, Enum, Bounded, Typeable)
85+
deriving (Show, Read, Eq, Ord, Enum, Bounded)
8686

8787
deriving via (ViaEnum PongEnum)
8888
instance (Codec codec, HasInfo codec (DefEnumEncoding codec)) => HasInfo codec PongEnum

‎typed-protocols-doc/typed-protocols-doc.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ license: Apache-2.0
77
license-file: LICENSE
88
author: Tobias Dammers
99
maintainer: tobias@well-typed.com
10-
copyright: 2023-2024 Input Output Global Inc (IOG)
10+
copyright: 2023-2025 Input Output Global Inc (IOG)
1111
category: Network
1212
build-type: Simple
1313
extra-doc-files: CHANGELOG.md

‎typed-protocols-examples/NOTICE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2019-2021 Input Output (Hong Kong) Ltd.
1+
Copyright 2019-2025 Input Output Global Inc (IOG)
22

33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

‎typed-protocols-examples/typed-protocols-examples.cabal‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
cabal-version: 3.4
22
name: typed-protocols-examples
3-
version: 0.5.0.0
3+
version: 0.6.0.0
44
synopsis: Examples and tests for the typed-protocols framework
55
-- description:
66
license: Apache-2.0
77
license-files:
88
LICENSE
99
NOTICE
10-
copyright: 2019-2024 Input Output Global Inc (IOG)
10+
copyright: 2019-2025 Input Output Global Inc (IOG)
1111
author: Alexander Vieth, Duncan Coutts, Marcin Szamotulski
1212
maintainer: alex@well-typed.com, duncan@well-typed.com, marcin.szamotulski@iohk.io
1313
category: Control
@@ -59,11 +59,10 @@ library
5959
serialise,
6060
singletons,
6161
contra-tracer,
62-
io-classes,
63-
si-timers,
62+
io-classes:{io-classes,si-timers},
6463
network,
6564
time,
66-
typed-protocols ^>= 0.3,
65+
typed-protocols ^>= 0.4,
6766
typed-protocols-cborg,
6867
typed-protocols-stateful
6968

@@ -90,9 +89,8 @@ test-suite test
9089
, typed-protocols
9190
, typed-protocols-cborg
9291
, typed-protocols-examples
93-
, io-classes
92+
, io-classes:{io-classes,si-timers}
9493
, io-sim
95-
, si-timers
9694
, QuickCheck
9795
, tasty
9896
, tasty-quickcheck

0 commit comments

Comments
 (0)