Skip to content

Commit

Permalink
Update GHC and dependency constraints
Browse files Browse the repository at this point in the history
  • Loading branch information
jhbertra committed Sep 10, 2023
1 parent c31a6fa commit 787872b
Show file tree
Hide file tree
Showing 23 changed files with 180 additions and 235 deletions.
59 changes: 4 additions & 55 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hasql-dynamic-syntax/hasql-dynamic-syntax.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion libs/base16-aeson/base16-aeson.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions libs/plutus-ledger-ada/plutus-ledger-ada.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 7 additions & 10 deletions libs/plutus-ledger-aeson/plutus-ledger-aeson.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
6 changes: 3 additions & 3 deletions libs/plutus-ledger-slot/plutus-ledger-slot.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion marlowe-actus/marlowe-actus.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ library
, base
, marlowe-cardano
, mtl
, plutus-ledger-api
, plutus-ledger-api ^>=1.7
, plutus-tx
, time
, validation
Expand Down
14 changes: 7 additions & 7 deletions marlowe-apps/marlowe-apps.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -99,7 +99,7 @@ executable marlowe-scaling
, marlowe-runtime
, mtl
, optparse-applicative
, plutus-ledger-api
, plutus-ledger-api ^>=1.7
, random
, text
, time
Expand Down Expand Up @@ -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
Expand All @@ -140,7 +140,7 @@ executable marlowe-oracle
, marlowe-runtime
, mtl
, optparse-applicative
, plutus-ledger-api
, plutus-ledger-api ^>=1.7
, process
, servant
, servant-client
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading

0 comments on commit 787872b

Please sign in to comment.