Skip to content

Commit

Permalink
Update cabal.project
Browse files Browse the repository at this point in the history
- drop ledger s-r-p in favour of CHaP release
- bump network
- bump hackage.nix
- bump haskell.nix
- bump CHaP
- bump index-state
- ci fixes
- relaxed typed-protocols and io-classes a little
- constrain ekg-forward >= 0.2
  • Loading branch information
angerman authored and Soupstraw committed Nov 29, 2022
1 parent 6069a88 commit 21de293
Show file tree
Hide file tree
Showing 5 changed files with 768 additions and 332 deletions.
88 changes: 39 additions & 49 deletions cabal.project
Expand Up @@ -12,8 +12,8 @@ repository cardano-haskell-packages

-- See CONTRIBUTING for information about these, including some Nix commands
-- you need to run if you change them
index-state: 2022-09-27T00:00:00Z
index-state: cardano-haskell-packages 2022-10-31T20:00:00Z
index-state: 2022-11-11T00:00:00Z
index-state: cardano-haskell-packages 2022-11-12T20:00:00Z

packages:
cardano-api
Expand Down Expand Up @@ -95,18 +95,47 @@ constraints:
, cardano-slotting == 0.1.0.0
, measures == 0.1.0.0
, orphans-deriving-via == 0.1.0.0
, strict-containers == 0.1.0.0
, cardano-strict-containers == 0.1.0.1
, plutus-core == 1.0.0.1
, plutus-ledger-api == 1.0.0.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 == 0.1.0.0
, word-array == 0.1.0.0
, io-classes == 0.2.0.0
, typed-protocols == 0.1.0.0
, typed-protocols-examples == 0.1.0.0
, 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-alonzo == 0.1.1.1
, cardano-ledger-alonzo-test == 0.1.1.1
, cardano-ledger-babbage == 0.1.1.1
, cardano-ledger-babbage-test == 0.1.1.1
, byron-spec-chain == 0.1.1.1
, cardano-crypto-wrapper == 1.4.1
, cardano-crypto-test == 1.4.1
, byron-spec-ledger == 0.1.1.1
, cardano-ledger-byron == 0.1.1.1
, cardano-ledger-byron-test == 1.4.1
, cardano-ledger-conway == 0.1.1.1
, cardano-ledger-shelley-ma == 0.1.1.1
, cardano-ledger-shelley-ma-test == 0.1.1.1
, cardano-ledger-shelley == 0.1.1.1
, cardano-ledger-shelley-test == 0.1.1.1
, cardano-data == 0.1.1.1
, cardano-ledger-core == 0.1.1.1
, cardano-ledger-pretty == 0.1.1.1
, cardano-protocol-tpraos == 0.1.1.1
, non-integral == 0.1.1.1
, set-algebra == 0.1.1.1
, small-steps == 0.1.1.1
, small-steps-test == 0.1.1.1
, vector-map == 0.1.1.1

-- 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
Expand All @@ -132,47 +161,12 @@ source-repository-package
tag: 4ec92ded05ccf59ba4a874be4b404ac1b6d666b6
--sha256: 00fvvaf4ir4hskq4a6gggbh2wmdvy8j8kn6s4m1p1vlh8m8mq514

-- This is https://github.com/input-output-hk/cardano-ledger/pull/3080
-- which is release/1.1.x + heapword split compatibility.
source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger
tag: cb29b038a5e8ae5a91f3e6fbc34b474c27cc1d87
--sha256: 0gxb9xghsacr0qaljhq3qzvmb2f1wwmly89prwqy4fdm9mvqiq95
subdir:
eras/alonzo/impl
eras/alonzo/test-suite
eras/babbage/impl
eras/babbage/test-suite
eras/byron/chain/executable-spec
eras/byron/crypto
eras/byron/crypto/test
eras/byron/ledger/executable-spec
eras/byron/ledger/impl
eras/byron/ledger/impl/test
eras/conway/impl
eras/shelley/impl
eras/shelley/test-suite
eras/shelley-ma/impl
eras/shelley-ma/test-suite
libs/cardano-ledger-core
libs/cardano-ledger-pretty
libs/cardano-protocol-tpraos
libs/cardano-data
libs/vector-map
libs/set-algebra
libs/small-steps
libs/small-steps-test
libs/non-integral

-- 774f3e445e4cadf78d38a2b9d20b620d3b576835 is c764553561bed8978d2c6753d1608dc65449617a+44
-- a38f898a3740925ccaa0617fa870ca7054a485a6 is 774f3e445e4cadf78d38a2b9d20b620d3b576835+1 (strict-containers -> cardano-strict-containers)
-- And has the adjustments for the ledger refactor
source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: a38f898a3740925ccaa0617fa870ca7054a485a6
--sha256: 0hdh7xdrvxw943r6qr0xr4kwszindh5mnsn1lww6qdnxnmn7wcsc
tag: a6cc54677ad967af24da91e563c360407d41314e
--sha256: 0p3xcvqa4vr7aqxx2ds32qha9n28sliixamsp7jp5c9igd1x25h7
subdir:
monoidal-synchronisation
network-mux
Expand All @@ -184,9 +178,5 @@ source-repository-package
ouroboros-network
ouroboros-network-framework
ouroboros-network-testing
ouroboros-consensus-cardano-tools

-- Notes:
-- ledger 1.1.x + heapword split
-- => protolude > 0.3.2
-- => cardano-prelude > 1.0.0.0
-- => cardano-crypto-class == 2.0.0.1
1 change: 0 additions & 1 deletion cardano-api/src/Cardano/Api/Fees.hs
Expand Up @@ -7,7 +7,6 @@
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE StandaloneDeriving #-}
{-# LANGUAGE TypeApplications #-}

{-# OPTIONS_GHC -Wno-unticked-promoted-constructors #-}
{-# LANGUAGE AllowAmbiguousTypes #-}
Expand Down

0 comments on commit 21de293

Please sign in to comment.