Skip to content

Commit 32680ae

Browse files
authored
Merge pull request #3229 from input-output-hk/chore/LW-11505-new-cardano-wallet
[LW-11505] Update `cardano-node` to 10.1.2
2 parents 7edef6a + 9ca544d commit 32680ae

File tree

5 files changed

+19
-33
lines changed

5 files changed

+19
-33
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## vNext
44

5+
### Chores
6+
7+
- Update `cardano-node` to 10.1.1 via `cardano-wallet` v2024-11-18 ([PR 3229](https://github.com/input-output-hk/daedalus/pull/3229))
8+
59
## 6.0.2
610

711
### Fixes

flake.lock

Lines changed: 8 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33

44
inputs = {
55
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-22.11-darwin";
6-
cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2024-07-27";
6+
cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2024-11-18";
77
cardano-wallet-unpatched.flake = false; # otherwise, +10k quadratic dependencies in flake.lock…
8-
cardano-node-override.url = "github:IntersectMBO/cardano-node/9.1.1";
9-
cardano-node-override.flake = false;
10-
cardano-playground.url = "github:input-output-hk/cardano-playground/next-2024-07-24";
8+
cardano-playground.url = "github:input-output-hk/cardano-playground/49d93e5fe42e1e37f8b4c7d463b5d6bc4af65f26";
119
cardano-playground.flake = false; # otherwise, +9k dependencies in flake.lock…
1210
cardano-shell.url = "github:input-output-hk/cardano-shell/0d1d5f036c73d18e641412d2c58d4acda592d493";
1311
cardano-shell.flake = false;

installers/common/WindowsInstaller.hs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,6 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{installDirecto
231231
file [] "genesis-alonzo.json"
232232
file [] "libsodium-23.dll"
233233
file [] "libsecp256k1-2.dll"
234-
file [] "libssl-3-x64.dll"
235-
file [] "libcrypto-3-x64.dll"
236234
when (clusterName == Selfnode) $ do
237235
file [] "signing.key"
238236
file [] "delegation.cert"
@@ -242,10 +240,14 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{installDirecto
242240
file [] "mock-token-metadata-server.exe"
243241
file [] "token-metadata.json"
244242
file [] "cardano-launcher.exe"
243+
file [] "libatomic-1.dll"
245244
file [] "libffi-8.dll"
246245
file [] "libgmp-10.dll"
247246
file [] "libstdc++-6.dll"
248247
file [] "mcfgthread-12.dll"
248+
file [] "libmcfgthread-1.dll"
249+
file [] "libquadmath-0.dll"
250+
file [] "libssp-0.dll"
249251
file [] "libgcc_s_seh-1.dll"
250252
file [] "zlib1.dll"
251253
--file [] "cardano-x509-certificates.exe"

nix/internal/common.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ rec {
4040
}).defaultNix;
4141

4242
nodeFlake = let
43-
unpatched = inputs.cardano-node-override;
43+
unpatched = walletFlake.inputs.cardano-node-runtime;
4444
in (flake-compat {
4545
src = {
4646
outPath = toString (pkgs.runCommand "source" {} ''

0 commit comments

Comments
 (0)