Skip to content
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.

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

Bump CHaP and remove most constraints from the cabal file #5012

Merged
merged 1 commit into from
Mar 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
109 changes: 16 additions & 93 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ repository cardano-haskell-packages

-- See CONTRIBUTING for information about these, including some Nix commands
-- you need to run if you change them
index-state: 2023-03-06T05:24:58Z
index-state: 2023-03-18T05:24:58Z

index-state:
, hackage.haskell.org 2023-03-06T05:24:58Z
, cardano-haskell-packages 2023-03-21T10:00:52Z
, hackage.haskell.org 2023-03-18T05:24:58Z
, cardano-haskell-packages 2023-03-22T09:20:07Z

packages:
cardano-api
Expand Down Expand Up @@ -82,105 +82,28 @@ tests: True

test-show-details: direct

constraints:
hedgehog >= 1.0
, dependent-sum >= 0.7.1.0
, bimap >= 0.4.0
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moved to cabal file

, libsystemd-journal >= 1.4.4
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moved to cabal file

, systemd >= 2.3.0
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moved to cabal file

-- systemd-2.3.0 requires at least network 3.1.1.0 but it doesn't declare
-- that dependency
, network >= 3.1.1.0
, HSOpenSSL >= 0.11.7.2
, algebraic-graphs >= 0.7
, protolude >= 0.3.2

-- TODO: these should be set in cabal files, but avoiding setting them in lower dependencies for initial CHaP release
, cardano-prelude >= 0.1.0.1
, base-deriving-via >= 0.1.0.0
-- The cardano-binary API changes in 1.6.*.
, cardano-binary == 1.5.*
, cardano-binary-test >= 1.3.0
, cardano-crypto-class >= 2.0.0.1
, cardano-crypto-praos >= 2.0.0.0.1
, cardano-crypto-tests >= 2.0.0.0.1
, cardano-slotting >= 0.1.0.0
, measures >= 0.1.0.0
, orphans-deriving-via >= 0.1.0.0
, cardano-strict-containers >= 0.1.0.1
, plutus-core^>= 1.1
, plutus-ledger-api^>= 1.1
, plutus-tx >= 1.0.0.0
, plutus-tx-plugin >= 1.0.0.0
, prettyprinter-configurable >= 0.1.0.0
, plutus-ghc-stub >= 8.6.5
, word-array^>= 1.1
, io-classes >= 0.2.0.0
, typed-protocols >= 0.1.0.1
, typed-protocols-examples >= 0.1.0.1
, ekg-forward >= 0.2
, cardano-ledger-conway >= 0.1.1.2
, cardano-ledger-conway-test >= 0.1.1.2
, cardano-ledger-shelley >= 0.1.1.2
, cardano-ledger-shelley-test >= 0.1.1.2
, cardano-ledger-alonzo >= 0.1.1.2
, cardano-ledger-alonzo-test >= 0.1.1.2
, cardano-crypto-test >= 1.4.2
, cardano-crypto-wrapper >= 1.4.2
, cardano-ledger-byron-test >= 1.4.2
, cardano-ledger-byron >= 0.1.1.2
, byron-spec-ledger >= 0.1.1.2
, byron-spec-chain >= 0.1.1.2
, cardano-ledger-babbage >= 0.1.1.2
, cardano-ledger-babbage-test >= 0.1.1.2
, cardano-ledger-shelley-ma >= 0.1.1.2
, cardano-ledger-shelley-ma-test >= 0.1.1.2
, cardano-ledger-pretty >= 0.1.1.2
, small-steps-test >= 0.1.1.2
, non-integral >= 0.1.1.2
, cardano-data >= 0.1.1.2
, set-algebra >= 0.1.1.2
, cardano-protocol-tpraos >= 0.1.1.2
, vector-map >= 0.1.1.2
, small-steps >= 0.1.1.2
, cardano-ledger-core >= 0.1.1.2
, cardano-ledger-test >= 0.1.1.2
, ledger-state >= 0.1.1.2
, plutus-preprocessor >= 0.1.1.2
, cardano-ledger-conway >= 0.1.1.2
, cardano-data >= 0.1.1.1
, cardano-ledger-core >= 0.1.1.2
, cardano-ledger-pretty >= 0.1.1.2
, hashable >= 1.4.0.0
, text-short >= 0.1.5
, Unique >= 0.4.7.8
, tree-diff >= 0.2.2

-- Haddock is broken in this release. Waiting for the next release
, http2 < 4.0.0
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

4.1 is released in Hackage with the fix


-- We'll need this once ouroboros has been pushed into CHaP
-- extra-packages:
-- ouroboros-consensus-cardano-tools == 0.1.0.0

package snap-server
flags: +openssl

package comonad
flags: -test-doctests

allow-newer:
ekg:*
-- ekg does not suport aeson 2: https://github.com/tibbe/ekg/issues/90
ekg:aeson
-- ekg does not suport newer snap
, ekg:snap-server
, ekg:snap-core
-- cardano-node-capi depends on aeson > 2.1, even our patched ekg-json only
-- supports between 2 and 2.1
, ekg-json:aeson
, monoidal-containers:aeson
, size-based:template-haskell
, snap-server:attoparsec
, tree-diff:hashable
, Unique:hashable
, ouroboros-network:hashable
, libsystemd-journal:base
-- This is required for 9.2.
-- These are currently required for 9.2.
, enumerator:base
, MonadCatchIO-transformers:base
, katip:Win32
, ekg:base
, ekg:time
, libsystemd-journal:base

-- IMPORTANT
-- Do NOT add more source-repository-package stanzas here unless they are strictly
Expand Down
2 changes: 1 addition & 1 deletion cardano-api/cardano-api.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ library gen
, cardano-crypto-class ^>= 2.0
, cardano-crypto-test ^>= 1.4
, cardano-ledger-alonzo ^>= 0.1
, cardano-ledger-alonzo-test
, cardano-ledger-alonzo-test ^>= 0.1
, cardano-ledger-byron-test ^>= 1.4
, cardano-ledger-core ^>= 0.1
, cardano-ledger-shelley ^>= 0.1
Expand Down
2 changes: 1 addition & 1 deletion cardano-node/cardano-node.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ library
if os(linux) && flag(systemd)
cpp-options: -DSYSTEMD
build-depends: lobemo-scribe-systemd
, systemd
, systemd >= 2.3.0

hs-source-dirs: src

Expand Down
4 changes: 2 additions & 2 deletions cardano-tracer/cardano-tracer.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ library
build-depends: aeson
, async
, async-extras
, bimap
, bimap >= 0.4.0
, blaze-html
, bytestring
, cardano-git-rev
Expand Down Expand Up @@ -162,7 +162,7 @@ library
, yaml

if os(linux)
build-depends: libsystemd-journal
build-depends: libsystemd-journal >= 1.4.4

if os(windows)
build-depends: Win32
Expand Down
12 changes: 6 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.