diff --git a/cabal-haskell.nix.project b/cabal-haskell.nix.project index 3751eacd..6d121ade 100644 --- a/cabal-haskell.nix.project +++ b/cabal-haskell.nix.project @@ -11,11 +11,12 @@ source-repository-package plutus-ledger plutus-ledger-constraints plutus-pab + plutus-pab-executables plutus-playground-server plutus-use-cases quickcheck-dynamic web-ghc - tag: 75a581c6eb98d36192ce3d3f86ea60a04bc4a52a + tag: 34fe6eeff441166fee0cd0ceba68c1439f0e93d2 -- The following sections are copied from the 'plutus-pab' repository cabal.project at the revision -- given above. @@ -61,6 +62,16 @@ package ouroboros-consensus-cardano optimization: False package cardano-api optimization: False +package cardano-wallet + optimization: False +package cardano-wallet-core + optimization: False +package cardano-wallet-cli + optimization: False +package cardano-wallet-launcher + optimization: False +package cardano-wallet-core-integration + optimization: False -- Copied from plutus-core source-repository-package @@ -83,13 +94,15 @@ source-repository-package source-repository-package type: git location: https://github.com/input-output-hk/cardano-crypto.git - tag: 07397f0e50da97eaa0575d93bee7ac4b2b2576ec + tag: f73079303f663e028288f9f4a9e08bcca39a923e + --sha256: 1n87i15x54s0cjkh3nsxs4r1x016cdw1fypwmr68936n3xxsjn6q -- Copied from plutus-core source-repository-package type: git location: https://github.com/input-output-hk/cardano-base - tag: 4ea7e2d927c9a7f78ddc69738409a5827ab66b98 + tag: 654f5b7c76f7cc57900b4ddc664a82fc3b925fb0 + --sha256: 0j4x9zbx5dkww82sqi086h39p456iq5xr476ylmrnpwcpfb4xai4 subdir: base-deriving-via binary @@ -106,7 +119,8 @@ source-repository-package source-repository-package type: git location: https://github.com/input-output-hk/cardano-prelude - tag: fd773f7a58412131512b9f694ab95653ac430852 + tag: bb4ed71ba8e587f672d06edf9d2e376f4b055555 + --sha256: 00h10l5mmiza9819p9v5q5749nb9pzgi20vpzpy1d34zmh6gf1cj subdir: cardano-prelude cardano-prelude-test @@ -121,9 +135,11 @@ source-repository-package source-repository-package type: git - location: https://github.com/j-mueller/cardano-wallet - tag: 6be73ab852c0592713dfe78218856d4a8a0ee69e + location: https://github.com/input-output-hk/cardano-wallet + tag: 760140e238a5fbca61d1b286d7a80ece058dc729 + --sha256: 014njpddrlqm9bbab636h2gf58zkm0bx04i1jsn07vh5j3k0gri6 subdir: + lib/dbvar lib/text-class lib/strict-non-empty-containers lib/core @@ -137,7 +153,8 @@ source-repository-package source-repository-package type: git location: https://github.com/input-output-hk/ouroboros-network - tag: 1f4973f36f689d6da75b5d351fb124d66ef1057d + tag: d613de3d872ec8b4a5da0c98afb443f322dc4dab + --sha256: 0lfbipfdrzay8v1pcazx0qgkda3d1j0505yig9jrml9j7991rmhl subdir: monoidal-synchronisation typed-protocols @@ -181,8 +198,9 @@ source-repository-package source-repository-package type: git - location: https://github.com/input-output-hk/cardano-ledger-specs + location: https://github.com/input-output-hk/cardano-ledger tag: bf008ce028751cae9fb0b53c3bef20f07c06e333 + --sha256: 0my3801w1vinc0kf5yh9lxl6saqxgwm6ccg0vvzi104pafcwwcqx subdir: byron/ledger/impl cardano-ledger-core @@ -203,23 +221,13 @@ source-repository-package libs/cardano-ledger-pretty semantics/small-steps-test --- A lot of plutus-apps dependencies have to be synchronized with the dependencies of --- cardano-node. If you update cardano-node, please make sure that all dependencies --- of cardano-node are also updated. source-repository-package type: git location: https://github.com/input-output-hk/cardano-node.git - tag: b6ca519f97a0e795611a63174687e6bb70c9f752 + tag: 4f65fb9a27aa7e3a1873ab4211e412af780a3648 + --sha256: 00k9fqrm0gphjji23x0nc9z6bqh8bqrncgivn3mi3csacjzicrrx subdir: cardano-api - cardano-node - cardano-cli - cardano-config - -source-repository-package - type: git - location: https://github.com/input-output-hk/optparse-applicative - tag: 7497a29cb998721a9068d5725d49461f2bba0e7a source-repository-package type: git @@ -235,14 +243,14 @@ source-repository-package -- plutus. If you update plutus, please make sure that all dependencies of plutus -- are also updated source-repository-package - type: git - location: https://github.com/input-output-hk/plutus - tag: c8c5183f7facd967d48fe07b3b14465b8dd48fe7 - subdir: - plutus-core - plutus-ledger-api - plutus-tx - plutus-tx-plugin - word-array - prettyprinter-configurable - stubs/plutus-ghc-stub + type: git + location: https://github.com/input-output-hk/plutus + tag: 65bad0fd53e432974c3c203b1b1999161b6c2dce + subdir: + plutus-ledger-api + word-array + prettyprinter-configurable + stubs/plutus-ghc-stub + plutus-core + plutus-tx + plutus-tx-plugin \ No newline at end of file diff --git a/nix/sources.json b/nix/sources.json index 0eea1e94..0896949b 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -12,7 +12,7 @@ "url_template": "https://github.com///archive/.tar.gz" }, "cardano-addresses": { - "branch": "d2f86caa085402a953920c6714a0de6a50b655ec", + "branch": "master", "description": "Addresses and mnemonic manipulation & derivations", "homepage": "", "owner": "input-output-hk", @@ -24,15 +24,15 @@ "url_template": "https://github.com///archive/.tar.gz" }, "cardano-base": { - "branch": "4ea7e2d927c9a7f78ddc69738409a5827ab66b98", + "branch": "master", "description": "Code used throughout the Cardano eco-system", "homepage": null, "owner": "input-output-hk", "repo": "cardano-base", - "rev": "4ea7e2d927c9a7f78ddc69738409a5827ab66b98", - "sha256": "0n0hxbr0l95cdc25jmmgs7apmmw17i91chhj5rzzv1k7f3iymf6d", + "rev": "654f5b7c76f7cc57900b4ddc664a82fc3b925fb0", + "sha256": "0j4x9zbx5dkww82sqi086h39p456iq5xr476ylmrnpwcpfb4xai4", "type": "tarball", - "url": "https://github.com/input-output-hk/cardano-base/archive/4ea7e2d927c9a7f78ddc69738409a5827ab66b98.tar.gz", + "url": "https://github.com/input-output-hk/cardano-base/archive/654f5b7c76f7cc57900b4ddc664a82fc3b925fb0.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "cardano-crypto": { @@ -41,15 +41,15 @@ "homepage": null, "owner": "input-output-hk", "repo": "cardano-crypto", - "rev": "07397f0e50da97eaa0575d93bee7ac4b2b2576ec", - "sha256": "06sdx5ndn2g722jhpicmg96vsrys89fl81k8290b3lr6b1b0w4m3", + "rev": "f73079303f663e028288f9f4a9e08bcca39a923e", + "sha256": "1n87i15x54s0cjkh3nsxs4r1x016cdw1fypwmr68936n3xxsjn6q", "type": "tarball", - "url": "https://github.com/input-output-hk/cardano-crypto/archive/07397f0e50da97eaa0575d93bee7ac4b2b2576ec.tar.gz", + "url": "https://github.com/input-output-hk/cardano-crypto/archive/f73079303f663e028288f9f4a9e08bcca39a923e.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "cardano-ledger-specs": { - "branch": "bf008ce028751cae9fb0b53c3bef20f07c06e333", - "description": "The ledger implementation and specifications of the Cardano blockchain.", + "branch": "master", + "description": "A formal specification and executable model of the ledger rules introduced by the Shelley release", "homepage": "", "owner": "input-output-hk", "repo": "cardano-ledger-specs", @@ -60,15 +60,15 @@ "url_template": "https://github.com///archive/.tar.gz" }, "cardano-node": { - "branch": "b6ca519f97a0e795611a63174687e6bb70c9f752", + "branch": "master", "description": "The core component that is used to participate in a Cardano decentralised blockchain.", "homepage": "https://cardano.org", "owner": "input-output-hk", "repo": "cardano-node", - "rev": "b6ca519f97a0e795611a63174687e6bb70c9f752", - "sha256": "0z5lpmqc98fwg3xzpzxkfslbxdjwfyyw8bn8yq0574sf4942vqdn", + "rev": "4f65fb9a27aa7e3a1873ab4211e412af780a3648", + "sha256": "00k9fqrm0gphjji23x0nc9z6bqh8bqrncgivn3mi3csacjzicrrx", "type": "tarball", - "url": "https://github.com/input-output-hk/cardano-node/archive/b6ca519f97a0e795611a63174687e6bb70c9f752.tar.gz", + "url": "https://github.com/input-output-hk/cardano-node/archive/4f65fb9a27aa7e3a1873ab4211e412af780a3648.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "cardano-prelude": { @@ -77,22 +77,22 @@ "homepage": null, "owner": "input-output-hk", "repo": "cardano-prelude", - "rev": "fd773f7a58412131512b9f694ab95653ac430852", - "sha256": "02jddik1yw0222wd6q0vv10f7y8rdgrlqaiy83ph002f9kjx7mh6", + "rev": "bb4ed71ba8e587f672d06edf9d2e376f4b055555", + "sha256": "00h10l5mmiza9819p9v5q5749nb9pzgi20vpzpy1d34zmh6gf1cj", "type": "tarball", - "url": "https://github.com/input-output-hk/cardano-prelude/archive/fd773f7a58412131512b9f694ab95653ac430852.tar.gz", + "url": "https://github.com/input-output-hk/cardano-prelude/archive/bb4ed71ba8e587f672d06edf9d2e376f4b055555.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "cardano-wallet": { - "branch": "6be73ab852c0592713dfe78218856d4a8a0ee69e", + "branch": "master", "description": "HTTP server & command-line for managing UTxOs and HD wallets in Cardano.", "homepage": "", "owner": "j-mueller", "repo": "cardano-wallet", - "rev": "6be73ab852c0592713dfe78218856d4a8a0ee69e", - "sha256": "0rx5hvmbdv5dwb4qq39vyhisj0v75j21jbiivn3s3q9za6m6x1p4", + "rev": "760140e238a5fbca61d1b286d7a80ece058dc729", + "sha256": "014njpddrlqm9bbab636h2gf58zkm0bx04i1jsn07vh5j3k0gri6", "type": "tarball", - "url": "https://github.com/j-mueller/cardano-wallet/archive/6be73ab852c0592713dfe78218856d4a8a0ee69e.tar.gz", + "url": "https://github.com/j-mueller/cardano-wallet/archive/760140e238a5fbca61d1b286d7a80ece058dc729.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "flat": { @@ -168,16 +168,15 @@ "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { - "branch": "nixpkgs-unstable", - "builtin": true, - "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to", - "homepage": "https://github.com/NixOS/nixpkgs", + "branch": "release-20.03", + "description": "Nix Packages collection", + "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7d71001b796340b219d1bfa8552c81995017544a", - "sha256": "09fv5rhnq6m770wy0wyyp8anhqsn2dyrk4c4gmka02r5600kbaiw", + "rev": "6d1a044fc9ff3cc96fca5fa3ba9c158522bbf2a5", + "sha256": "07a3nyrj3pwl017ig0rbn5rbmbf14gl3vqggvkyrdby01726p5fg", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/7d71001b796340b219d1bfa8552c81995017544a.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/6d1a044fc9ff3cc96fca5fa3ba9c158522bbf2a5.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs-2009": { @@ -218,43 +217,43 @@ "url_template": "https://github.com///archive/.tar.gz" }, "ouroboros-network": { - "branch": "1f4973f36f689d6da75b5d351fb124d66ef1057d", + "branch": "master", "description": "An implementation of the Ouroboros family of consensus algorithms, with its networking support", "homepage": "", "owner": "input-output-hk", "repo": "ouroboros-network", - "rev": "1f4973f36f689d6da75b5d351fb124d66ef1057d", - "sha256": "186056rvzdzy4jhvamjjbcmjyr94hs5hcyr8x6a0ch21hv5f014p", + "rev": "d613de3d872ec8b4a5da0c98afb443f322dc4dab", + "sha256": "0lfbipfdrzay8v1pcazx0qgkda3d1j0505yig9jrml9j7991rmhl", "type": "tarball", - "url": "https://github.com/input-output-hk/ouroboros-network/archive/1f4973f36f689d6da75b5d351fb124d66ef1057d.tar.gz", + "url": "https://github.com/input-output-hk/ouroboros-network/archive/d613de3d872ec8b4a5da0c98afb443f322dc4dab.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "plutus": { - "branch": "3f089ccf0ca746b399c99afe51e063b0640af547", + "branch": "master", "description": "The Plutus language implementation and tools", "homepage": "", "owner": "input-output-hk", "repo": "plutus", - "rev": "c8c5183f7facd967d48fe07b3b14465b8dd48fe7", - "sha256": "01fmakdp589h9nllc31s3mkys6gic6ba38s9r3ycfb9r1j5n1cja", + "rev": "65bad0fd53e432974c3c203b1b1999161b6c2dce", + "sha256": "03x5vsjlbj4favghwrb14n6bkiwpypzjinw94hj7klai3xcj8pyj", "type": "tarball", - "url": "https://github.com/input-output-hk/plutus/archive/c8c5183f7facd967d48fe07b3b14465b8dd48fe7.tar.gz", + "url": "https://github.com/input-output-hk/plutus/archive/65bad0fd53e432974c3c203b1b1999161b6c2dce.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "plutus-apps": { - "branch": "7f7aca8500105d3a0830b40627f1821c9ac7b58e", - "description": "The Plutus application platform", - "homepage": null, + "branch": "master", + "description": "The Plutus Application Framework", + "homepage": "", "owner": "input-output-hk", "repo": "plutus-apps", - "rev": "75a581c6eb98d36192ce3d3f86ea60a04bc4a52a", - "sha256": "06f0ghj3v2q6gh73kgsr3vqbhr7f7gkbar0c9ry3jmmxny30q6dv", + "rev": "34fe6eeff441166fee0cd0ceba68c1439f0e93d2", + "sha256": "1hs1h1bn86cb752lzswxbwjb0cyw2fayy5g723z3hdk8k91dhhji", "type": "tarball", - "url": "https://github.com/input-output-hk/plutus-apps/archive/75a581c6eb98d36192ce3d3f86ea60a04bc4a52a.tar.gz", + "url": "https://github.com/input-output-hk/plutus-apps/archive/34fe6eeff441166fee0cd0ceba68c1439f0e93d2.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "purescript-bridge": { - "branch": "366fc70b341e2633f3ad0158a577d52e1cd2b138", + "branch": "master", "description": "Create PureScript datatypes from Haskell datatypes", "homepage": null, "owner": "input-output-hk", @@ -266,7 +265,7 @@ "url_template": "https://github.com///archive/.tar.gz" }, "servant-purescript": { - "branch": "ebea59c7bdfc0338d83fca772b9a57e28560bcde", + "branch": "master", "description": "Translate servant API to purescript code, with the help of purescript-bridge.", "homepage": null, "owner": "input-output-hk",