Skip to content

Commit

Permalink
Bump dev cabal to 3.2 and use multiple subdirs feature
Browse files Browse the repository at this point in the history
- 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.
  • Loading branch information
michaelpj committed Jul 22, 2020
1 parent bc006e0 commit 60a9e57
Showing 1 changed file with 27 additions and 106 deletions.
133 changes: 27 additions & 106 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -161,126 +161,53 @@ source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-base
tag: 5035c9ed95e9d47f050314a7d96b1b2043288f61
subdir: binary

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-base
tag: 5035c9ed95e9d47f050314a7d96b1b2043288f61
subdir: slotting
subdir:
binary
slotting
cardano-crypto-class

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-prelude
tag: bd7eb69d27bfaee46d435bc1d2720520b1446426

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-prelude
tag: bd7eb69d27bfaee46d435bc1d2720520b1446426
subdir: test

source-repository-package
type: git
location: https://github.com/raduom/ouroboros-network
tag: af744374a05d6a5eb76713b399595131e2a24c38
subdir: typed-protocols
subdir:
.
test

source-repository-package
type: git
location: https://github.com/raduom/ouroboros-network
tag: af744374a05d6a5eb76713b399595131e2a24c38
subdir: typed-protocols-examples

source-repository-package
type: git
location: https://github.com/raduom/ouroboros-network
tag: af744374a05d6a5eb76713b399595131e2a24c38
subdir: ouroboros-network

source-repository-package
type: git
location: https://github.com/raduom/ouroboros-network
tag: af744374a05d6a5eb76713b399595131e2a24c38
subdir: ouroboros-network-framework

source-repository-package
type: git
location: https://github.com/raduom/ouroboros-network
tag: af744374a05d6a5eb76713b399595131e2a24c38
subdir: io-sim

source-repository-package
type: git
location: https://github.com/raduom/ouroboros-network
tag: af744374a05d6a5eb76713b399595131e2a24c38
subdir: io-sim-classes

source-repository-package
type: git
location: https://github.com/raduom/ouroboros-network
tag: af744374a05d6a5eb76713b399595131e2a24c38
subdir: network-mux

source-repository-package
type: git
location: https://github.com/raduom/ouroboros-network
tag: af744374a05d6a5eb76713b399595131e2a24c38
subdir: Win32-network
subdir:
typed-protocols
typed-protocols-examples
ouroboros-network
ouroboros-network-framework
io-sim
io-sim-classes
network-mux
Win32-network

source-repository-package
type: git
location: https://github.com/raduom/iohk-monitoring-framework
tag: b5c035ad4e226d634242ad5979fa677921181435
subdir: iohk-monitoring

source-repository-package
type: git
location: https://github.com/raduom/iohk-monitoring-framework
tag: b5c035ad4e226d634242ad5979fa677921181435
subdir: tracer-transformers

source-repository-package
type: git
location: https://github.com/raduom/iohk-monitoring-framework
tag: b5c035ad4e226d634242ad5979fa677921181435
subdir: contra-tracer

source-repository-package
type: git
location: https://github.com/raduom/cardano-ledger-specs
tag: 2cac85306d8b3e07006e9081f36ce7ebf2d9d0a3
subdir: byron/chain/executable-spec

source-repository-package
type: git
location: https://github.com/raduom/cardano-ledger-specs
tag: 2cac85306d8b3e07006e9081f36ce7ebf2d9d0a3
subdir: byron/ledger/executable-spec

source-repository-package
type: git
location: https://github.com/raduom/cardano-ledger-specs
tag: 2cac85306d8b3e07006e9081f36ce7ebf2d9d0a3
subdir: semantics/executable-spec

source-repository-package
type: git
location: https://github.com/raduom/cardano-ledger-specs
tag: 2cac85306d8b3e07006e9081f36ce7ebf2d9d0a3
subdir: shelley/chain-and-ledger/dependencies/non-integer
subdir:
iohk-monitoring
tracer-transformers
contra-tracer

source-repository-package
type: git
location: https://github.com/raduom/cardano-ledger-specs
tag: 2cac85306d8b3e07006e9081f36ce7ebf2d9d0a3
subdir: shelley/chain-and-ledger/executable-spec

source-repository-package
type: git
location: https://github.com/raduom/cardano-ledger-specs
tag: 2cac85306d8b3e07006e9081f36ce7ebf2d9d0a3
subdir: shelley/chain-and-ledger/executable-spec/test
subdir:
byron/chain/executable-spec
byron/ledger/executable-spec
semantics/executable-spec
shelley/chain-and-ledger/dependencies/non-integer
shelley/chain-and-ledger/executable-spec
shelley/chain-and-ledger/executable-spec/test

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

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-base
tag: 5035c9ed95e9d47f050314a7d96b1b2043288f61
subdir: cardano-crypto-class

-- / Node protocols

0 comments on commit 60a9e57

Please sign in to comment.