Skip to content

Commit

Permalink
Copied changes from #4600
Browse files Browse the repository at this point in the history
  • Loading branch information
@Soupstraw
Soupstraw committed Nov 7, 2022
1 parent ddb8704 commit 3c93946
Show file tree
Hide file tree
Showing 4 changed files with 89 additions and 82 deletions.
165 changes: 86 additions & 79 deletions cabal.project
View file
Original file line number Diff line number Diff line change
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-07-01T00:00:00Z
index-state: cardano-haskell-packages 2022-10-20T00:00:00Z
index-state: 2022-09-27T00:00:00Z
index-state: cardano-haskell-packages 2022-10-31T20:00:00Z

packages:
cardano-api
Expand Down Expand Up @@ -81,30 +81,32 @@ constraints:
-- that dependency
, network >= 3.1.1.0
, HSOpenSSL >= 0.11.7.2

-- CONSTRAINTS FOR UPSTREAM CARDANO PACKAGES
-- These should all be constraints in upstream packages, but are currently missing.
-- We should a) fix these upstream and b) revise the constraints on the released
-- version in CHaP. Unfortunately revisions in CHaP don't work yet, revisit this
-- when we fix it.

-- cardano-prelude: newer protolude changes some signatures in a breaking way, fixed
-- in newer cardano-prelude which we can't use yet
, protolude < 0.3.1
-- cardano-crypto-wrapper: broken by cardano-prelude-0.1.0.1 which moves HeapWords out
, cardano-prelude < 0.1.0.1
-- cardano-ledger-byron: broken by cardano-binary-1.5.0.1 which includes some functions
-- that used to be in cardano-prelude
, cardano-binary < 1.5.0.1
-- ledger: cardano-crypto-class-2.0.0.1 is missing some instances needed by the ledger
, cardano-crypto-class < 2.0.0.1
-- cardano-crypto-tests: we required cardano-crypto-class-2.0.0.0 above, which is broken with
-- newer cardano-crypto-tests
, cardano-crypto-tests < 2.0.0.1
-- plutus-core 1.0.0.1 has the fixed SECP primitives which relies on the newer cardano-crypto-class
, plutus-core < 1.0.0.1
-- plutus-core: needs a constraint here, fixed on plutus master but not in the released version
, 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
, cardano-binary == 1.5.0
, 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
, strict-containers == 0.1.0.0
, 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

package snap-server
flags: +openssl
Expand All @@ -113,7 +115,9 @@ package comonad
flags: -test-doctests

allow-newer:
*:aeson,
ekg:aeson,
ekg-json:aeson,
threepenny-gui:aeson,
monoidal-containers:aeson,
size-based:template-haskell,
snap-server:attoparsec,
Expand All @@ -128,58 +132,61 @@ 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/ouroboros-network
tag: 9128bfcc044fc882decb0cf112545abf9bc2d615
--sha256: 0hdh7xdrvxw943r6qr0xr4kwszindh5mnsn1lww6qdnxnmn7wcsc
subdir:
monoidal-synchronisation
network-mux
ouroboros-consensus
ouroboros-consensus-byron
ouroboros-consensus-cardano
ouroboros-consensus-protocol
ouroboros-consensus-shelley
ouroboros-network
ouroboros-network-framework
ouroboros-network-testing

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/cardano-ledger
tag: 49613f11e034485c8377945c86c0465726c0860c
--sha256: 0i9x66yqkrvx2w79dy6lzlya82yxc8567rgjj828vc2d46d6nvx6
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/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

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-prelude
tag: 533aec85c1ca05c7d171da44b89341fb736ecfe5
--sha256: 0z2y3wzppc12bpn9bl48776ms3nszw8j58xfsdxf97nzjgrmd62g
subdir:
cardano-prelude
cardano-prelude-test
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: a38f898a3740925ccaa0617fa870ca7054a485a6
--sha256: 0hdh7xdrvxw943r6qr0xr4kwszindh5mnsn1lww6qdnxnmn7wcsc
subdir:
monoidal-synchronisation
network-mux
ouroboros-consensus
ouroboros-consensus-byron
ouroboros-consensus-cardano
ouroboros-consensus-protocol
ouroboros-consensus-shelley
ouroboros-network
ouroboros-network-framework
ouroboros-network-testing

-- Notes:
-- ledger 1.1.x + heapword split
-- => protolude > 0.3.2
-- => cardano-prelude > 1.0.0.0
-- => cardano-crypto-class == 2.0.0.1
2 changes: 1 addition & 1 deletion cardano-api/cardano-api.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ library
, cardano-ledger-shelley
, small-steps
, stm
, strict-containers
, cardano-strict-containers
, text
, time
, transformers
Expand Down
2 changes: 1 addition & 1 deletion cardano-api/src/Cardano/Api/Script.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ import Numeric.Natural (Natural)
import Data.Aeson (Value (..), object, (.:), (.=))
import qualified Data.Aeson as Aeson
import qualified Data.Aeson.Types as Aeson
import qualified Data.Sequence.Strict as Seq
import Data.Vector (Vector)
import qualified Data.Vector as Vector

Expand Down Expand Up @@ -168,6 +167,7 @@ import Cardano.Api.SerialiseTextEnvelope
import Cardano.Api.SerialiseUsing
import Cardano.Api.TxIn
import Cardano.Api.Utils (failEitherWith)
import qualified Data.Sequence.Strict as Seq

-- ----------------------------------------------------------------------------
-- Types for script language and version
Expand Down
2 changes: 1 addition & 1 deletion cardano-cli/cardano-cli.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ library
, cardano-ledger-shelley
, set-algebra
, split
, strict-containers
, cardano-strict-containers
, text
, time
, transformers
Expand Down

0 comments on commit 3c93946

Please sign in to comment.