Skip to content

Commit fc514b6

Browse files
committed
[DDW-1189] Use v2023-04-14; expose local-cluster therein
1 parent 1447a15 commit fc514b6

File tree

3 files changed

+50
-5
lines changed

3 files changed

+50
-5
lines changed

default.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ let
4141
chmod -R +w $out
4242
cd $out
4343
patch -p1 -i ${./nix/cardano-wallet--enable-aarch64-darwin.patch}
44+
patch -p1 -i ${./nix/cardano-wallet--expose-local-cluster.patch}
4445
'';
4546
};
4647
haskell-nix = walletFlake.inputs.haskellNix.legacyPackages.${system}.haskell-nix;
@@ -54,7 +55,7 @@ let
5455
}.${target};
5556
walletUnpacked = pkgs.runCommand "wallet-unpacked" {} ''
5657
mkdir -p $out/bin
57-
${if target == "x86_64-windows" then "unzip" else "tar -xf"} ${walletRelease}/*.*
58+
${if target == "x86_64-windows" then "${pkgs.unzip}/bin/unzip" else "tar -xf"} ${walletRelease}/*.*
5859
cp cardano-wallet-*/cardano-{address,cli,node,wallet} $out/bin/
5960
'';
6061
walletPkgs = walletFlake.legacyPackages.${system}.pkgs;
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
diff --git a/flake.nix b/flake.nix
2+
index af206a740e..f64b2c0eab 100644
3+
--- a/flake.nix
4+
+++ b/flake.nix
5+
@@ -331,6 +331,7 @@
6+
linuxPackages.cardano-wallet
7+
linuxPackages.bech32
8+
linuxPackages.cardano-address
9+
+ linuxPackages.local-cluster
10+
cardano-node-1_35_4.hydraJobs.linux.musl.cardano-cli
11+
cardano-node-1_35_4.hydraJobs.linux.musl.cardano-node
12+
];
13+
@@ -339,6 +340,7 @@
14+
"cardano-wallet"
15+
"bech32"
16+
"cardano-address"
17+
+ "local-cluster"
18+
"cardano-cli"
19+
"cardano-node"
20+
];
21+
@@ -361,6 +363,7 @@
22+
windowsPackages.cardano-wallet
23+
windowsPackages.bech32
24+
windowsPackages.cardano-address
25+
+ windowsPackages.local-cluster
26+
cardano-node-1_35_4.hydraJobs.linux.windows.cardano-cli
27+
cardano-node-1_35_4.hydraJobs.linux.windows.cardano-node
28+
];
29+
@@ -387,6 +390,7 @@
30+
macOsPkgs.cardano-wallet
31+
macOsPkgs.bech32
32+
macOsPkgs.cardano-address
33+
+ macOsPkgs.local-cluster
34+
cardano-node-1_35_4.hydraJobs.macos.cardano-cli
35+
cardano-node-1_35_4.hydraJobs.macos.cardano-node
36+
];
37+
@@ -401,6 +405,7 @@
38+
macOsPkgs.cardano-wallet
39+
macOsPkgs.bech32
40+
macOsPkgs.cardano-address
41+
+ macOsPkgs.local-cluster
42+
cardano-node-1_35_4.hydraJobs.macos.cardano-cli
43+
cardano-node-1_35_4.hydraJobs.macos.cardano-node
44+
];

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": "yura/ADP-2437/select-coins-for-quit-balance-tx",
27+
"branch": "v2023-04-14",
2828
"description": "Official Wallet Backend & API for Cardano decentralized",
2929
"homepage": null,
3030
"owner": "input-output-hk",
3131
"repo": "cardano-wallet",
32-
"rev": "931a4fe9d733b4f60ee4b70f55b3b0bf05afdc85",
33-
"sha256": "050k9idzp9xmsvwd8w0bg5r630kfndmcy1x64q5nr1xv8b22zfny",
32+
"rev": "3f9055373c272a4d7b1f9f6bacc1df3b6dc906af",
33+
"sha256": "075p3jy3fx99qfxj294cxqibh1040qn99yx75yhc8an1c2hrzbkp",
3434
"type": "tarball",
35-
"url": "https://github.com/input-output-hk/cardano-wallet/archive/931a4fe9d733b4f60ee4b70f55b3b0bf05afdc85.tar.gz",
35+
"url": "https://github.com/input-output-hk/cardano-wallet/archive/3f9055373c272a4d7b1f9f6bacc1df3b6dc906af.tar.gz",
3636
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
3737
},
3838
"cardano-world": {

0 commit comments

Comments
 (0)