From 70d4d035cf2307fe6d237e778436dadcb989f226 Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Thu, 12 Sep 2024 11:21:06 +0200 Subject: [PATCH 1/7] [LW-11505] Update `cardano-wallet` to v2024-09-03 --- CHANGELOG.md | 4 ++++ flake.lock | 26 ++++---------------------- flake.nix | 4 +--- nix/internal/common.nix | 2 +- 4 files changed, 10 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15cb69436b..787f6048af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## vNext +### Chores + +- Update `cardano-wallet` to v2024-09-03 ([PR 3229](https://github.com/input-output-hk/daedalus/pull/3229)) + ## 6.0.2 ### Fixes diff --git a/flake.lock b/flake.lock index c78ed879d6..0358d0cd17 100644 --- a/flake.lock +++ b/flake.lock @@ -1,22 +1,5 @@ { "nodes": { - "cardano-node-override": { - "flake": false, - "locked": { - "lastModified": 1725255033, - "narHash": "sha256-VIwEjpaGk09+dAcKELjLSR2OP3qBCWTGHpd0SBjgbVc=", - "owner": "IntersectMBO", - "repo": "cardano-node", - "rev": "efd560070aaf042d1eb4680ae37fc607c7742319", - "type": "github" - }, - "original": { - "owner": "IntersectMBO", - "ref": "9.1.1", - "repo": "cardano-node", - "type": "github" - } - }, "cardano-playground": { "flake": false, "locked": { @@ -54,16 +37,16 @@ "cardano-wallet-unpatched": { "flake": false, "locked": { - "lastModified": 1722103243, - "narHash": "sha256-2Ilm37Lt0nnFOgVx9AFIf8go6JfKhPoE9Im7H5sscxM=", + "lastModified": 1725386444, + "narHash": "sha256-GIKkyG6NIKIBOyUa1j3mCQ8752oPy77j1u3+SCJWkEQ=", "owner": "cardano-foundation", "repo": "cardano-wallet", - "rev": "ceb90fcac0e7ddf9e30705ce1e9d5780222fc3fd", + "rev": "3bf4d7d86f900acf1d4a1c52dcf0908f4b1d3655", "type": "github" }, "original": { "owner": "cardano-foundation", - "ref": "v2024-07-27", + "ref": "v2024-09-03", "repo": "cardano-wallet", "type": "github" } @@ -118,7 +101,6 @@ }, "root": { "inputs": { - "cardano-node-override": "cardano-node-override", "cardano-playground": "cardano-playground", "cardano-shell": "cardano-shell", "cardano-wallet-unpatched": "cardano-wallet-unpatched", diff --git a/flake.nix b/flake.nix index 815c92086d..a254d5f365 100644 --- a/flake.nix +++ b/flake.nix @@ -3,10 +3,8 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-22.11-darwin"; - cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2024-07-27"; + cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2024-09-03"; cardano-wallet-unpatched.flake = false; # otherwise, +10k quadratic dependencies in flake.lock… - cardano-node-override.url = "github:IntersectMBO/cardano-node/9.1.1"; - cardano-node-override.flake = false; cardano-playground.url = "github:input-output-hk/cardano-playground/next-2024-07-24"; cardano-playground.flake = false; # otherwise, +9k dependencies in flake.lock… cardano-shell.url = "github:input-output-hk/cardano-shell/0d1d5f036c73d18e641412d2c58d4acda592d493"; diff --git a/nix/internal/common.nix b/nix/internal/common.nix index 1a4408ca6b..1c59b81927 100644 --- a/nix/internal/common.nix +++ b/nix/internal/common.nix @@ -40,7 +40,7 @@ rec { }).defaultNix; nodeFlake = let - unpatched = inputs.cardano-node-override; + unpatched = walletFlake.inputs.cardano-node-runtime; in (flake-compat { src = { outPath = toString (pkgs.runCommand "source" {} '' From 89f0a33353ab1a83bfa58b0a50a7c0950c902c2c Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Fri, 4 Oct 2024 15:29:13 +0200 Subject: [PATCH 2/7] [LW-11505] Update `cardano-node` to 9.2.0 via `cardano-wallet` v2024-09-26 --- CHANGELOG.md | 2 +- flake.lock | 16 ++++++++-------- flake.nix | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 787f6048af..2180988dd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### Chores -- Update `cardano-wallet` to v2024-09-03 ([PR 3229](https://github.com/input-output-hk/daedalus/pull/3229)) +- Update `cardano-node` to 9.2.0 via `cardano-wallet` v2024-09-26 ([PR 3229](https://github.com/input-output-hk/daedalus/pull/3229)) ## 6.0.2 diff --git a/flake.lock b/flake.lock index 0358d0cd17..2c53da15ef 100644 --- a/flake.lock +++ b/flake.lock @@ -3,17 +3,17 @@ "cardano-playground": { "flake": false, "locked": { - "lastModified": 1721869644, - "narHash": "sha256-2qPZuuXtNi7kRPCFHv1Zvno/FIH0dOyg3Zqeywt77WQ=", + "lastModified": 1727295084, + "narHash": "sha256-FaeJYpwKUHqggb9OeVoLgeXK/rw3JzRpsM28MnQcmkI=", "owner": "input-output-hk", "repo": "cardano-playground", - "rev": "c3042e1669ad9e5af43622972913614d6b934488", + "rev": "b4f47fd78beec0ea1ed880d6f0b794919e0c0463", "type": "github" }, "original": { "owner": "input-output-hk", - "ref": "next-2024-07-24", "repo": "cardano-playground", + "rev": "b4f47fd78beec0ea1ed880d6f0b794919e0c0463", "type": "github" } }, @@ -37,16 +37,16 @@ "cardano-wallet-unpatched": { "flake": false, "locked": { - "lastModified": 1725386444, - "narHash": "sha256-GIKkyG6NIKIBOyUa1j3mCQ8752oPy77j1u3+SCJWkEQ=", + "lastModified": 1727343927, + "narHash": "sha256-pWRIHb/vKvx67RN2/EC9YZSOw3GqG15sdFctbZymznA=", "owner": "cardano-foundation", "repo": "cardano-wallet", - "rev": "3bf4d7d86f900acf1d4a1c52dcf0908f4b1d3655", + "rev": "fbf16d32a63eb115835c5021b9d7b21ef701b052", "type": "github" }, "original": { "owner": "cardano-foundation", - "ref": "v2024-09-03", + "ref": "v2024-09-26", "repo": "cardano-wallet", "type": "github" } diff --git a/flake.nix b/flake.nix index a254d5f365..0269be2374 100644 --- a/flake.nix +++ b/flake.nix @@ -3,9 +3,9 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-22.11-darwin"; - cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2024-09-03"; + cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2024-09-26"; cardano-wallet-unpatched.flake = false; # otherwise, +10k quadratic dependencies in flake.lock… - cardano-playground.url = "github:input-output-hk/cardano-playground/next-2024-07-24"; + cardano-playground.url = "github:input-output-hk/cardano-playground/b4f47fd78beec0ea1ed880d6f0b794919e0c0463"; cardano-playground.flake = false; # otherwise, +9k dependencies in flake.lock… cardano-shell.url = "github:input-output-hk/cardano-shell/0d1d5f036c73d18e641412d2c58d4acda592d493"; cardano-shell.flake = false; From bf4616b0b764147fcdcdee65367c449bb52b4b27 Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Fri, 4 Oct 2024 15:29:52 +0200 Subject: [PATCH 3/7] [LW-11505] Update `cardano-node` to 9.2.1 via `cardano-wallet` v2024-09-29 --- CHANGELOG.md | 2 +- flake.lock | 8 ++++---- flake.nix | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2180988dd3..77590b60b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### Chores -- Update `cardano-node` to 9.2.0 via `cardano-wallet` v2024-09-26 ([PR 3229](https://github.com/input-output-hk/daedalus/pull/3229)) +- Update `cardano-node` to 9.2.1 via `cardano-wallet` v2024-09-29 ([PR 3229](https://github.com/input-output-hk/daedalus/pull/3229)) ## 6.0.2 diff --git a/flake.lock b/flake.lock index 2c53da15ef..faefb92d8b 100644 --- a/flake.lock +++ b/flake.lock @@ -37,16 +37,16 @@ "cardano-wallet-unpatched": { "flake": false, "locked": { - "lastModified": 1727343927, - "narHash": "sha256-pWRIHb/vKvx67RN2/EC9YZSOw3GqG15sdFctbZymznA=", + "lastModified": 1727640066, + "narHash": "sha256-VXNbKR7l4XKq3eDJ2sYr1ACYU4YXJSvppySVV7DoWMo=", "owner": "cardano-foundation", "repo": "cardano-wallet", - "rev": "fbf16d32a63eb115835c5021b9d7b21ef701b052", + "rev": "b44176d25d8d417f06aa2640513ace2d65b91b00", "type": "github" }, "original": { "owner": "cardano-foundation", - "ref": "v2024-09-26", + "ref": "v2024-09-29", "repo": "cardano-wallet", "type": "github" } diff --git a/flake.nix b/flake.nix index 0269be2374..aeb6c4d3f9 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-22.11-darwin"; - cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2024-09-26"; + cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2024-09-29"; cardano-wallet-unpatched.flake = false; # otherwise, +10k quadratic dependencies in flake.lock… cardano-playground.url = "github:input-output-hk/cardano-playground/b4f47fd78beec0ea1ed880d6f0b794919e0c0463"; cardano-playground.flake = false; # otherwise, +9k dependencies in flake.lock… From 712e24dfbbebea48f5f4ad783bdb782b6e1b2bc5 Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Mon, 4 Nov 2024 16:23:24 +0100 Subject: [PATCH 4/7] [LW-11505] Update `cardano-node` to 10.1.1 via `cardano-wallet` `ba7d3340968` --- CHANGELOG.md | 2 +- flake.lock | 16 ++++++++-------- flake.nix | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77590b60b1..6c8173d4ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### Chores -- Update `cardano-node` to 9.2.1 via `cardano-wallet` v2024-09-29 ([PR 3229](https://github.com/input-output-hk/daedalus/pull/3229)) +- Update `cardano-node` to 10.1.1 via `cardano-wallet` [`ba7d3340968`](https://github.com/cardano-foundation/cardano-wallet/commit/ba7d33409680f4e75ef260add8744dcf71f40a77) ([PR 3229](https://github.com/input-output-hk/daedalus/pull/3229)) ## 6.0.2 diff --git a/flake.lock b/flake.lock index faefb92d8b..43f4d4a321 100644 --- a/flake.lock +++ b/flake.lock @@ -3,17 +3,17 @@ "cardano-playground": { "flake": false, "locked": { - "lastModified": 1727295084, - "narHash": "sha256-FaeJYpwKUHqggb9OeVoLgeXK/rw3JzRpsM28MnQcmkI=", + "lastModified": 1730399380, + "narHash": "sha256-VxZBbgV4faFuVMheKeJAZ03qkL16mILVAnNqDbZIsAM=", "owner": "input-output-hk", "repo": "cardano-playground", - "rev": "b4f47fd78beec0ea1ed880d6f0b794919e0c0463", + "rev": "49d93e5fe42e1e37f8b4c7d463b5d6bc4af65f26", "type": "github" }, "original": { "owner": "input-output-hk", "repo": "cardano-playground", - "rev": "b4f47fd78beec0ea1ed880d6f0b794919e0c0463", + "rev": "49d93e5fe42e1e37f8b4c7d463b5d6bc4af65f26", "type": "github" } }, @@ -37,17 +37,17 @@ "cardano-wallet-unpatched": { "flake": false, "locked": { - "lastModified": 1727640066, - "narHash": "sha256-VXNbKR7l4XKq3eDJ2sYr1ACYU4YXJSvppySVV7DoWMo=", + "lastModified": 1730464953, + "narHash": "sha256-ttg60LyLHGwBX2OINHRG8NNcXBKH6MzY/ftjOOu6/NA=", "owner": "cardano-foundation", "repo": "cardano-wallet", - "rev": "b44176d25d8d417f06aa2640513ace2d65b91b00", + "rev": "ba7d33409680f4e75ef260add8744dcf71f40a77", "type": "github" }, "original": { "owner": "cardano-foundation", - "ref": "v2024-09-29", "repo": "cardano-wallet", + "rev": "ba7d33409680f4e75ef260add8744dcf71f40a77", "type": "github" } }, diff --git a/flake.nix b/flake.nix index aeb6c4d3f9..b32bcb7f50 100644 --- a/flake.nix +++ b/flake.nix @@ -3,9 +3,9 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-22.11-darwin"; - cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2024-09-29"; + cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/ba7d33409680f4e75ef260add8744dcf71f40a77"; # master on 2024-11-01 to include cardano-node 10.1.1 cardano-wallet-unpatched.flake = false; # otherwise, +10k quadratic dependencies in flake.lock… - cardano-playground.url = "github:input-output-hk/cardano-playground/b4f47fd78beec0ea1ed880d6f0b794919e0c0463"; + cardano-playground.url = "github:input-output-hk/cardano-playground/49d93e5fe42e1e37f8b4c7d463b5d6bc4af65f26"; cardano-playground.flake = false; # otherwise, +9k dependencies in flake.lock… cardano-shell.url = "github:input-output-hk/cardano-shell/0d1d5f036c73d18e641412d2c58d4acda592d493"; cardano-shell.flake = false; From c0ed2474b5a485018bb358690dfda7caf9613427 Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Thu, 7 Nov 2024 14:49:33 +0100 Subject: [PATCH 5/7] [LW-11505] Update `cardano-node` to 10.1.2 We have to override because of . --- flake.lock | 26 ++++++++++++++++++++++---- flake.nix | 4 +++- nix/internal/common.nix | 2 +- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 43f4d4a321..ff1e0b1b9f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,22 @@ { "nodes": { + "cardano-node-override": { + "flake": false, + "locked": { + "lastModified": 1730468447, + "narHash": "sha256-yNEv7MQEcOPY9I9k9RCzeMfJY6gzuGc7K53GKNHs6v8=", + "owner": "IntersectMBO", + "repo": "cardano-node", + "rev": "01bda2e2cb0a70cd95067d696dbb44665f1d680a", + "type": "github" + }, + "original": { + "owner": "IntersectMBO", + "ref": "10.1.2", + "repo": "cardano-node", + "type": "github" + } + }, "cardano-playground": { "flake": false, "locked": { @@ -37,17 +54,17 @@ "cardano-wallet-unpatched": { "flake": false, "locked": { - "lastModified": 1730464953, - "narHash": "sha256-ttg60LyLHGwBX2OINHRG8NNcXBKH6MzY/ftjOOu6/NA=", + "lastModified": 1730750355, + "narHash": "sha256-+Z+WGEK3Jmpn2oxj/RuSmVM6XenMVHhfiiEOINTCVGU=", "owner": "cardano-foundation", "repo": "cardano-wallet", - "rev": "ba7d33409680f4e75ef260add8744dcf71f40a77", + "rev": "9078093ca150d97a6a4ca09895ec123bb76227c0", "type": "github" }, "original": { "owner": "cardano-foundation", + "ref": "pull/4830/head", "repo": "cardano-wallet", - "rev": "ba7d33409680f4e75ef260add8744dcf71f40a77", "type": "github" } }, @@ -101,6 +118,7 @@ }, "root": { "inputs": { + "cardano-node-override": "cardano-node-override", "cardano-playground": "cardano-playground", "cardano-shell": "cardano-shell", "cardano-wallet-unpatched": "cardano-wallet-unpatched", diff --git a/flake.nix b/flake.nix index b32bcb7f50..988ce88e8e 100644 --- a/flake.nix +++ b/flake.nix @@ -3,8 +3,10 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-22.11-darwin"; - cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/ba7d33409680f4e75ef260add8744dcf71f40a77"; # master on 2024-11-01 to include cardano-node 10.1.1 + cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/pull/4830/head"; # cardano-node 10.1.2 cardano-wallet-unpatched.flake = false; # otherwise, +10k quadratic dependencies in flake.lock… + cardano-node-override.url = "github:IntersectMBO/cardano-node/10.1.2"; # we have to override because of + cardano-node-override.flake = false; cardano-playground.url = "github:input-output-hk/cardano-playground/49d93e5fe42e1e37f8b4c7d463b5d6bc4af65f26"; cardano-playground.flake = false; # otherwise, +9k dependencies in flake.lock… cardano-shell.url = "github:input-output-hk/cardano-shell/0d1d5f036c73d18e641412d2c58d4acda592d493"; diff --git a/nix/internal/common.nix b/nix/internal/common.nix index 1c59b81927..1a4408ca6b 100644 --- a/nix/internal/common.nix +++ b/nix/internal/common.nix @@ -40,7 +40,7 @@ rec { }).defaultNix; nodeFlake = let - unpatched = walletFlake.inputs.cardano-node-runtime; + unpatched = inputs.cardano-node-override; in (flake-compat { src = { outPath = toString (pkgs.runCommand "source" {} '' From e2ffb9a2fd5c38d638c8304001d1af8c495a531a Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Thu, 7 Nov 2024 16:33:10 +0100 Subject: [PATCH 6/7] [LW-11505] Fix the Windows installer --- installers/common/WindowsInstaller.hs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/installers/common/WindowsInstaller.hs b/installers/common/WindowsInstaller.hs index 36dde9442b..669638aa45 100644 --- a/installers/common/WindowsInstaller.hs +++ b/installers/common/WindowsInstaller.hs @@ -231,8 +231,6 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{installDirecto file [] "genesis-alonzo.json" file [] "libsodium-23.dll" file [] "libsecp256k1-2.dll" - file [] "libssl-3-x64.dll" - file [] "libcrypto-3-x64.dll" when (clusterName == Selfnode) $ do file [] "signing.key" file [] "delegation.cert" @@ -242,10 +240,14 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{installDirecto file [] "mock-token-metadata-server.exe" file [] "token-metadata.json" file [] "cardano-launcher.exe" + file [] "libatomic-1.dll" file [] "libffi-8.dll" file [] "libgmp-10.dll" file [] "libstdc++-6.dll" file [] "mcfgthread-12.dll" + file [] "libmcfgthread-1.dll" + file [] "libquadmath-0.dll" + file [] "libssp-0.dll" file [] "libgcc_s_seh-1.dll" file [] "zlib1.dll" --file [] "cardano-x509-certificates.exe" From 9ca544d5f5545f7aab6a144292f18a02c73c0a39 Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Tue, 19 Nov 2024 10:09:47 +0100 Subject: [PATCH 7/7] [LW-11505] Update `cardano-wallet` to `v2024-11-18` --- CHANGELOG.md | 2 +- flake.lock | 26 ++++---------------------- flake.nix | 4 +--- nix/internal/common.nix | 2 +- 4 files changed, 7 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c8173d4ae..d18fed5fc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### Chores -- Update `cardano-node` to 10.1.1 via `cardano-wallet` [`ba7d3340968`](https://github.com/cardano-foundation/cardano-wallet/commit/ba7d33409680f4e75ef260add8744dcf71f40a77) ([PR 3229](https://github.com/input-output-hk/daedalus/pull/3229)) +- Update `cardano-node` to 10.1.1 via `cardano-wallet` v2024-11-18 ([PR 3229](https://github.com/input-output-hk/daedalus/pull/3229)) ## 6.0.2 diff --git a/flake.lock b/flake.lock index ff1e0b1b9f..0df724831d 100644 --- a/flake.lock +++ b/flake.lock @@ -1,22 +1,5 @@ { "nodes": { - "cardano-node-override": { - "flake": false, - "locked": { - "lastModified": 1730468447, - "narHash": "sha256-yNEv7MQEcOPY9I9k9RCzeMfJY6gzuGc7K53GKNHs6v8=", - "owner": "IntersectMBO", - "repo": "cardano-node", - "rev": "01bda2e2cb0a70cd95067d696dbb44665f1d680a", - "type": "github" - }, - "original": { - "owner": "IntersectMBO", - "ref": "10.1.2", - "repo": "cardano-node", - "type": "github" - } - }, "cardano-playground": { "flake": false, "locked": { @@ -54,16 +37,16 @@ "cardano-wallet-unpatched": { "flake": false, "locked": { - "lastModified": 1730750355, - "narHash": "sha256-+Z+WGEK3Jmpn2oxj/RuSmVM6XenMVHhfiiEOINTCVGU=", + "lastModified": 1731946435, + "narHash": "sha256-vCnp2dV+mAQIt25i8VRYNmLHAH1YZfK1bsBNNrvqJSo=", "owner": "cardano-foundation", "repo": "cardano-wallet", - "rev": "9078093ca150d97a6a4ca09895ec123bb76227c0", + "rev": "9eb5f59c328163ca061a20f47519686b6f118d74", "type": "github" }, "original": { "owner": "cardano-foundation", - "ref": "pull/4830/head", + "ref": "v2024-11-18", "repo": "cardano-wallet", "type": "github" } @@ -118,7 +101,6 @@ }, "root": { "inputs": { - "cardano-node-override": "cardano-node-override", "cardano-playground": "cardano-playground", "cardano-shell": "cardano-shell", "cardano-wallet-unpatched": "cardano-wallet-unpatched", diff --git a/flake.nix b/flake.nix index 988ce88e8e..0e2f2f8bee 100644 --- a/flake.nix +++ b/flake.nix @@ -3,10 +3,8 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-22.11-darwin"; - cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/pull/4830/head"; # cardano-node 10.1.2 + cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2024-11-18"; cardano-wallet-unpatched.flake = false; # otherwise, +10k quadratic dependencies in flake.lock… - cardano-node-override.url = "github:IntersectMBO/cardano-node/10.1.2"; # we have to override because of - cardano-node-override.flake = false; cardano-playground.url = "github:input-output-hk/cardano-playground/49d93e5fe42e1e37f8b4c7d463b5d6bc4af65f26"; cardano-playground.flake = false; # otherwise, +9k dependencies in flake.lock… cardano-shell.url = "github:input-output-hk/cardano-shell/0d1d5f036c73d18e641412d2c58d4acda592d493"; diff --git a/nix/internal/common.nix b/nix/internal/common.nix index 1a4408ca6b..1c59b81927 100644 --- a/nix/internal/common.nix +++ b/nix/internal/common.nix @@ -40,7 +40,7 @@ rec { }).defaultNix; nodeFlake = let - unpatched = inputs.cardano-node-override; + unpatched = walletFlake.inputs.cardano-node-runtime; in (flake-compat { src = { outPath = toString (pkgs.runCommand "source" {} ''