Skip to content

Commit

Permalink
[DDW-1150] Integrate cardano-wallet v2022-10-06
Browse files Browse the repository at this point in the history
  • Loading branch information
michalrus committed Oct 7, 2022
1 parent 0fbd1a0 commit 9378af6
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 11 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@

### Chores

- Changed japanese translations in delegate screen ([PR 3044](https://github.com/input-output-hk/daedalus/pull/3044))
- Updated `cardano-wallet` to v2022-10-06 ([PR 3045](https://github.com/input-output-hk/daedalus/pull/3045))
- Changed Japanese translations in delegate screen ([PR 3044](https://github.com/input-output-hk/daedalus/pull/3044))
- Updated trezor-connect to v9 ([PR 3038](https://github.com/input-output-hk/daedalus/pull/3038))
- 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))
- Updated LedgerJS to 5.1.0 ([PR 3036](https://github.com/input-output-hk/daedalus/pull/3036))
Expand Down
15 changes: 9 additions & 6 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,15 @@ let
};
pkgs = import sources.nixpkgs { inherit system config; };
sources = localLib.sources // {
cardano-wallet = pkgs.runCommand "cardano-wallet" {} ''
cp -r ${localLib.sources.cardano-wallet} $out
chmod -R +w $out
cd $out
patch -p1 -i ${./nix/cardano-wallet--enable-aarch64-darwin.patch}
'';
cardano-wallet =
if target != "aarch64-darwin"
then localLib.sources.cardano-wallet
else pkgs.runCommand "cardano-wallet" {} ''
cp -r ${localLib.sources.cardano-wallet} $out
chmod -R +w $out
cd $out
patch -p1 -i ${./nix/cardano-wallet--enable-aarch64-darwin.patch}
'';
};
haskellNix = import sources."haskell.nix" {};
inherit (import haskellNix.sources.nixpkgs-unstable haskellNix.nixpkgsArgs) haskell-nix;
Expand Down
8 changes: 4 additions & 4 deletions nix/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"cardano-wallet": {
"branch": "v2022-08-16",
"branch": "v2022-10-06",
"description": "Official Wallet Backend & API for Cardano decentralized",
"homepage": null,
"owner": "input-output-hk",
"repo": "cardano-wallet",
"rev": "afe575663a866c612b4a4dc3a90a8a700e387a86",
"sha256": "03shbj5kxvcb22k1bvfcv9q529lg47g9y9pvvwkyb2jy285rwyhv",
"rev": "2130fe0acf19fa218cef8de4ef325ae9078e356e",
"sha256": "0d0wk6n7vij4qkp2qml5qdghk41dvm1078ps48673waf4cxjxaz0",
"type": "tarball",
"url": "https://github.com/input-output-hk/cardano-wallet/archive/afe575663a866c612b4a4dc3a90a8a700e387a86.tar.gz",
"url": "https://github.com/input-output-hk/cardano-wallet/archive/2130fe0acf19fa218cef8de4ef325ae9078e356e.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"cardano-world": {
Expand Down

0 comments on commit 9378af6

Please sign in to comment.