Skip to content
This repository has been archived by the owner on Dec 2, 2024. It is now read-only.

Commit

Permalink
Merge pull request #578 from input-output-hk/kll/merge-main-into-next…
Browse files Browse the repository at this point in the history 
…-node

Merge #574 and #575 from main into next-node
  • Loading branch information
@koslambrou
koslambrou authored Jul 9, 2022
2 parents 194022c + ed9c483 commit 644d860
Show file tree
Hide file tree
Showing 19 changed files with 923 additions and 403 deletions.
43 changes: 28 additions & 15 deletions doc/plutus-doc.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,34 +76,47 @@ executable doc-doctests
HelloWorldApp
WriteScriptsTo

--------------------
-- Local components
--------------------
build-depends:
, aeson
, base >=4.9 && <5
, bytestring
, containers
, data-default
, flat
, freer-extras >=1.0.0
, lens
, playground-common >=1.0.0
, plutus-chain-index-core >=1.0.0
, plutus-contract >=1.0.0
, plutus-core >=1.0.0
, plutus-ledger >=1.0.0
, plutus-ledger-api >=1.0.0
, plutus-ledger-constraints >=1.0.0
, plutus-script-utils >=1.0.0
, plutus-tx >=1.0.0
, plutus-tx-constraints >=1.0.0
, plutus-use-cases >=1.0.0
, QuickCheck

--------------------------
-- Other IOG dependencies
--------------------------
build-depends:
, plutus-core >=1.0.0
, plutus-ledger-api >=1.0.0
, plutus-tx >=1.0.0
, quickcheck-dynamic

if !(impl(ghcjs) || os(ghcjs))
build-depends: plutus-tx-plugin >=1.0.0

------------------------
-- Non-IOG dependencies
------------------------
build-depends:
, aeson
, base >=4.9 && <5
, bytestring
, containers
, data-default
, flat
, lens
, QuickCheck
, random
, serialise
, tasty
, tasty-quickcheck
, template-haskell >=2.13.0.0
, template-haskell >=2.13.0.0
, text

if !(impl(ghcjs) || os(ghcjs))
build-depends: plutus-tx-plugin >=1.0.0
28 changes: 20 additions & 8 deletions freer-extras/freer-extras.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,22 @@ library
Control.Monad.Freer.Extras.State
Control.Monad.Freer.Extras.Stream

--------------------------
-- Other IOG dependencies
--------------------------
build-depends: iohk-monitoring

------------------------
-- Non-IOG dependencies
------------------------
build-depends:
, aeson
, base >=4.7 && <5
, base >=4.7 && <5
, beam-core
, beam-sqlite
, containers
, data-default
, freer-simple
, iohk-monitoring
, lens
, mtl
, openapi3
Expand All @@ -74,21 +81,26 @@ test-suite freer-extras-test
Control.Monad.Freer.Extras.BeamSpec
Control.Monad.Freer.Extras.PaginationSpec

build-depends:
, hedgehog
, tasty
, tasty-hedgehog
----------------------------
-- Local components
----------------------------
build-depends: freer-extras

------------------------
-- Non-IOG dependencies
------------------------
build-depends:
, base >=4.7 && <5
, base >=4.7 && <5
, beam-core
, beam-migrate
, beam-sqlite
, containers
, contra-tracer
, freer-extras
, freer-simple
, hedgehog
, lens
, resource-pool
, semigroups
, sqlite-simple
, tasty
, tasty-hedgehog
53 changes: 37 additions & 16 deletions playground-common/playground-common.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,31 @@ library
-Wincomplete-record-updates -Wmissing-import-lists
-Wredundant-constraints

--------------------
-- Local components
--------------------
build-depends:
freer-extras >=1.0.0
, plutus-chain-index-core >=1.0.0
, plutus-contract >=1.0.0
, plutus-ledger >=1.0.0
, plutus-ledger-constraints >=1.0.0
, plutus-script-utils >=1.0.0

--------------------------
-- Other IOG dependencies
--------------------------
build-depends:
plutus-ledger-api >=1.0.0
, plutus-tx >=1.0.0

------------------------
-- Non-IOG dependencies
------------------------
build-depends:
aeson
, aeson-casing
, base >=4.7 && <5
, base >=4.7 && <5
, bytestring
, containers
, cookie
Expand All @@ -53,7 +74,6 @@ library
, deriving-compat
, exceptions
, foldl
, freer-extras
, freer-simple
, hashable
, http-client
Expand All @@ -66,20 +86,13 @@ library
, mtl
, newtype-generics
, openapi3
, plutus-chain-index-core >=1.0.0
, plutus-contract >=1.0.0
, plutus-ledger >=1.0.0
, plutus-ledger-api >=1.0.0
, plutus-ledger-constraints >=1.0.0
, plutus-script-utils >=1.0.0
, plutus-tx >=1.0.0
, prettyprinter
, process
, prometheus >=2
, prometheus >=2
, purescript-bridge
, recursion-schemes <5.2
, recursion-schemes <5.2
, row-types
, servant >=0.16
, servant >=0.16
, servant-client
, servant-purescript
, servant-server
Expand Down Expand Up @@ -115,14 +128,22 @@ test-suite playground-common-test
-Wmissing-import-lists -Wredundant-constraints
-fprint-potential-instances -Wunused-packages

--------------------
-- Local components
--------------------
build-depends:
playground-common >=1.0.0
, plutus-contract >=1.0.0
, plutus-ledger >=1.0.0

------------------------
-- Non-IOG dependencies
------------------------
build-depends:
aeson
, base >=4.7 && <5
, base >=4.7 && <5
, bytestring
, freer-simple
, playground-common >=1.0.0
, plutus-contract >=1.0.0
, plutus-ledger >=1.0.0
, recursion-schemes <5.2
, tasty
, tasty-hunit
Expand Down
63 changes: 43 additions & 20 deletions plutus-chain-index-core/plutus-chain-index-core.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,22 +67,43 @@ library
Plutus.Monitoring.Util

hs-source-dirs: src

--------------------
-- Local components
--------------------
build-depends:
, freer-extras >=1.0.0
, plutus-ledger >=1.0.0
, plutus-ledger-api >=1.0.0
, plutus-script-utils >=1.0.0
, plutus-tx >=1.0.0

--------------------------
-- Other IOG dependencies
--------------------------
build-depends:
, cardano-api >=1.35
, cardano-ledger-byron
, io-classes
, iohk-monitoring
, ouroboros-consensus
, ouroboros-consensus-byron
, ouroboros-consensus-cardano
, ouroboros-consensus-shelley
, ouroboros-network
, ouroboros-network-framework
, plutus-ledger-api >=1.0.0
, plutus-tx >=1.0.0
, typed-protocols

------------------------
-- Non-IOG dependencies
------------------------
build-depends:
, aeson
, base >=4.7 && <5
, base >=4.7 && <5
, beam-core
, beam-migrate
, beam-sqlite
, bytestring
, cardano-api >=1.35
, cardano-ledger-byron
, containers
, contra-tracer
, cryptonite
Expand All @@ -91,20 +112,12 @@ library
, fingertree
, freer-simple
, http-types
, io-classes
, iohk-monitoring
, lens
, memory
, mtl
, nothunks
, openapi3
, ouroboros-consensus
, ouroboros-consensus-byron
, ouroboros-consensus-cardano
, ouroboros-consensus-shelley
, ouroboros-network
, ouroboros-network-framework
, prettyprinter >=1.1.0.1
, prettyprinter >=1.1.0.1
, resource-pool
, retry
, semigroups
Expand All @@ -119,7 +132,6 @@ library
, stm
, text
, text-class
, typed-protocols
, unordered-containers
, warp

Expand All @@ -135,12 +147,24 @@ test-suite plutus-chain-index-test
Plutus.ChainIndex.HandlersSpec
Util

--------------------
-- Local components
--------------------
build-depends:
, freer-extras >=1.0.0
, plutus-chain-index-core >=1.0.0
, plutus-ledger >=1.0.0

--------------------------
-- Other IOG dependencies
--------------------------
build-depends:
, plutus-chain-index-core
, plutus-ledger
, plutus-ledger-api >=1.0.0
, plutus-tx >=1.0.0
, plutus-ledger-api >=1.0.0
, plutus-tx >=1.0.0

------------------------
-- Non-IOG dependencies
------------------------
build-depends:
, base >=4.9 && <5
, beam-migrate
Expand All @@ -150,7 +174,6 @@ test-suite plutus-chain-index-test
, contra-tracer
, data-default
, fingertree
, freer-extras
, freer-simple
, hedgehog
, lens
Expand Down
Loading

0 comments on commit 644d860

Please sign in to comment.