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" {} ''