Skip to content

Commit b882f04

Browse files
authored
Merge pull request #3045 from input-output-hk/chore/ddw-1150-new-cardano-wallet
[DDW-1150] Integrate `cardano-wallet` v2022-10-06
2 parents 0fbd1a0 + 9378af6 commit b882f04

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010

1111
### Chores
1212

13-
- Changed japanese translations in delegate screen ([PR 3044](https://github.com/input-output-hk/daedalus/pull/3044))
13+
- Updated `cardano-wallet` to v2022-10-06 ([PR 3045](https://github.com/input-output-hk/daedalus/pull/3045))
14+
- Changed Japanese translations in delegate screen ([PR 3044](https://github.com/input-output-hk/daedalus/pull/3044))
1415
- Updated trezor-connect to v9 ([PR 3038](https://github.com/input-output-hk/daedalus/pull/3038))
1516
- Added analytics data collection ([PR 2927](https://github.com/input-output-hk/daedalus/pull/2927), [PR 2989](https://github.com/input-output-hk/daedalus/pull/2989), [PR 3003](https://github.com/input-output-hk/daedalus/pull/3003), [PR 3028](https://github.com/input-output-hk/daedalus/pull/3028))
1617
- Updated LedgerJS to 5.1.0 ([PR 3036](https://github.com/input-output-hk/daedalus/pull/3036))

default.nix

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,15 @@ let
3232
};
3333
pkgs = import sources.nixpkgs { inherit system config; };
3434
sources = localLib.sources // {
35-
cardano-wallet = pkgs.runCommand "cardano-wallet" {} ''
36-
cp -r ${localLib.sources.cardano-wallet} $out
37-
chmod -R +w $out
38-
cd $out
39-
patch -p1 -i ${./nix/cardano-wallet--enable-aarch64-darwin.patch}
40-
'';
35+
cardano-wallet =
36+
if target != "aarch64-darwin"
37+
then localLib.sources.cardano-wallet
38+
else pkgs.runCommand "cardano-wallet" {} ''
39+
cp -r ${localLib.sources.cardano-wallet} $out
40+
chmod -R +w $out
41+
cd $out
42+
patch -p1 -i ${./nix/cardano-wallet--enable-aarch64-darwin.patch}
43+
'';
4144
};
4245
haskellNix = import sources."haskell.nix" {};
4346
inherit (import haskellNix.sources.nixpkgs-unstable haskellNix.nixpkgsArgs) haskell-nix;

nix/sources.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
2525
},
2626
"cardano-wallet": {
27-
"branch": "v2022-08-16",
27+
"branch": "v2022-10-06",
2828
"description": "Official Wallet Backend & API for Cardano decentralized",
2929
"homepage": null,
3030
"owner": "input-output-hk",
3131
"repo": "cardano-wallet",
32-
"rev": "afe575663a866c612b4a4dc3a90a8a700e387a86",
33-
"sha256": "03shbj5kxvcb22k1bvfcv9q529lg47g9y9pvvwkyb2jy285rwyhv",
32+
"rev": "2130fe0acf19fa218cef8de4ef325ae9078e356e",
33+
"sha256": "0d0wk6n7vij4qkp2qml5qdghk41dvm1078ps48673waf4cxjxaz0",
3434
"type": "tarball",
35-
"url": "https://github.com/input-output-hk/cardano-wallet/archive/afe575663a866c612b4a4dc3a90a8a700e387a86.tar.gz",
35+
"url": "https://github.com/input-output-hk/cardano-wallet/archive/2130fe0acf19fa218cef8de4ef325ae9078e356e.tar.gz",
3636
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
3737
},
3838
"cardano-world": {

0 commit comments

Comments
 (0)