Skip to content

Commit 5bb5861

Browse files
committed
Bump dev cabal to 3.2 and use multiple subdirs feature
- The haskell.nix cabal now works, so that's nice. - We can use the nice multiple-subdirs feature in cabal.project to cut out a lot of repetition. Note we get annoying warnings about extraneous version ranges due to haskell/cabal#5119.
1 parent 39179ff commit 5bb5861

File tree

1 file changed

+27
-106
lines changed

1 file changed

+27
-106
lines changed

cabal.project

Lines changed: 27 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -161,126 +161,53 @@ source-repository-package
161161
type: git
162162
location: https://github.com/input-output-hk/cardano-base
163163
tag: 5035c9ed95e9d47f050314a7d96b1b2043288f61
164-
subdir: binary
165-
166-
source-repository-package
167-
type: git
168-
location: https://github.com/input-output-hk/cardano-base
169-
tag: 5035c9ed95e9d47f050314a7d96b1b2043288f61
170-
subdir: slotting
164+
subdir:
165+
binary
166+
slotting
167+
cardano-crypto-class
171168

172169
source-repository-package
173170
type: git
174171
location: https://github.com/input-output-hk/cardano-prelude
175172
tag: bd7eb69d27bfaee46d435bc1d2720520b1446426
176-
177-
source-repository-package
178-
type: git
179-
location: https://github.com/input-output-hk/cardano-prelude
180-
tag: bd7eb69d27bfaee46d435bc1d2720520b1446426
181-
subdir: test
182-
183-
source-repository-package
184-
type: git
185-
location: https://github.com/raduom/ouroboros-network
186-
tag: af744374a05d6a5eb76713b399595131e2a24c38
187-
subdir: typed-protocols
173+
subdir:
174+
.
175+
test
188176

189177
source-repository-package
190178
type: git
191179
location: https://github.com/raduom/ouroboros-network
192180
tag: af744374a05d6a5eb76713b399595131e2a24c38
193-
subdir: typed-protocols-examples
194-
195-
source-repository-package
196-
type: git
197-
location: https://github.com/raduom/ouroboros-network
198-
tag: af744374a05d6a5eb76713b399595131e2a24c38
199-
subdir: ouroboros-network
200-
201-
source-repository-package
202-
type: git
203-
location: https://github.com/raduom/ouroboros-network
204-
tag: af744374a05d6a5eb76713b399595131e2a24c38
205-
subdir: ouroboros-network-framework
206-
207-
source-repository-package
208-
type: git
209-
location: https://github.com/raduom/ouroboros-network
210-
tag: af744374a05d6a5eb76713b399595131e2a24c38
211-
subdir: io-sim
212-
213-
source-repository-package
214-
type: git
215-
location: https://github.com/raduom/ouroboros-network
216-
tag: af744374a05d6a5eb76713b399595131e2a24c38
217-
subdir: io-sim-classes
218-
219-
source-repository-package
220-
type: git
221-
location: https://github.com/raduom/ouroboros-network
222-
tag: af744374a05d6a5eb76713b399595131e2a24c38
223-
subdir: network-mux
224-
225-
source-repository-package
226-
type: git
227-
location: https://github.com/raduom/ouroboros-network
228-
tag: af744374a05d6a5eb76713b399595131e2a24c38
229-
subdir: Win32-network
181+
subdir:
182+
typed-protocols
183+
typed-protocols-examples
184+
ouroboros-network
185+
ouroboros-network-framework
186+
io-sim
187+
io-sim-classes
188+
network-mux
189+
Win32-network
230190

231191
source-repository-package
232192
type: git
233193
location: https://github.com/raduom/iohk-monitoring-framework
234194
tag: b5c035ad4e226d634242ad5979fa677921181435
235-
subdir: iohk-monitoring
236-
237-
source-repository-package
238-
type: git
239-
location: https://github.com/raduom/iohk-monitoring-framework
240-
tag: b5c035ad4e226d634242ad5979fa677921181435
241-
subdir: tracer-transformers
242-
243-
source-repository-package
244-
type: git
245-
location: https://github.com/raduom/iohk-monitoring-framework
246-
tag: b5c035ad4e226d634242ad5979fa677921181435
247-
subdir: contra-tracer
248-
249-
source-repository-package
250-
type: git
251-
location: https://github.com/raduom/cardano-ledger-specs
252-
tag: 2cac85306d8b3e07006e9081f36ce7ebf2d9d0a3
253-
subdir: byron/chain/executable-spec
254-
255-
source-repository-package
256-
type: git
257-
location: https://github.com/raduom/cardano-ledger-specs
258-
tag: 2cac85306d8b3e07006e9081f36ce7ebf2d9d0a3
259-
subdir: byron/ledger/executable-spec
260-
261-
source-repository-package
262-
type: git
263-
location: https://github.com/raduom/cardano-ledger-specs
264-
tag: 2cac85306d8b3e07006e9081f36ce7ebf2d9d0a3
265-
subdir: semantics/executable-spec
266-
267-
source-repository-package
268-
type: git
269-
location: https://github.com/raduom/cardano-ledger-specs
270-
tag: 2cac85306d8b3e07006e9081f36ce7ebf2d9d0a3
271-
subdir: shelley/chain-and-ledger/dependencies/non-integer
195+
subdir:
196+
iohk-monitoring
197+
tracer-transformers
198+
contra-tracer
272199

273200
source-repository-package
274201
type: git
275202
location: https://github.com/raduom/cardano-ledger-specs
276203
tag: 2cac85306d8b3e07006e9081f36ce7ebf2d9d0a3
277-
subdir: shelley/chain-and-ledger/executable-spec
278-
279-
source-repository-package
280-
type: git
281-
location: https://github.com/raduom/cardano-ledger-specs
282-
tag: 2cac85306d8b3e07006e9081f36ce7ebf2d9d0a3
283-
subdir: shelley/chain-and-ledger/executable-spec/test
204+
subdir:
205+
byron/chain/executable-spec
206+
byron/ledger/executable-spec
207+
semantics/executable-spec
208+
shelley/chain-and-ledger/dependencies/non-integer
209+
shelley/chain-and-ledger/executable-spec
210+
shelley/chain-and-ledger/executable-spec/test
284211

285212
-- The following two dependencies are not mirrored in the
286213
-- stack.yaml file, but they are needed regardless by cabal.
@@ -289,10 +216,4 @@ source-repository-package
289216
location: https://github.com/input-output-hk/goblins
290217
tag: 26d35ad52fe9ade3391532dbfeb2f416f07650bc
291218

292-
source-repository-package
293-
type: git
294-
location: https://github.com/input-output-hk/cardano-base
295-
tag: 5035c9ed95e9d47f050314a7d96b1b2043288f61
296-
subdir: cardano-crypto-class
297-
298219
-- / Node protocols

0 commit comments

Comments
 (0)