From c0ed2474b5a485018bb358690dfda7caf9613427 Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Thu, 7 Nov 2024 14:49:33 +0100 Subject: [PATCH] [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" {} ''