From 787872be995ccfd8e5905fed5f1e37b069da1a0d Mon Sep 17 00:00:00 2001 From: Jamie Bertram Date: Sun, 10 Sep 2023 12:17:19 -0600 Subject: [PATCH] Update GHC and dependency constraints --- cabal.project | 59 +------- .../hasql-dynamic-syntax.cabal | 2 +- libs/base16-aeson/base16-aeson.cabal | 2 +- .../plutus-ledger-ada/plutus-ledger-ada.cabal | 6 +- .../plutus-ledger-aeson.cabal | 17 +-- .../plutus-ledger-slot.cabal | 6 +- marlowe-actus/marlowe-actus.cabal | 2 +- marlowe-apps/marlowe-apps.cabal | 14 +- marlowe-chain-sync/marlowe-chain-sync.cabal | 76 +++++----- marlowe-cli/marlowe-cli.cabal | 15 +- marlowe-client/marlowe-client.cabal | 2 +- marlowe-contracts/marlowe-contracts.cabal | 4 +- .../marlowe-integration-tests.cabal | 2 +- marlowe-integration/marlowe-integration.cabal | 4 +- marlowe-object/marlowe-object.cabal | 10 +- marlowe-plutus/marlowe-plutus.cabal | 6 +- marlowe-protocols/marlowe-protocols.cabal | 4 +- marlowe-runtime-cli/marlowe-runtime-cli.cabal | 2 +- marlowe-runtime-web/marlowe-runtime-web.cabal | 24 ++-- marlowe-runtime/marlowe-runtime.cabal | 132 +++++++++--------- marlowe-test/marlowe-test.cabal | 16 +-- marlowe/marlowe-cardano.cabal | 8 +- nix/haskell.nix | 2 +- 23 files changed, 180 insertions(+), 235 deletions(-) diff --git a/cabal.project b/cabal.project index d65d149c82..6591eba5fc 100644 --- a/cabal.project +++ b/cabal.project @@ -169,12 +169,6 @@ package freer-extras -- marlowe-cli only -source-repository-package - type: git - location: https://github.com/input-output-hk/cardano-config - tag: 1646e9167fab36c0bff82317743b96efa2d3adaa - --sha256: 11kf65x38laqhwspsl28j2x5a4rky8mfr6356w0li5g53sfykmjc - -- When updated to 3.12.0 or newer, remove the cabal-generator override in nix/pkgs/haskell/haskell.nix source-repository-package type: git @@ -186,58 +180,13 @@ source-repository-package -- These constraints needed for plutus-apps constraints: - -- cardano-prelude-0.1.0.0 needs - protolude <0.3.1, - - -- cardano-ledger-byron-0.1.0.0 needs - cardano-binary <1.5.0.1, - - -- plutus-core-1.0.0.1 needs - cardano-crypto-class >2.0.0.0, - algebraic-graphs <0.7, - - -- cardano-ledger-core-0.1.0.0 needs - cardano-crypto-class <2.0.0.1, - - -- cardano-crypto-class-2.0.0.0.1 needs - cardano-prelude <0.1.0.1, - - -- ouroboros-consensus-shelley-0.1.0.1 needs - ouroboros-consensus-protocol==0.1.0.1, - - -- the only cardano-crypto-wrapper that works in this context - -- (cardano-crypto-wrapper-1.4.2 needs cardano-prelude >0.1.0.1) - cardano-crypto-wrapper==1.3.0, - - -- cardano-ledger-conway-0.1.1.2 fails without this (despite it's not a - -- direct dependency, likely it leaks through some ouroboros-consensus packages) - cardano-protocol-tpraos ==0.1.0.0, - - -- cardano-ledger-shelley-0.1.0.0 needs - cardano-data ==0.1.0.0, - vector-map ==0.1.0.0, - - -- cardano-api:gen 1.35.4 needs some version - -- of these packages, and the newer versions - -- don't build with the constraint set here. - -- - -- This is strictly speaking not a plutus-apps - -- requirement (gen is needed in marlowe), but - -- it's a consequence of the other plutus-apps - -- constraints. - byron-spec-ledger == 0.1.0.0, - byron-spec-chain == 0.1.0.0, - cardano-ledger-byron-test == 1.3.0, - ouroboros-consensus == 0.1.0.1, - -- This has nothing to do with plutus-apps, except that - -- the plutus-apps constraints are the most probable reason - -- why newer versions break - typed-protocols == 0.1.0.0, - -- 0.3.6.2 switched from cryptonite to crypton, and this causes linker -- failures when other packages depend on cryptonite. -- Can be removed when this is resolved: https://github.com/snoyberg/http-client/issues/508 - http-client-tls < 0.3.6.2 + http-client-tls < 0.3.6.2, + ouroboros-network ^>=0.8, + ouroboros-network-framework ^>=0.7, + text ^>=2.0 source-repository-package diff --git a/hasql-dynamic-syntax/hasql-dynamic-syntax.cabal b/hasql-dynamic-syntax/hasql-dynamic-syntax.cabal index dbf523b9a7..040d0e30f0 100644 --- a/hasql-dynamic-syntax/hasql-dynamic-syntax.cabal +++ b/hasql-dynamic-syntax/hasql-dynamic-syntax.cabal @@ -67,7 +67,7 @@ library , network-ip , postgresql-syntax ^>=0.4.1 , scientific ^>=0.3.7 - , text >=1.2.4 && <2 + , text ^>=2.0 , time >=1.9 && <2 , transformers ^>=0.5.6 , uuid >=1.3 && <2 diff --git a/libs/base16-aeson/base16-aeson.cabal b/libs/base16-aeson/base16-aeson.cabal index 164feead70..c0c59a550a 100644 --- a/libs/base16-aeson/base16-aeson.cabal +++ b/libs/base16-aeson/base16-aeson.cabal @@ -9,7 +9,7 @@ library , base >=4.9 && <5 , base16 ^>=0.3.2 , bytestring >=0.10.12 && <0.12 - , text >=1.2.4 && <2 + , text ^>=2.0 hs-source-dirs: src default-language: Haskell2010 diff --git a/libs/plutus-ledger-ada/plutus-ledger-ada.cabal b/libs/plutus-ledger-ada/plutus-ledger-ada.cabal index 6387b793c8..7a638e5368 100644 --- a/libs/plutus-ledger-ada/plutus-ledger-ada.cabal +++ b/libs/plutus-ledger-ada/plutus-ledger-ada.cabal @@ -46,9 +46,9 @@ library -- Other IOG dependencies -------------------------- build-depends: - , plutus-core >=1.0.0 - , plutus-ledger-api >=1.0.0 - , plutus-tx >=1.0.0 + , plutus-core ^>=1.7 + , plutus-ledger-api ^>=1.7 + , plutus-tx ^>=1.7 ------------------------ -- Non-IOG dependencies diff --git a/libs/plutus-ledger-aeson/plutus-ledger-aeson.cabal b/libs/plutus-ledger-aeson/plutus-ledger-aeson.cabal index ec199766b8..0c7abd4377 100644 --- a/libs/plutus-ledger-aeson/plutus-ledger-aeson.cabal +++ b/libs/plutus-ledger-aeson/plutus-ledger-aeson.cabal @@ -28,9 +28,9 @@ flag defer-plugin-errors manual: True library - import: lang - hs-source-dirs: src - default-language: Haskell2010 + import: lang + hs-source-dirs: src + default-language: Haskell2010 exposed-modules: Plutus.V1.Ledger.Aeson PlutusCore.Data.Aeson @@ -40,9 +40,9 @@ library -- Other IOG dependencies -------------------------- build-depends: - , plutus-core >=1.0.0 - , plutus-ledger-api >=1.0.0 - , plutus-tx >=1.0.0 + , plutus-core ^>=1.7 + , plutus-ledger-api ^>=1.7 + , plutus-tx ^>=1.7 ------------------------ -- Non-IOG dependencies @@ -62,10 +62,7 @@ library , tagged , text - ghc-options: -fprint-potential-instances - reexported-modules: - Plutus.V1.Ledger.Time as Ledger.Time, - Plutus.V1.Ledger.Value as Ledger.Value, + ghc-options: -fprint-potential-instances if flag(defer-plugin-errors) ghc-options: -fplugin-opt PlutusTx.Plugin:defer-errors diff --git a/libs/plutus-ledger-slot/plutus-ledger-slot.cabal b/libs/plutus-ledger-slot/plutus-ledger-slot.cabal index c2d7b43bc0..d93dc3c4e4 100644 --- a/libs/plutus-ledger-slot/plutus-ledger-slot.cabal +++ b/libs/plutus-ledger-slot/plutus-ledger-slot.cabal @@ -48,9 +48,9 @@ library -- Other IOG dependencies -------------------------- build-depends: - , plutus-core >=1.0.0 - , plutus-ledger-api >=1.0.0 - , plutus-tx >=1.0.0 + , plutus-core ^>=1.7 + , plutus-ledger-api ^>=1.7 + , plutus-tx ^>=1.7 -- We don't need plutus ledger here but -- we have orphans collision. diff --git a/marlowe-actus/marlowe-actus.cabal b/marlowe-actus/marlowe-actus.cabal index f990ec0c31..fcab25161c 100644 --- a/marlowe-actus/marlowe-actus.cabal +++ b/marlowe-actus/marlowe-actus.cabal @@ -37,7 +37,7 @@ library , base , marlowe-cardano , mtl - , plutus-ledger-api + , plutus-ledger-api ^>=1.7 , plutus-tx , time , validation diff --git a/marlowe-apps/marlowe-apps.cabal b/marlowe-apps/marlowe-apps.cabal index 61ec955fda..d9ce2422bb 100644 --- a/marlowe-apps/marlowe-apps.cabal +++ b/marlowe-apps/marlowe-apps.cabal @@ -30,7 +30,7 @@ library , async , base >=4.9 && <5 , bytestring - , cardano-api + , cardano-api ^>=8.8 , containers , data-default , eventuo11y >=0.9 && <0.11 @@ -89,7 +89,7 @@ executable marlowe-scaling build-depends: , async , base >=4.9 && <5 - , cardano-api + , cardano-api ^>=8.8 , eventuo11y >=0.9 && <0.11 , eventuo11y-dsl ^>=0.2 , eventuo11y-json ^>=0.3 @@ -99,7 +99,7 @@ executable marlowe-scaling , marlowe-runtime , mtl , optparse-applicative - , plutus-ledger-api + , plutus-ledger-api ^>=1.7 , random , text , time @@ -128,7 +128,7 @@ executable marlowe-oracle , base >=4.9 && <5 , base16-aeson , bytestring - , cardano-api + , cardano-api ^>=8.8 , eventuo11y >=0.9 && <0.11 , eventuo11y-dsl ^>=0.2 , eventuo11y-json ^>=0.3 @@ -140,7 +140,7 @@ executable marlowe-oracle , marlowe-runtime , mtl , optparse-applicative - , plutus-ledger-api + , plutus-ledger-api ^>=1.7 , process , servant , servant-client @@ -181,7 +181,7 @@ executable signing-service build-depends: , aeson , base >=4.9 && <5 - , cardano-api + , cardano-api ^>=8.8 , marlowe-apps , marlowe-chain-sync , servant-server @@ -211,7 +211,7 @@ executable marlowe-streamer , marlowe-chain-sync , marlowe-runtime:{marlowe-runtime, history-api} , optparse-applicative - , plutus-ledger-api + , plutus-ledger-api ^>=1.7 , plutus-tx , text , time-units diff --git a/marlowe-chain-sync/marlowe-chain-sync.cabal b/marlowe-chain-sync/marlowe-chain-sync.cabal index 75509b48e5..d29c5e8dca 100644 --- a/marlowe-chain-sync/marlowe-chain-sync.cabal +++ b/marlowe-chain-sync/marlowe-chain-sync.cabal @@ -66,18 +66,18 @@ library , base16 ^>=0.3.2 , binary ^>=0.8.8 , bytestring >=0.10.12 && <0.12 - , cardano-api ==1.35.4 - , cardano-ledger-core ==0.1.0.0 + , cardano-api ^>=8.8 + , cardano-ledger-core ^>=1.4 , containers ^>=0.6.5 , hashable >=1.3 && <2 , marlowe-protocols ==0.2.0.0 , nonempty-containers ^>=0.3.4 - , ouroboros-consensus ==0.1.0.1 - , ouroboros-network ==0.1.0.1 - , plutus-ledger-api ==1.0.0.1 - , plutus-tx ==1.0.0.0 + , ouroboros-consensus ^>=0.9 + , ouroboros-network ^>=0.8 + , plutus-ledger-api ^>=1.7 + , plutus-tx ^>=1.7 , serialise ^>=0.2.6 - , text >=1.2.4 && <2 + , text ^>=2.0 , these >=1.1 && <2 , time >=1.9 && <2 , vector ^>=0.12.3 @@ -100,8 +100,8 @@ library libchainsync , async-components ==0.1.1.0 , base >=4.9 && <5 , bytestring >=0.10.12 && <0.12 - , cardano-api ==1.35.4 - , cardano-binary ==1.5.0 + , cardano-api ^>=8.8 + , cardano-binary , co-log >=0.5.0.0 && <0.6.0.0 , containers ^>=0.6.5 , eventuo11y >=0.9 && <0.11 @@ -116,9 +116,9 @@ library libchainsync , marlowe-chain-sync ==0.0.4 , marlowe-protocols ==0.2.0.0 , nonempty-containers ^>=0.3.4 - , ouroboros-network ==0.1.0.1 + , ouroboros-network ^>=0.8 , stm ^>=2.5 - , text >=1.2.4 && <2 + , text ^>=2.0 , transformers ^>=0.5.6 , unliftio ^>=0.2.1 , vector ^>=0.12.3 @@ -141,14 +141,14 @@ library chain-indexer , base >=4.9 && <5 , base16 ^>=0.3.2 , bytestring >=0.10.12 && <0.12 - , cardano-api ==1.35.4 - , cardano-binary ==1.5.0 - , cardano-crypto-wrapper ==1.3.0 - , cardano-ledger-alonzo ==0.1.0.0 - , cardano-ledger-babbage ==0.1.0.0 - , cardano-ledger-byron ==0.1.0.0 - , cardano-ledger-core ==0.1.0.0 - , cardano-ledger-shelley ==0.1.0.0 + , cardano-api ^>=8.8 + , cardano-binary + , cardano-crypto-wrapper ^>=1.5 + , cardano-ledger-alonzo ==1.3.1.1 + , cardano-ledger-babbage ==1.4.0.1 + , cardano-ledger-byron ==1.0.0.2 + , cardano-ledger-core ^>=1.4 + , cardano-ledger-shelley ==1.4.1.0 , co-log >=0.5.0.0 && <0.6.0.0 , containers ^>=0.6.5 , eventuo11y >=0.9 && <0.11 @@ -159,14 +159,14 @@ library chain-indexer , hasql-th ^>=0.4 , hasql-transaction ^>=1 , hs-opentelemetry-api >=0.0.3 && <0.0.4 - , ouroboros-network ==0.1.0.1 + , ouroboros-network ^>=0.8 , profunctors >=5.6 && <6 , stm ^>=2.5 , stm-delay ^>=0.1.1 - , text >=1.2.4 && <2 + , text ^>=2.0 , time >=1.9 && <2 , transformers ^>=0.5.6 - , typed-protocols ==0.1.0.0 + , typed-protocols ^>=0.1 , unliftio ^>=0.2.1 , vector ^>=0.12.3 , witherable ^>=0.4 @@ -180,12 +180,12 @@ library plutus-compat build-depends: , base >=4.9 && <5 , bytestring >=0.10.12 && <0.12 - , cardano-api ==1.35.4 - , cardano-ledger-byron ==0.1.0.0 + , cardano-api ^>=8.8 + , cardano-ledger-byron ==1.0.0.2 , containers ^>=0.6.5 , marlowe-chain-sync ==0.0.4 - , plutus-ledger-api ==1.0.0.1 - , plutus-tx ==1.0.0.0 + , plutus-ledger-api ^>=1.7 + , plutus-tx ^>=1.7 , serialise ^>=0.2.6 library gen @@ -197,14 +197,14 @@ library gen build-depends: , base >=4.9 && <5 , bytestring >=0.10.12 && <0.12 - , cardano-api:{cardano-api, gen} ==1.35.4 + , cardano-api:{cardano-api, gen} ^>=8.8 , hedgehog-quickcheck ^>=0.1 , marlowe-chain-sync ==0.0.4 , marlowe-protocols ==0.2.0.0 , nonempty-containers ^>=0.3.4 - , ouroboros-consensus ==0.1.0.1 + , ouroboros-consensus ^>=0.9 , QuickCheck >=2.14 && <3 - , text >=1.2.4 && <2 + , text ^>=2.0 , time >=1.9 && <2 test-suite marlowe-chain-sync-test @@ -241,9 +241,9 @@ executable marlowe-chain-indexer , async-components ==0.1.1.0 , base >=4.9 && <5 , bytestring >=0.10.12 && <0.12 - , cardano-api ==1.35.4 - , cardano-crypto-wrapper ==1.3.0 - , cardano-ledger-byron ==0.1.0.0 + , cardano-api ^>=8.8 + , cardano-crypto-wrapper ^>=1.5 + , cardano-ledger-byron ==1.0.0.2 , eventuo11y >=0.9 && <0.11 , eventuo11y-extras ==0.1.1.0 , eventuo11y-otel ^>=0.1 @@ -254,9 +254,9 @@ executable marlowe-chain-indexer , marlowe-chain-sync:chain-indexer , mtl >=2.2 && <3 , optparse-applicative - , ouroboros-network ==0.1.0.1 + , ouroboros-network ^>=0.8 , postgresql-libpq ^>=0.9 - , text >=1.2.4 && <2 + , text ^>=2.0 , time >=1.9 && <2 , transformers ^>=0.5.6 , unliftio ^>=0.2.1 @@ -276,8 +276,8 @@ executable marlowe-chain-sync , async-components ==0.1.1.0 , base >=4.9 && <5 , bytestring >=0.10.12 && <0.12 - , cardano-api ==1.35.4 - , cardano-ledger-byron ==0.1.0.0 + , cardano-api ^>=8.8 + , cardano-ledger-byron ==1.0.0.2 , eventuo11y >=0.9 && <0.11 , eventuo11y-extras ==0.1.1.0 , eventuo11y-otel ^>=0.1 @@ -290,7 +290,7 @@ executable marlowe-chain-sync , mtl >=2.2 && <3 , network >=3.1 && <4 , optparse-applicative - , ouroboros-network ==0.1.0.1 + , ouroboros-network ^>=0.8 , postgresql-libpq ^>=0.9 - , text >=1.2.4 && <2 + , text ^>=2.0 , unliftio ^>=0.2.1 diff --git a/marlowe-cli/marlowe-cli.cabal b/marlowe-cli/marlowe-cli.cabal index 9be9b9e000..6fa4ad089a 100644 --- a/marlowe-cli/marlowe-cli.cabal +++ b/marlowe-cli/marlowe-cli.cabal @@ -94,10 +94,10 @@ library , base16-bytestring , bech32 , bytestring - , cardano-api + , cardano-api ^>=8.8 , cardano-crypto-class , cardano-ledger-alonzo - , cardano-ledger-byron ==0.1.0.0 + , cardano-ledger-byron ==1.0.0.2 , cardano-ledger-core , cardano-ledger-shelley , cardano-slotting @@ -118,7 +118,7 @@ library , parser-combinators , plutus-core , plutus-ledger-ada - , plutus-ledger-api + , plutus-ledger-api ^>=1.7 , plutus-ledger-slot , plutus-tx , prettyprinter @@ -181,7 +181,7 @@ library cli-test , base >=4.9 && <5 , base16-aeson ==0.1.0.0 , bytestring - , cardano-api + , cardano-api ^>=8.8 , containers , data-default , data-has @@ -205,7 +205,7 @@ library cli-test , one-line-aeson-text , plutus-core , plutus-ledger-ada - , plutus-ledger-api + , plutus-ledger-api ^>=1.7 , plutus-ledger-slot , plutus-tx , random @@ -253,7 +253,7 @@ library command , optparse-applicative , ouroboros-network , plutus-ledger-ada - , plutus-ledger-api + , plutus-ledger-api ^>=1.7 , plutus-ledger-slot , plutus-tx , regex-posix @@ -271,7 +271,6 @@ executable marlowe-cli autogen-modules: Paths_marlowe_cli build-depends: , base >=4.9 && <5 - , cardano-config , marlowe-cli:command , text @@ -296,7 +295,7 @@ test-suite marlowe-cli-test , marlowe-test , megaparsec , mtl - , plutus-ledger-api + , plutus-ledger-api ^>=1.7 , plutus-ledger-slot , plutus-tx , tasty diff --git a/marlowe-client/marlowe-client.cabal b/marlowe-client/marlowe-client.cabal index d54bc8b225..d68effc57b 100644 --- a/marlowe-client/marlowe-client.cabal +++ b/marlowe-client/marlowe-client.cabal @@ -55,7 +55,7 @@ library build-depends: , base >=4.9 && <5 - , cardano-api ==1.35.4 + , cardano-api ^>=8.8 , containers ^>=0.6.5 , eventuo11y >=0.9 && <0.11 , eventuo11y-extras ==0.1.1.0 diff --git a/marlowe-contracts/marlowe-contracts.cabal b/marlowe-contracts/marlowe-contracts.cabal index 3530e19f14..8957ccae02 100644 --- a/marlowe-contracts/marlowe-contracts.cabal +++ b/marlowe-contracts/marlowe-contracts.cabal @@ -78,8 +78,8 @@ library , ilist , marlowe-cardano , marlowe-object - , plutus-ledger-api ==1.0.0.1 - , plutus-tx ==1.0.0.0 + , plutus-ledger-api ^>=1.7 + , plutus-tx ^>=1.7 , split , text , time diff --git a/marlowe-integration-tests/marlowe-integration-tests.cabal b/marlowe-integration-tests/marlowe-integration-tests.cabal index 02e39399f6..adc4ab732b 100644 --- a/marlowe-integration-tests/marlowe-integration-tests.cabal +++ b/marlowe-integration-tests/marlowe-integration-tests.cabal @@ -93,7 +93,7 @@ executable marlowe-integration-tests , base >=4.9 && <5 , base16 , bytestring - , cardano-api + , cardano-api ^>=8.8 , co-log >=0.5.0.0 && <0.6.0.0 , containers , deepseq diff --git a/marlowe-integration/marlowe-integration.cabal b/marlowe-integration/marlowe-integration.cabal index a1302a33ea..2402a7e481 100644 --- a/marlowe-integration/marlowe-integration.cabal +++ b/marlowe-integration/marlowe-integration.cabal @@ -57,7 +57,7 @@ library , async-components , base >=4.9 && <5 , bytestring - , cardano-api + , cardano-api ^>=8.8 , cardano-crypto-wrapper , cardano-integration , cardano-ledger-byron @@ -124,7 +124,7 @@ executable marlowe-integration-example build-depends: , aeson , base >=4.9 && <5 - , cardano-api + , cardano-api ^>=8.8 , marlowe-cardano , marlowe-chain-sync , marlowe-integration diff --git a/marlowe-object/marlowe-object.cabal b/marlowe-object/marlowe-object.cabal index 52e50e77b8..d190672b87 100644 --- a/marlowe-object/marlowe-object.cabal +++ b/marlowe-object/marlowe-object.cabal @@ -63,8 +63,8 @@ library , base16 ^>=0.3.2 , binary ^>=0.8.8 , bytestring >=0.10.12 && <0.12 - , cardano-api ==1.35.4 - , cardano-ledger-core ==0.1.0.0 + , cardano-api ^>=8.8 + , cardano-ledger-core ^>=1.4 , dlist ^>=1.0 , filepath ^>=1.4 , hashable >=1.3 && <2 @@ -73,8 +73,8 @@ library , marlowe-protocols ==0.2.0.0 , mtl >=2.2 && <3 , pipes ^>=4.3.16 - , plutus-ledger-api ==1.0.0.1 - , text >=1.2.4 && <2 + , plutus-ledger-api ^>=1.7 + , text ^>=2.0 , time >=1.9 && <2 , transformers ^>=0.5.6 , unliftio ^>=0.2.1 @@ -88,7 +88,7 @@ library gen build-depends: , base >=4.9 && <5 , bytestring >=0.10.12 && <0.12 - , cardano-api:gen ==1.35.4 + , cardano-api:gen ^>=8.8 , hedgehog-quickcheck ^>=0.1 , lens >=5.2 && <6 , marlowe-object ==0.1.0.0 diff --git a/marlowe-plutus/marlowe-plutus.cabal b/marlowe-plutus/marlowe-plutus.cabal index 02d3049882..04a9070774 100644 --- a/marlowe-plutus/marlowe-plutus.cabal +++ b/marlowe-plutus/marlowe-plutus.cabal @@ -66,9 +66,9 @@ library , lens , marlowe-cardano ==0.1.2.0 , plutus-core - , plutus-ledger-api ==1.0.0.1 - , plutus-tx ==1.0.0.0 - , plutus-tx-plugin ==1.0.0.0 + , plutus-ledger-api ^>=1.7 + , plutus-tx ^>=1.7 + , plutus-tx-plugin ^>=1.7 , serialise ^>=0.2.6 exposed-modules: Language.Marlowe.Scripts diff --git a/marlowe-protocols/marlowe-protocols.cabal b/marlowe-protocols/marlowe-protocols.cabal index da0a58462c..f93cf7d623 100644 --- a/marlowe-protocols/marlowe-protocols.cabal +++ b/marlowe-protocols/marlowe-protocols.cabal @@ -92,8 +92,8 @@ library , QuickCheck >=2.14 && <3 , resourcet >=1.3 && <2 , stm ^>=2.5 - , text >=1.2.4 && <2 + , text ^>=2.0 , time >=1.9 && <2 , transformers ^>=0.5.6 - , typed-protocols ==0.1.0.0 + , typed-protocols ^>=0.1 , unliftio ^>=0.2.1 diff --git a/marlowe-runtime-cli/marlowe-runtime-cli.cabal b/marlowe-runtime-cli/marlowe-runtime-cli.cabal index 1c3a5d9390..33b2f52b19 100644 --- a/marlowe-runtime-cli/marlowe-runtime-cli.cabal +++ b/marlowe-runtime-cli/marlowe-runtime-cli.cabal @@ -75,7 +75,7 @@ executable marlowe-runtime-cli , base >=4.9 && <5 , base16 , bytestring - , cardano-api + , cardano-api ^>=8.8 , containers , errors , marlowe-cardano diff --git a/marlowe-runtime-web/marlowe-runtime-web.cabal b/marlowe-runtime-web/marlowe-runtime-web.cabal index 62af98948d..0ecb1db3cc 100644 --- a/marlowe-runtime-web/marlowe-runtime-web.cabal +++ b/marlowe-runtime-web/marlowe-runtime-web.cabal @@ -76,7 +76,7 @@ library , openapi3 >=3.2 && <4 , parsec ^>=3.1.14 , pipes ^>=4.3.16 - , plutus-ledger-api ==1.0.0.1 + , plutus-ledger-api ^>=1.7 , servant ^>=0.19 , servant-client ^>=0.19 , servant-client-core ^>=0.19 @@ -84,7 +84,7 @@ library , servant-pagination >=2.5 && <3 , servant-pipes ^>=0.15.3 , servant-server ^>=0.19 - , text >=1.2.4 && <2 + , text ^>=2.0 , time >=1.9 && <2 , wai >=3.2 && <4 @@ -118,11 +118,11 @@ library server , async-components ==0.1.1.0 , base >=4.9 && <5 , bytestring >=0.10.12 && <0.12 - , cardano-api ==1.35.4 - , cardano-binary ==1.5.0 - , cardano-ledger-alonzo ==0.1.0.0 - , cardano-ledger-core ==0.1.0.0 - , cardano-ledger-shelley ==0.1.0.0 + , cardano-api ^>=8.8 + , cardano-binary + , cardano-ledger-alonzo ==1.3.1.1 + , cardano-ledger-core ^>=1.4 + , cardano-ledger-shelley ==1.4.1.0 , co-log >=0.5.0.0 && <0.6.0.0 , containers ^>=0.6.5 , errors >=2.3 && <3 @@ -142,7 +142,7 @@ library server , mtl >=2.2 && <3 , openapi3 >=3.2 && <4 , pipes ^>=4.3.16 - , plutus-ledger-api ==1.0.0.1 + , plutus-ledger-api ^>=1.7 , servant ^>=0.19 , servant-openapi3 ^>=2.0 , servant-pagination >=2.5 && <3 @@ -151,7 +151,7 @@ library server , stm ^>=2.5 , stm-delay ^>=0.1.1 , string-conversions ^>=0.4 - , text >=1.2.4 && <2 + , text ^>=2.0 , time >=1.9 && <2 , transformers ^>=0.5.6 , transformers-base ^>=0.4 @@ -184,7 +184,7 @@ executable marlowe-web-server , mtl >=2.2 && <3 , network , optparse-applicative - , text >=1.2.4 && <2 + , text ^>=2.0 , unliftio ^>=0.2.1 , wai >=3.2 && <4 , warp @@ -206,13 +206,13 @@ test-suite marlowe-runtime-web-test , marlowe-object:gen , marlowe-runtime-web , marlowe-test - , network-arbitrary , openapi3 >=3.2 && <4 , QuickCheck , quickcheck-instances , regex-posix , servant , servant-openapi3 - , text >=1.2.4 && <2 + , text ^>=2.0 + -- , network-arbitrary ghc-options: -threaded diff --git a/marlowe-runtime/marlowe-runtime.cabal b/marlowe-runtime/marlowe-runtime.cabal index f2dec25457..09a2233273 100644 --- a/marlowe-runtime/marlowe-runtime.cabal +++ b/marlowe-runtime/marlowe-runtime.cabal @@ -83,15 +83,15 @@ library , base16 ^>=0.3.2 , binary ^>=0.8.8 , bytestring >=0.10.12 && <0.12 - , cardano-api ==1.35.4 + , cardano-api ^>=8.8 , containers ^>=0.6.5 , marlowe-cardano ==0.1.2.0 , marlowe-chain-sync ==0.0.4 , marlowe-protocols ==0.2.0.0 - , ouroboros-network ==0.1.0.1 - , plutus-ledger-api ==1.0.0.1 - , plutus-tx ==1.0.0.0 - , text >=1.2.4 && <2 + , ouroboros-network ^>=0.8 + , plutus-ledger-api ^>=1.7 + , plutus-tx ^>=1.7 + , text ^>=2.0 , time >=1.9 && <2 library schema @@ -117,7 +117,7 @@ library gen build-depends: , base >=4.9 && <5 , bytestring >=0.10.12 && <0.12 - , cardano-api:{cardano-api, gen} ==1.35.4 + , cardano-api:{cardano-api, gen} ^>=8.8 , hedgehog-quickcheck ^>=0.1 , http-media ^>=0.8 , marlowe-cardano ==0.1.2.0 @@ -143,7 +143,7 @@ library history-api , aeson >=2 && <3 , base >=4.9 && <5 , binary ^>=0.8.8 - , cardano-api ==1.35.4 + , cardano-api ^>=8.8 , containers ^>=0.6.5 , errors >=2.3 && <3 , hs-opentelemetry-api ==0.0.3.6 @@ -151,11 +151,11 @@ library history-api , marlowe-chain-sync ==0.0.4 , marlowe-protocols ==0.2.0.0 , marlowe-runtime ==0.0.4 - , ouroboros-consensus ==0.1.0.1 - , ouroboros-network ==0.1.0.1 - , plutus-ledger-api ==1.0.0.1 + , ouroboros-consensus ^>=0.9 + , ouroboros-network ^>=0.8 + , plutus-ledger-api ^>=1.7 , transformers ^>=0.5.6 - , typed-protocols ==0.1.0.0 + , typed-protocols ^>=0.1 library indexer import: lang @@ -180,7 +180,7 @@ library indexer , base >=4.9 && <5 , binary ^>=0.8.8 , bytestring >=0.10.12 && <0.12 - , cardano-api ==1.35.4 + , cardano-api ^>=8.8 , co-log >=0.5.0.0 && <0.6.0.0 , containers ^>=0.6.5 , eventuo11y >=0.9 && <0.11 @@ -197,9 +197,9 @@ library indexer , marlowe-runtime:{marlowe-runtime, history-api} ==0.0.4 , mtl >=2.2 && <3 , nonempty-containers ^>=0.3.4 - , plutus-ledger-api ==1.0.0.1 + , plutus-ledger-api ^>=1.7 , stm ^>=2.5 - , text >=1.2.4 && <2 + , text ^>=2.0 , time >=1.9 && <2 , transformers ^>=0.5.6 , unliftio ^>=0.2.1 @@ -219,12 +219,12 @@ library sync-api , aeson >=2 && <3 , base >=4.9 && <5 , binary ^>=0.8.8 - , cardano-api ==1.35.4 + , cardano-api ^>=8.8 , containers ^>=0.6.5 , marlowe-chain-sync ==0.0.4 , marlowe-protocols ==0.2.0.0 , marlowe-runtime:{marlowe-runtime, discovery-api} ==0.0.4 - , ouroboros-consensus ==0.1.0.1 + , ouroboros-consensus ^>=0.9 , time >=1.9 && <2 , unliftio ^>=0.2.1 @@ -245,7 +245,7 @@ library contract-api , aeson >=2 && <3 , base >=4.9 && <5 , binary ^>=0.8.8 - , cardano-api ==1.35.4 + , cardano-api ^>=8.8 , containers ^>=0.6.5 , hs-opentelemetry-api ==0.0.3.6 , marlowe-cardano ==0.1.2.0 @@ -253,9 +253,9 @@ library contract-api , marlowe-object ==0.1.0.0 , marlowe-protocols ==0.2.0.0 , marlowe-runtime ==0.0.4 - , plutus-ledger-api ==1.0.0.1 - , text >=1.2.4 && <2 - , typed-protocols ==0.1.0.0 + , plutus-ledger-api ^>=1.7 + , text ^>=2.0 + , typed-protocols ^>=0.1 library contract import: lang @@ -276,7 +276,7 @@ library contract , base >=4.9 && <5 , binary ^>=0.8.8 , bytestring >=0.10.12 && <0.12 - , cardano-api ==1.35.4 + , cardano-api ^>=8.8 , containers ^>=0.6.5 , dlist ^>=1.0 , eventuo11y >=0.9 && <0.11 @@ -291,11 +291,11 @@ library contract , marlowe-object ==0.1.0.0 , marlowe-protocols ==0.2.0.0 , marlowe-runtime:{marlowe-runtime, contract-api} ==0.0.4 - , plutus-ledger-api ==1.0.0.1 + , plutus-ledger-api ^>=1.7 , resourcet >=1.3 && <2 - , text >=1.2.4 && <2 + , text ^>=2.0 , transformers ^>=0.5.6 - , typed-protocols ==0.1.0.0 + , typed-protocols ^>=0.1 , unliftio ^>=0.2.1 , unordered-containers ^>=0.2.19 , uuid >=1.3 && <2 @@ -348,9 +348,9 @@ library sync , marlowe-chain-sync ==0.0.4 , marlowe-protocols ==0.2.0.0 , marlowe-runtime:{marlowe-runtime, discovery-api, history-api, schema, sync-api} ==0.0.4 - , plutus-ledger-api ==1.0.0.1 + , plutus-ledger-api ^>=1.7 , postgresql-syntax ^>=0.4.1 - , text >=1.2.4 && <2 + , text ^>=2.0 , time >=1.9 && <2 , transformers ^>=0.5.6 , unliftio ^>=0.2.1 @@ -375,7 +375,7 @@ library discovery-api , marlowe-chain-sync ==0.0.4 , marlowe-protocols ==0.2.0.0 , marlowe-runtime ==0.0.4 - , typed-protocols ==0.1.0.0 + , typed-protocols ^>=0.1 library tx-api import: lang @@ -387,7 +387,7 @@ library tx-api , base >=4.9 && <5 , binary ^>=0.8.8 , bytestring >=0.10.12 && <0.12 - , cardano-api ==1.35.4 + , cardano-api ^>=8.8 , containers ^>=0.6.5 , http-media ^>=0.8 , marlowe-cardano ==0.1.2.0 @@ -395,9 +395,9 @@ library tx-api , marlowe-protocols ==0.2.0.0 , marlowe-runtime:{marlowe-runtime, history-api} ==0.0.4 , network-uri >=2.6 && <3 - , plutus-core ==1.0.0.1 - , plutus-ledger-api ==1.0.0.1 - , text >=1.2.4 && <2 + , plutus-core ^>=1.7 + , plutus-ledger-api ^>=1.7 + , text ^>=2.0 , time >=1.9 && <2 library tx @@ -419,8 +419,8 @@ library tx , async , async-components ==0.1.1.0 , base >=4.9 && <5 - , cardano-api ==1.35.4 - , cardano-ledger-core ==0.1.0.0 + , cardano-api ^>=8.8 + , cardano-ledger-core ^>=1.4 , co-log >=0.5.0.0 && <0.6.0.0 , containers ^>=0.6.5 , errors >=2.3 && <3 @@ -432,10 +432,10 @@ library tx , marlowe-chain-sync:{marlowe-chain-sync, plutus-compat} ==0.0.4 , marlowe-protocols ==0.2.0.0 , marlowe-runtime:{marlowe-runtime, contract-api, history-api, plutus-scripts, tx-api} ==0.0.4 - , ouroboros-consensus ==0.1.0.1 - , ouroboros-network ==0.1.0.1 - , plutus-ledger-api ==1.0.0.1 - , plutus-tx ==1.0.0.0 + , ouroboros-consensus ^>=0.9 + , ouroboros-network ^>=0.8 + , plutus-ledger-api ^>=1.7 + , plutus-tx ^>=1.7 , retry ^>=0.9.3 , semialign >=1.2 && <2 , stm ^>=2.5 @@ -458,7 +458,7 @@ library proxy-api , binary ^>=0.8.8 , marlowe-protocols ==0.2.0.0 , marlowe-runtime:{contract-api, discovery-api, history-api, sync-api, tx-api} ==0.0.4 - , typed-protocols ==0.1.0.0 + , typed-protocols ^>=0.1 library proxy import: lang @@ -474,7 +474,7 @@ library proxy , marlowe-runtime:{contract-api, discovery-api, history-api, proxy-api, sync-api, tx-api} ==0.0.4 , resourcet >=1.3 && <2 , transformers ^>=0.5.6 - , typed-protocols ==0.1.0.0 + , typed-protocols ^>=0.1 , unliftio ^>=0.2.1 library runtime @@ -485,7 +485,7 @@ library runtime build-depends: , async-components ==0.1.1.0 , base >=4.9 && <5 - , cardano-api ==1.35.4 + , cardano-api ^>=8.8 , co-log >=0.5.0.0 && <0.6.0.0 , containers ^>=0.6.5 , eventuo11y-extras ==0.1.1.0 @@ -495,7 +495,7 @@ library runtime , nonempty-containers ^>=0.3.4 , random ^>=1.2.1 , time >=1.9 && <2 - , typed-protocols ==0.1.0.0 + , typed-protocols ^>=0.1 , unliftio ^>=0.2.1 library plutus-scripts @@ -513,9 +513,9 @@ library plutus-scripts build-depends: , base >=4.9 && <5 , newtype-generics ^>=0.6.2 - , plutus-ledger-api ==1.0.0.1 - , plutus-tx ==1.0.0.0 - , plutus-tx-plugin ==1.0.0.0 + , plutus-ledger-api ^>=1.7 + , plutus-tx ^>=1.7 + , plutus-tx-plugin ^>=1.7 library config import: lang @@ -529,7 +529,7 @@ library config , network >=3.1 && <4 , optparse-applicative ^>=0.17 , split ^>=0.2.3 - , text >=1.2.4 && <2 + , text ^>=2.0 executable marlowe-indexer import: lang @@ -559,7 +559,7 @@ executable marlowe-indexer , nonempty-containers ^>=0.3.4 , optparse-applicative ^>=0.17 , postgresql-libpq ^>=0.9 - , text >=1.2.4 && <2 + , text ^>=2.0 , unliftio ^>=0.2.1 ghc-options: -threaded @@ -591,7 +591,7 @@ executable marlowe-sync , network >=3.1 && <4 , optparse-applicative ^>=0.17 , postgresql-libpq ^>=0.9 - , text >=1.2.4 && <2 + , text ^>=2.0 , unliftio ^>=0.2.1 ghc-options: -threaded @@ -618,7 +618,7 @@ executable marlowe-tx , marlowe-runtime:{marlowe-runtime, contract-api, tx, tx-api} ==0.0.4 , network >=3.1 && <4 , optparse-applicative ^>=0.17 - , text >=1.2.4 && <2 + , text ^>=2.0 , time ghc-options: -threaded @@ -644,8 +644,8 @@ executable marlowe-contract , marlowe-runtime:{contract, contract-api} ==0.0.4 , network >=3.1 && <4 , optparse-applicative ^>=0.17 - , text >=1.2.4 && <2 - , typed-protocols ==0.1.0.0 + , text ^>=2.0 + , typed-protocols ^>=0.1 ghc-options: -threaded @@ -670,7 +670,7 @@ executable marlowe-proxy , marlowe-runtime:{config, contract-api, discovery-api, history-api, proxy, proxy-api, sync-api, tx-api} ==0.0.4 , network >=3.1 && <4 , optparse-applicative ^>=0.17 - , text >=1.2.4 && <2 + , text ^>=2.0 ghc-options: -threaded @@ -688,9 +688,9 @@ executable marlowe-runtime , async-components ==0.1.1.0 , base >=4.9 && <5 , bytestring >=0.10.12 && <0.12 - , cardano-api ==1.35.4 - , cardano-crypto-wrapper ==1.3.0 - , cardano-ledger-byron ==0.1.0.0 + , cardano-api ^>=8.8 + , cardano-crypto-wrapper ^>=1.5 + , cardano-ledger-byron ==1.0.0.2 , eventuo11y >=0.9 && <0.11 , eventuo11y-extras ==0.1.1.0 , eventuo11y-otel ^>=0.1 @@ -705,11 +705,11 @@ executable marlowe-runtime , network >=3.1 && <4 , nonempty-containers ^>=0.3.4 , optparse-applicative ^>=0.17 - , ouroboros-network ==0.1.0.1 + , ouroboros-network ^>=0.8 , postgresql-libpq ^>=0.9 - , text >=1.2.4 && <2 + , text ^>=2.0 , transformers ^>=0.5.6 - , typed-protocols ==0.1.0.0 + , typed-protocols ^>=0.1 , unliftio ^>=0.2.1 ghc-options: -threaded @@ -740,7 +740,7 @@ test-suite marlowe-runtime-test , aeson >=2 && <3 , base >=4.9 && <5 , bytestring >=0.10.12 && <0.12 - , cardano-api:{cardano-api, gen} ==1.35.4 + , cardano-api:{cardano-api, gen} ^>=8.8 , cardano-slotting , containers ^>=0.6.5 , errors >=2.3 && <3 @@ -757,15 +757,15 @@ test-suite marlowe-runtime-test , marlowe-runtime:{marlowe-runtime, contract-api, discovery-api, gen, history-api, sync, sync-api, tx, tx-api} ==0.0.4 , marlowe-test ==0.1.3.0 , network-uri >=2.6 && <3 - , ouroboros-consensus ==0.1.0.1 - , plutus-ledger-api ==1.0.0.1 - , plutus-tx ==1.0.0.0 + , ouroboros-consensus ^>=0.9 + , plutus-ledger-api ^>=1.7 + , plutus-tx ^>=1.7 , QuickCheck >=2.14 && <3 , quickcheck-instances ^>=0.3.29 - , text >=1.2.4 && <2 + , text ^>=2.0 , time >=1.9 && <2 , transformers ^>=0.5.6 - , typed-protocols ==0.1.0.0 + , typed-protocols ^>=0.1 , vector ^>=0.12.3 build-tool-depends: hspec-discover:hspec-discover @@ -782,15 +782,15 @@ test-suite indexer-test build-depends: , base >=4.9 && <5 - , cardano-api ==1.35.4 + , cardano-api ^>=8.8 , containers ^>=0.6.5 , hspec , marlowe-cardano ==0.1.2.0 , marlowe-chain-sync:{marlowe-chain-sync, plutus-compat} ==0.0.4 , marlowe-runtime:{marlowe-runtime, gen, history-api, indexer} ==0.0.4 , marlowe-test ==0.1.3.0 - , ouroboros-consensus ==0.1.0.1 - , plutus-tx ==1.0.0.0 + , ouroboros-consensus ^>=0.9 + , plutus-tx ^>=1.7 , QuickCheck >=2.14 && <3 , time >=1.9 && <2 , transformers ^>=0.5.6 diff --git a/marlowe-test/marlowe-test.cabal b/marlowe-test/marlowe-test.cabal index e5303a7dc9..3e2b4027ad 100644 --- a/marlowe-test/marlowe-test.cabal +++ b/marlowe-test/marlowe-test.cabal @@ -143,14 +143,14 @@ library , aeson >=2 && <3 , base >=4.9 && <5 , bytestring >=0.10.12 && <0.12 - , cardano-api ==1.35.4 + , cardano-api ^>=8.8 , containers ^>=0.6.5 , directory ^>=1.3 , filepath ^>=1.4 , marlowe-cardano ==0.1.2.0 , mtl >=2.2 && <3 - , plutus-ledger-api ==1.0.0.1 - , plutus-tx ==1.0.0.0 + , plutus-ledger-api ^>=1.7 + , plutus-tx ^>=1.7 , QuickCheck >=2.14 && <3 , tasty-quickcheck ^>=0.10 @@ -200,7 +200,7 @@ test-suite marlowe-test , aeson >=2 && <3 , base >=4.9 && <5 , bytestring >=0.10.12 && <0.12 - , cardano-api ==1.35.4 + , cardano-api ^>=8.8 , containers ^>=0.6.5 , data-default ^>=0.7.1 , filepath ^>=1.4 @@ -209,11 +209,10 @@ test-suite marlowe-test , lens >=5.2 && <6 , marlowe-cardano ==0.1.2.0 , marlowe-plutus - , marlowe-spec-test ==0.1.0.0 , marlowe-test , mtl >=2.2 && <3 - , plutus-ledger-api ==1.0.0.1 - , plutus-tx ==1.0.0.0 + , plutus-ledger-api ^>=1.7 + , plutus-tx ^>=1.7 , QuickCheck >=2.14 && <3 , quickcheck-instances ^>=0.3.29 , sbv >=8.4 @@ -221,10 +220,11 @@ test-suite marlowe-test , tasty ^>=1.4.2 , tasty-hunit ^>=0.10 , tasty-quickcheck ^>=0.10 - , text >=1.2.4 && <2 + , text ^>=2.0 , these >=1.1 && <2 , type-iso ==1.0.1.0 +-- , marlowe-spec-test ==0.1.0.0 executable marlowe-spec-client import: lang hs-source-dirs: spec-client diff --git a/marlowe/marlowe-cardano.cabal b/marlowe/marlowe-cardano.cabal index 6a46e9875e..be154a06a2 100644 --- a/marlowe/marlowe-cardano.cabal +++ b/marlowe/marlowe-cardano.cabal @@ -68,7 +68,7 @@ library , base16-aeson ==0.1.0.0 , bech32 >=1.1 && <2 , bytestring >=0.10.12 && <0.12 - , cardano-api ==1.35.4 + , cardano-api ^>=8.8 , containers ^>=0.6.5 , deriving-aeson ^>=0.2.9 , ilist ==0.4.0.1 @@ -76,13 +76,13 @@ library , multiplate ==0.0.3 , newtype-generics ^>=0.6.2 , ordered-containers ^>=0.2 - , plutus-ledger-api ==1.0.0.1 - , plutus-tx ==1.0.0.0 + , plutus-ledger-api ^>=1.7 + , plutus-tx ^>=1.7 , range ==0.3.0.2 , sbv ^>=9.2 , scientific ^>=0.3.7 , template-haskell >=2.16 && <3 - , text >=1.2.4 && <2 + , text ^>=2.0 , time >=1.9.3 && <2 , transformers ^>=0.5.6 , wl-pprint >=1.2 && <2 diff --git a/nix/haskell.nix b/nix/haskell.nix index e515595dca..c6f02e89a7 100644 --- a/nix/haskell.nix +++ b/nix/haskell.nix @@ -2,5 +2,5 @@ # https://www.github.com/input-output-hk/iogx#32-nixhaskellnix { - supportedCompilers = [ "ghc8107" ]; + supportedCompilers = [ "ghc928" ]; }