Skip to content

Commit ffe52e1

Browse files
committed
io-classes-1.7
1 parent db61131 commit ffe52e1

File tree

8 files changed

+36
-45
lines changed

8 files changed

+36
-45
lines changed

cabal.project

+20
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,23 @@ package network-mux
5454
package ouroboros-network
5555
flags: +asserts +cddl
5656

57+
source-repository-package
58+
type: git
59+
location: https://github.com/input-output-hk/typed-protocols
60+
tag: 33f29f8bbebcc2d4cec34a2f7bffb1edec6bacc1
61+
subdir: typed-protocols
62+
typed-protocols-cborg
63+
typed-protocols-examples
64+
65+
source-repository-package
66+
type: git
67+
location: https://github.com/intersectmbo/cardano-base
68+
tag: 173ca7c6add96c968120bf464c9f353659cfc1f8
69+
subdir: strict-checked-vars
70+
71+
source-repository-package
72+
type: git
73+
location: https://github.com/input-output-hk/io-sim
74+
tag: 89b7e9f562b3c8908a37a3b5b5df4ed80d60047a
75+
subdir: io-classes
76+
io-sim

cardano-ping/cardano-ping.cabal

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ library
3030
iproute,
3131
time,
3232

33-
si-timers ^>=1.5,
34-
strict-stm,
33+
io-classes:{si-timers,strict-stm} ^>=1.7,
3534

3635
network-mux ^>=0.4.5,
3736
tdigest ^>=0.3,

network-mux/network-mux.cabal

+2-6
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ common demo-deps
4242

4343
library
4444
build-depends: base >=4.14 && <4.21,
45-
io-classes ^>=1.5.0,
46-
strict-stm,
47-
si-timers,
45+
io-classes:{io-classes,strict-stm,si-timers} ^>=1.7.0,
4846
contra-tracer >=0.1 && <0.2,
4947
monoidal-synchronisation
5048
>=0.1 && <0.2,
@@ -121,9 +119,7 @@ test-suite test
121119
default-language: Haskell2010
122120
default-extensions: ImportQualifiedPost
123121
build-depends: base >=4.14 && <4.21,
124-
io-classes,
125-
si-timers,
126-
strict-stm,
122+
io-classes:{io-classes,si-timers,strict-stm},
127123
io-sim,
128124
contra-tracer,
129125
network-mux,

ouroboros-network-api/ouroboros-network-api.cabal

+1-3
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,8 @@ library
7575
cardano-strict-containers,
7676
contra-tracer,
7777

78-
io-classes ^>=1.5.0,
78+
io-classes:{io-classes,strict-stm,si-timers} ^>=1.7.0,
7979
network-mux ^>=0.4.5,
80-
strict-stm,
81-
si-timers,
8280
typed-protocols ^>=0.1.1,
8381

8482
ghc-options: -Wall

ouroboros-network-framework/ouroboros-network-framework.cabal

+5-15
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,7 @@ library
8787
, cardano-prelude
8888
, contra-tracer
8989

90-
, io-classes ^>=1.5.0
91-
, si-timers
92-
, strict-stm
90+
, io-classes:{io-classes,strict-stm,si-timers} ^>=1.7.0
9391

9492
, nothunks ^>=0.2
9593
, psqueues
@@ -147,10 +145,8 @@ library testlib
147145

148146
, contra-tracer
149147
, io-sim
150-
, io-classes
148+
, io-classes:{io-classes,strict-stm,si-timers}
151149
, network-mux
152-
, si-timers
153-
, strict-stm
154150
, typed-protocols
155151
, typed-protocols-examples
156152
, ouroboros-network-api
@@ -205,9 +201,7 @@ test-suite sim-tests
205201
, contra-tracer
206202

207203
, io-sim
208-
, io-classes
209-
, si-timers
210-
, strict-stm
204+
, io-classes:{io-classes,strict-stm,si-timers}
211205
, network-mux
212206
, monoidal-synchronisation
213207
, ouroboros-network-framework
@@ -266,9 +260,7 @@ test-suite io-tests
266260
, contra-tracer
267261

268262
, io-sim
269-
, io-classes
270-
, si-timers
271-
, strict-stm
263+
, io-classes:{io-classes,strict-stm,si-timers}
272264
, network-mux
273265
, ouroboros-network-framework
274266
, ouroboros-network-framework:testlib
@@ -334,12 +326,10 @@ executable demo-connection-manager
334326

335327
contra-tracer,
336328

337-
io-classes,
329+
io-classes:{io-classes,strict-stm,si-timers},
338330
network-mux,
339-
si-timers,
340331
ouroboros-network-api,
341332
ouroboros-network-framework,
342-
strict-stm,
343333
typed-protocols,
344334
typed-protocols-examples
345335

ouroboros-network-protocols/ouroboros-network-protocols.cabal

+2-5
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,8 @@ library
100100
deepseq,
101101
quiet,
102102

103-
io-classes ^>=1.5.0,
103+
io-classes:{io-classes,si-timers} ^>=1.7.0,
104104
nothunks,
105-
si-timers,
106105

107106
ouroboros-network-api
108107
^>=0.9.0,
@@ -188,15 +187,13 @@ library testlib
188187

189188
contra-tracer,
190189

191-
io-classes,
190+
io-classes:{io-classes,strict-stm,si-timers},
192191
io-sim,
193192
network-mux,
194193
ouroboros-network-api,
195194
ouroboros-network-framework,
196195
ouroboros-network-mock,
197196
ouroboros-network-protocols,
198-
si-timers,
199-
strict-stm,
200197
typed-protocols
201198

202199
ghc-options: -Wall

ouroboros-network-testing/ouroboros-network-testing.cabal

+1-3
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,10 @@ library
6363
containers,
6464
contra-tracer,
6565
deque ^>=0.4,
66-
io-classes ^>=1.5.0,
66+
io-classes:{io-classes,strict-stm,si-timers} ^>=1.7.0,
6767
io-sim,
6868
pretty-simple,
69-
strict-stm,
7069
psqueues >=0.2.3 && <0.3,
71-
si-timers,
7270
tasty,
7371
tasty-expected-failure,
7472

ouroboros-network/ouroboros-network.cabal

+4-11
Original file line numberDiff line numberDiff line change
@@ -135,14 +135,11 @@ library
135135
monoidal-synchronisation,
136136
strict-checked-vars ^>= 0.2,
137137

138-
io-classes ^>=1.5.0,
139-
io-classes-mtl ^>=0.1,
138+
io-classes:{io-classes,strict-stm,si-timers,mtl} ^>=1.7.0,
140139
network-mux,
141-
si-timers,
142140
ouroboros-network-api ^>=0.9.0,
143141
ouroboros-network-framework ^>=0.13.2.2,
144142
ouroboros-network-protocols ^>=0.10,
145-
strict-stm,
146143
typed-protocols ^>=0.1.1,
147144
if !os(windows)
148145
build-depends: directory,
@@ -201,7 +198,7 @@ library sim-tests-lib
201198
contra-tracer,
202199
nothunks,
203200

204-
io-classes,
201+
io-classes:{io-classes,strict-stm,si-timers},
205202
io-sim,
206203
monoidal-synchronisation,
207204
network-mux,
@@ -213,8 +210,6 @@ library sim-tests-lib
213210
ouroboros-network-protocols:testlib,
214211
ouroboros-network-framework:testlib,
215212
ouroboros-network-testing ^>= 0.7.0,
216-
si-timers,
217-
strict-stm,
218213
typed-protocols,
219214
typed-protocols-examples,
220215
exposed-modules: Ouroboros.Network.BlockFetch.Examples
@@ -304,7 +299,7 @@ test-suite io-tests
304299

305300
contra-tracer,
306301

307-
io-classes,
302+
io-classes:{io-classes,strict-stm,si-timers},
308303
network-mux,
309304
ouroboros-network,
310305
ouroboros-network-api,
@@ -314,8 +309,6 @@ test-suite io-tests
314309
ouroboros-network-protocols:testlib,
315310
ouroboros-network-framework:testlib,
316311
ouroboros-network-testing ^>= 0.7.0.0,
317-
si-timers,
318-
strict-stm,
319312
with-utf8,
320313
if os(windows)
321314
build-depends: Win32-network <0.3.0.0,
@@ -347,7 +340,7 @@ executable demo-chain-sync
347340
contra-tracer,
348341

349342
typed-protocols,
350-
strict-stm,
343+
io-classes:strict-stm,
351344
ouroboros-network-api,
352345
ouroboros-network-framework,
353346
ouroboros-network-mock,

0 commit comments

Comments
 (0)