Skip to content

Commit 46c2c26

Browse files
samuelWilliams99samuelWilliams99
committed
Update plutus-apps to 34fe6eeff441166fee0cd0ceba68c1439f0e93d2, to match plutus-extra
1 parent 490e9b6 commit 46c2c26

File tree

2 files changed

+82
-75
lines changed

2 files changed

+82
-75
lines changed

‎cabal-haskell.nix.project‎

Lines changed: 39 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ source-repository-package
1111
plutus-ledger
1212
plutus-ledger-constraints
1313
plutus-pab
14+
plutus-pab-executables
1415
plutus-playground-server
1516
plutus-use-cases
1617
quickcheck-dynamic
1718
web-ghc
18-
tag: 75a581c6eb98d36192ce3d3f86ea60a04bc4a52a
19+
tag: 34fe6eeff441166fee0cd0ceba68c1439f0e93d2
1920

2021
-- The following sections are copied from the 'plutus-pab' repository cabal.project at the revision
2122
-- given above.
@@ -61,6 +62,16 @@ package ouroboros-consensus-cardano
6162
optimization: False
6263
package cardano-api
6364
optimization: False
65+
package cardano-wallet
66+
optimization: False
67+
package cardano-wallet-core
68+
optimization: False
69+
package cardano-wallet-cli
70+
optimization: False
71+
package cardano-wallet-launcher
72+
optimization: False
73+
package cardano-wallet-core-integration
74+
optimization: False
6475

6576
-- Copied from plutus-core
6677
source-repository-package
@@ -83,13 +94,15 @@ source-repository-package
8394
source-repository-package
8495
type: git
8596
location: https://github.com/input-output-hk/cardano-crypto.git
86-
tag: 07397f0e50da97eaa0575d93bee7ac4b2b2576ec
97+
tag: f73079303f663e028288f9f4a9e08bcca39a923e
98+
--sha256: 1n87i15x54s0cjkh3nsxs4r1x016cdw1fypwmr68936n3xxsjn6q
8799

88100
-- Copied from plutus-core
89101
source-repository-package
90102
type: git
91103
location: https://github.com/input-output-hk/cardano-base
92-
tag: 4ea7e2d927c9a7f78ddc69738409a5827ab66b98
104+
tag: 654f5b7c76f7cc57900b4ddc664a82fc3b925fb0
105+
--sha256: 0j4x9zbx5dkww82sqi086h39p456iq5xr476ylmrnpwcpfb4xai4
93106
subdir:
94107
base-deriving-via
95108
binary
@@ -106,7 +119,8 @@ source-repository-package
106119
source-repository-package
107120
type: git
108121
location: https://github.com/input-output-hk/cardano-prelude
109-
tag: fd773f7a58412131512b9f694ab95653ac430852
122+
tag: bb4ed71ba8e587f672d06edf9d2e376f4b055555
123+
--sha256: 00h10l5mmiza9819p9v5q5749nb9pzgi20vpzpy1d34zmh6gf1cj
110124
subdir:
111125
cardano-prelude
112126
cardano-prelude-test
@@ -121,9 +135,11 @@ source-repository-package
121135

122136
source-repository-package
123137
type: git
124-
location: https://github.com/j-mueller/cardano-wallet
125-
tag: 6be73ab852c0592713dfe78218856d4a8a0ee69e
138+
location: https://github.com/input-output-hk/cardano-wallet
139+
tag: 760140e238a5fbca61d1b286d7a80ece058dc729
140+
--sha256: 014njpddrlqm9bbab636h2gf58zkm0bx04i1jsn07vh5j3k0gri6
126141
subdir:
142+
lib/dbvar
127143
lib/text-class
128144
lib/strict-non-empty-containers
129145
lib/core
@@ -137,7 +153,8 @@ source-repository-package
137153
source-repository-package
138154
type: git
139155
location: https://github.com/input-output-hk/ouroboros-network
140-
tag: 1f4973f36f689d6da75b5d351fb124d66ef1057d
156+
tag: d613de3d872ec8b4a5da0c98afb443f322dc4dab
157+
--sha256: 0lfbipfdrzay8v1pcazx0qgkda3d1j0505yig9jrml9j7991rmhl
141158
subdir:
142159
monoidal-synchronisation
143160
typed-protocols
@@ -181,8 +198,9 @@ source-repository-package
181198

182199
source-repository-package
183200
type: git
184-
location: https://github.com/input-output-hk/cardano-ledger-specs
201+
location: https://github.com/input-output-hk/cardano-ledger
185202
tag: bf008ce028751cae9fb0b53c3bef20f07c06e333
203+
--sha256: 0my3801w1vinc0kf5yh9lxl6saqxgwm6ccg0vvzi104pafcwwcqx
186204
subdir:
187205
byron/ledger/impl
188206
cardano-ledger-core
@@ -203,23 +221,13 @@ source-repository-package
203221
libs/cardano-ledger-pretty
204222
semantics/small-steps-test
205223

206-
-- A lot of plutus-apps dependencies have to be synchronized with the dependencies of
207-
-- cardano-node. If you update cardano-node, please make sure that all dependencies
208-
-- of cardano-node are also updated.
209224
source-repository-package
210225
type: git
211226
location: https://github.com/input-output-hk/cardano-node.git
212-
tag: b6ca519f97a0e795611a63174687e6bb70c9f752
227+
tag: 4f65fb9a27aa7e3a1873ab4211e412af780a3648
228+
--sha256: 00k9fqrm0gphjji23x0nc9z6bqh8bqrncgivn3mi3csacjzicrrx
213229
subdir:
214230
cardano-api
215-
cardano-node
216-
cardano-cli
217-
cardano-config
218-
219-
source-repository-package
220-
type: git
221-
location: https://github.com/input-output-hk/optparse-applicative
222-
tag: 7497a29cb998721a9068d5725d49461f2bba0e7a
223231

224232
source-repository-package
225233
type: git
@@ -235,14 +243,14 @@ source-repository-package
235243
-- plutus. If you update plutus, please make sure that all dependencies of plutus
236244
-- are also updated
237245
source-repository-package
238-
type: git
239-
location: https://github.com/input-output-hk/plutus
240-
tag: c8c5183f7facd967d48fe07b3b14465b8dd48fe7
241-
subdir:
242-
plutus-core
243-
plutus-ledger-api
244-
plutus-tx
245-
plutus-tx-plugin
246-
word-array
247-
prettyprinter-configurable
248-
stubs/plutus-ghc-stub
246+
type: git
247+
location: https://github.com/input-output-hk/plutus
248+
tag: 65bad0fd53e432974c3c203b1b1999161b6c2dce
249+
subdir:
250+
plutus-ledger-api
251+
word-array
252+
prettyprinter-configurable
253+
stubs/plutus-ghc-stub
254+
plutus-core
255+
plutus-tx
256+
plutus-tx-plugin

‎nix/sources.json‎

Lines changed: 43 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
1313
},
1414
"cardano-addresses": {
15-
"branch": "d2f86caa085402a953920c6714a0de6a50b655ec",
15+
"branch": "master",
1616
"description": "Addresses and mnemonic manipulation & derivations",
1717
"homepage": "",
1818
"owner": "input-output-hk",
@@ -24,15 +24,15 @@
2424
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
2525
},
2626
"cardano-base": {
27-
"branch": "4ea7e2d927c9a7f78ddc69738409a5827ab66b98",
27+
"branch": "master",
2828
"description": "Code used throughout the Cardano eco-system",
2929
"homepage": null,
3030
"owner": "input-output-hk",
3131
"repo": "cardano-base",
32-
"rev": "4ea7e2d927c9a7f78ddc69738409a5827ab66b98",
33-
"sha256": "0n0hxbr0l95cdc25jmmgs7apmmw17i91chhj5rzzv1k7f3iymf6d",
32+
"rev": "654f5b7c76f7cc57900b4ddc664a82fc3b925fb0",
33+
"sha256": "0j4x9zbx5dkww82sqi086h39p456iq5xr476ylmrnpwcpfb4xai4",
3434
"type": "tarball",
35-
"url": "https://github.com/input-output-hk/cardano-base/archive/4ea7e2d927c9a7f78ddc69738409a5827ab66b98.tar.gz",
35+
"url": "https://github.com/input-output-hk/cardano-base/archive/654f5b7c76f7cc57900b4ddc664a82fc3b925fb0.tar.gz",
3636
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
3737
},
3838
"cardano-crypto": {
@@ -41,15 +41,15 @@
4141
"homepage": null,
4242
"owner": "input-output-hk",
4343
"repo": "cardano-crypto",
44-
"rev": "07397f0e50da97eaa0575d93bee7ac4b2b2576ec",
45-
"sha256": "06sdx5ndn2g722jhpicmg96vsrys89fl81k8290b3lr6b1b0w4m3",
44+
"rev": "f73079303f663e028288f9f4a9e08bcca39a923e",
45+
"sha256": "1n87i15x54s0cjkh3nsxs4r1x016cdw1fypwmr68936n3xxsjn6q",
4646
"type": "tarball",
47-
"url": "https://github.com/input-output-hk/cardano-crypto/archive/07397f0e50da97eaa0575d93bee7ac4b2b2576ec.tar.gz",
47+
"url": "https://github.com/input-output-hk/cardano-crypto/archive/f73079303f663e028288f9f4a9e08bcca39a923e.tar.gz",
4848
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
4949
},
5050
"cardano-ledger-specs": {
51-
"branch": "bf008ce028751cae9fb0b53c3bef20f07c06e333",
52-
"description": "The ledger implementation and specifications of the Cardano blockchain.",
51+
"branch": "master",
52+
"description": "A formal specification and executable model of the ledger rules introduced by the Shelley release",
5353
"homepage": "",
5454
"owner": "input-output-hk",
5555
"repo": "cardano-ledger-specs",
@@ -60,15 +60,15 @@
6060
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
6161
},
6262
"cardano-node": {
63-
"branch": "b6ca519f97a0e795611a63174687e6bb70c9f752",
63+
"branch": "master",
6464
"description": "The core component that is used to participate in a Cardano decentralised blockchain.",
6565
"homepage": "https://cardano.org",
6666
"owner": "input-output-hk",
6767
"repo": "cardano-node",
68-
"rev": "b6ca519f97a0e795611a63174687e6bb70c9f752",
69-
"sha256": "0z5lpmqc98fwg3xzpzxkfslbxdjwfyyw8bn8yq0574sf4942vqdn",
68+
"rev": "4f65fb9a27aa7e3a1873ab4211e412af780a3648",
69+
"sha256": "00k9fqrm0gphjji23x0nc9z6bqh8bqrncgivn3mi3csacjzicrrx",
7070
"type": "tarball",
71-
"url": "https://github.com/input-output-hk/cardano-node/archive/b6ca519f97a0e795611a63174687e6bb70c9f752.tar.gz",
71+
"url": "https://github.com/input-output-hk/cardano-node/archive/4f65fb9a27aa7e3a1873ab4211e412af780a3648.tar.gz",
7272
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
7373
},
7474
"cardano-prelude": {
@@ -77,22 +77,22 @@
7777
"homepage": null,
7878
"owner": "input-output-hk",
7979
"repo": "cardano-prelude",
80-
"rev": "fd773f7a58412131512b9f694ab95653ac430852",
81-
"sha256": "02jddik1yw0222wd6q0vv10f7y8rdgrlqaiy83ph002f9kjx7mh6",
80+
"rev": "bb4ed71ba8e587f672d06edf9d2e376f4b055555",
81+
"sha256": "00h10l5mmiza9819p9v5q5749nb9pzgi20vpzpy1d34zmh6gf1cj",
8282
"type": "tarball",
83-
"url": "https://github.com/input-output-hk/cardano-prelude/archive/fd773f7a58412131512b9f694ab95653ac430852.tar.gz",
83+
"url": "https://github.com/input-output-hk/cardano-prelude/archive/bb4ed71ba8e587f672d06edf9d2e376f4b055555.tar.gz",
8484
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
8585
},
8686
"cardano-wallet": {
87-
"branch": "6be73ab852c0592713dfe78218856d4a8a0ee69e",
87+
"branch": "master",
8888
"description": "HTTP server & command-line for managing UTxOs and HD wallets in Cardano.",
8989
"homepage": "",
9090
"owner": "j-mueller",
9191
"repo": "cardano-wallet",
92-
"rev": "6be73ab852c0592713dfe78218856d4a8a0ee69e",
93-
"sha256": "0rx5hvmbdv5dwb4qq39vyhisj0v75j21jbiivn3s3q9za6m6x1p4",
92+
"rev": "760140e238a5fbca61d1b286d7a80ece058dc729",
93+
"sha256": "014njpddrlqm9bbab636h2gf58zkm0bx04i1jsn07vh5j3k0gri6",
9494
"type": "tarball",
95-
"url": "https://github.com/j-mueller/cardano-wallet/archive/6be73ab852c0592713dfe78218856d4a8a0ee69e.tar.gz",
95+
"url": "https://github.com/j-mueller/cardano-wallet/archive/760140e238a5fbca61d1b286d7a80ece058dc729.tar.gz",
9696
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
9797
},
9898
"flat": {
@@ -168,16 +168,15 @@
168168
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
169169
},
170170
"nixpkgs": {
171-
"branch": "nixpkgs-unstable",
172-
"builtin": true,
173-
"description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
174-
"homepage": "https://github.com/NixOS/nixpkgs",
171+
"branch": "release-20.03",
172+
"description": "Nix Packages collection",
173+
"homepage": "",
175174
"owner": "NixOS",
176175
"repo": "nixpkgs",
177-
"rev": "7d71001b796340b219d1bfa8552c81995017544a",
178-
"sha256": "09fv5rhnq6m770wy0wyyp8anhqsn2dyrk4c4gmka02r5600kbaiw",
176+
"rev": "6d1a044fc9ff3cc96fca5fa3ba9c158522bbf2a5",
177+
"sha256": "07a3nyrj3pwl017ig0rbn5rbmbf14gl3vqggvkyrdby01726p5fg",
179178
"type": "tarball",
180-
"url": "https://github.com/NixOS/nixpkgs/archive/7d71001b796340b219d1bfa8552c81995017544a.tar.gz",
179+
"url": "https://github.com/NixOS/nixpkgs/archive/6d1a044fc9ff3cc96fca5fa3ba9c158522bbf2a5.tar.gz",
181180
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
182181
},
183182
"nixpkgs-2009": {
@@ -218,43 +217,43 @@
218217
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
219218
},
220219
"ouroboros-network": {
221-
"branch": "1f4973f36f689d6da75b5d351fb124d66ef1057d",
220+
"branch": "master",
222221
"description": "An implementation of the Ouroboros family of consensus algorithms, with its networking support",
223222
"homepage": "",
224223
"owner": "input-output-hk",
225224
"repo": "ouroboros-network",
226-
"rev": "1f4973f36f689d6da75b5d351fb124d66ef1057d",
227-
"sha256": "186056rvzdzy4jhvamjjbcmjyr94hs5hcyr8x6a0ch21hv5f014p",
225+
"rev": "d613de3d872ec8b4a5da0c98afb443f322dc4dab",
226+
"sha256": "0lfbipfdrzay8v1pcazx0qgkda3d1j0505yig9jrml9j7991rmhl",
228227
"type": "tarball",
229-
"url": "https://github.com/input-output-hk/ouroboros-network/archive/1f4973f36f689d6da75b5d351fb124d66ef1057d.tar.gz",
228+
"url": "https://github.com/input-output-hk/ouroboros-network/archive/d613de3d872ec8b4a5da0c98afb443f322dc4dab.tar.gz",
230229
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
231230
},
232231
"plutus": {
233-
"branch": "3f089ccf0ca746b399c99afe51e063b0640af547",
232+
"branch": "master",
234233
"description": "The Plutus language implementation and tools",
235234
"homepage": "",
236235
"owner": "input-output-hk",
237236
"repo": "plutus",
238-
"rev": "c8c5183f7facd967d48fe07b3b14465b8dd48fe7",
239-
"sha256": "01fmakdp589h9nllc31s3mkys6gic6ba38s9r3ycfb9r1j5n1cja",
237+
"rev": "65bad0fd53e432974c3c203b1b1999161b6c2dce",
238+
"sha256": "03x5vsjlbj4favghwrb14n6bkiwpypzjinw94hj7klai3xcj8pyj",
240239
"type": "tarball",
241-
"url": "https://github.com/input-output-hk/plutus/archive/c8c5183f7facd967d48fe07b3b14465b8dd48fe7.tar.gz",
240+
"url": "https://github.com/input-output-hk/plutus/archive/65bad0fd53e432974c3c203b1b1999161b6c2dce.tar.gz",
242241
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
243242
},
244243
"plutus-apps": {
245-
"branch": "7f7aca8500105d3a0830b40627f1821c9ac7b58e",
246-
"description": "The Plutus application platform",
247-
"homepage": null,
244+
"branch": "master",
245+
"description": "The Plutus Application Framework",
246+
"homepage": "",
248247
"owner": "input-output-hk",
249248
"repo": "plutus-apps",
250-
"rev": "75a581c6eb98d36192ce3d3f86ea60a04bc4a52a",
251-
"sha256": "06f0ghj3v2q6gh73kgsr3vqbhr7f7gkbar0c9ry3jmmxny30q6dv",
249+
"rev": "34fe6eeff441166fee0cd0ceba68c1439f0e93d2",
250+
"sha256": "1hs1h1bn86cb752lzswxbwjb0cyw2fayy5g723z3hdk8k91dhhji",
252251
"type": "tarball",
253-
"url": "https://github.com/input-output-hk/plutus-apps/archive/75a581c6eb98d36192ce3d3f86ea60a04bc4a52a.tar.gz",
252+
"url": "https://github.com/input-output-hk/plutus-apps/archive/34fe6eeff441166fee0cd0ceba68c1439f0e93d2.tar.gz",
254253
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
255254
},
256255
"purescript-bridge": {
257-
"branch": "366fc70b341e2633f3ad0158a577d52e1cd2b138",
256+
"branch": "master",
258257
"description": "Create PureScript datatypes from Haskell datatypes",
259258
"homepage": null,
260259
"owner": "input-output-hk",
@@ -266,7 +265,7 @@
266265
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
267266
},
268267
"servant-purescript": {
269-
"branch": "ebea59c7bdfc0338d83fca772b9a57e28560bcde",
268+
"branch": "master",
270269
"description": "Translate servant API to purescript code, with the help of purescript-bridge.",
271270
"homepage": null,
272271
"owner": "input-output-hk",

0 commit comments

Comments
 (0)