From 4c22a3c594cbb4d2efdb6f3e75d6ff10a8153333 Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Mon, 9 Mar 2026 08:25:53 +0000 Subject: [PATCH] update nixpkgs bitcoin: 30.0 -> 30.2 bitcoind: 30.0 -> 30.2 bitcoind-knots: 29.2.knots20251110 -> 29.3.knots20260210 btcpayserver: 2.2.1 -> 2.3.4 clightning: 25.09.2 -> 25.12.1 elementsd: 23.2.4 -> 23.3.2 lnd: 0.19.3-beta -> 0.20.1-beta lnd 0.20 makes its chain notifier subsystem ready later in startup than its RPC server. lightning-loop and lightning-pool both subscribe to chain notifications right after dialing lnd, which fails before the notifier is up and crashes the daemon. Add a 5s ExecStartPre sleep to both services as a temporary workaround. --- flake.lock | 18 +++++++++--------- modules/lightning-loop.nix | 2 ++ modules/lightning-pool.nix | 2 ++ pkgs/clnrest/default.nix | 2 +- pkgs/pinned.nix | 11 +++++------ pkgs/python-packages/default.nix | 16 +++++++++------- test/nixos-search/flake.lock | 24 ++++++++++++------------ 7 files changed, 40 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index 628df50..c562670 100644 --- a/flake.lock +++ b/flake.lock @@ -44,11 +44,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767480499, - "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=", + "lastModified": 1772822230, + "narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92", + "rev": "71caefce12ba78d84fe618cf61644dce01cf3a96", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "nixpkgs-25_05": { "locked": { - "lastModified": 1767051569, - "narHash": "sha256-0MnuWoN+n1UYaGBIpqpPs9I9ZHW4kynits4mrnh1Pk4=", + "lastModified": 1767313136, + "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "40ee5e1944bebdd128f9fbada44faefddfde29bd", + "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", "type": "github" }, "original": { @@ -76,11 +76,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1767364772, - "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", + "lastModified": 1772736753, + "narHash": "sha256-au/m3+EuBLoSzWUCb64a/MZq6QUtOV8oC0D9tY2scPQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", + "rev": "917fec990948658ef1ccd07cef2a1ef060786846", "type": "github" }, "original": { diff --git a/modules/lightning-loop.nix b/modules/lightning-loop.nix index e84d7b9..1bbaf0c 100644 --- a/modules/lightning-loop.nix +++ b/modules/lightning-loop.nix @@ -128,6 +128,8 @@ in { requires = [ "lnd.service" ]; after = [ "lnd.service" "nix-bitcoin-secrets.target" ]; serviceConfig = nbLib.defaultHardening // { + # TODO: temporary sleep to prevent race condition + ExecStartPre = "${pkgs.coreutils}/bin/sleep 5"; ExecStart = "${cfg.package}/bin/loopd --configfile=${configFile}"; User = lnd.user; Restart = "on-failure"; diff --git a/modules/lightning-pool.nix b/modules/lightning-pool.nix index 3206656..bf760e6 100644 --- a/modules/lightning-pool.nix +++ b/modules/lightning-pool.nix @@ -99,6 +99,8 @@ in { ln -sfn ${configFile} '${cfg.dataDir}/${network}/poold.conf' ''; serviceConfig = nbLib.defaultHardening // { + # TODO: temporary sleep to prevent race condition + ExecStartPre = "${pkgs.coreutils}/bin/sleep 5"; ExecStart = "${cfg.package}/bin/poold --basedir='${cfg.dataDir}' --network=${network}"; User = "lnd"; Restart = "on-failure"; diff --git a/pkgs/clnrest/default.nix b/pkgs/clnrest/default.nix index ee61ec1..d7fcbf9 100644 --- a/pkgs/clnrest/default.nix +++ b/pkgs/clnrest/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { inherit (clightning) src; - cargoHash = "sha256-2xOLwj42Ua85+kn73y+5q3YmzKYMCjxLlq/UrYjiZv0="; + cargoHash = "sha256-SjGvKeDBZzbn4TR2nbGHb3XAon0Dv4KtSlkzX+eji8c="; depsExtraArgs = { nativeBuildInputs = [ unzip ]; diff --git a/pkgs/pinned.nix b/pkgs/pinned.nix index fb96187..f2cf864 100644 --- a/pkgs/pinned.nix +++ b/pkgs/pinned.nix @@ -4,22 +4,21 @@ pkgs: pkgsUnstable: pkgs-25_05: inherit (pkgs) bitcoin bitcoind - bitcoind-knots - btcpayserver charge-lnd clboss - clightning electrs - elementsd extra-container fulcrum lightning-loop lightning-pool - lnd lndconnect; inherit (pkgsUnstable) - ; + bitcoind-knots + btcpayserver + clightning + elementsd + lnd; inherit pkgs pkgsUnstable pkgs-25_05; } diff --git a/pkgs/python-packages/default.nix b/pkgs/python-packages/default.nix index 78de859..e254bea 100644 --- a/pkgs/python-packages/default.nix +++ b/pkgs/python-packages/default.nix @@ -59,13 +59,15 @@ rec { in { hwi = with python3PackagesWithUnlockedEcdsa; toPythonApplication hwi; - # trezor 0.13.10 supports click 8.2.x. - # The version spec `click>=8,<8.3` has been copied from trezor 0.20.0-dev. - trezor = python3PackagesWithUnlockedEcdsa.trezor.overridePythonAttrs (_: { - postPatch = '' - substituteInPlace requirements.txt \ - --replace-fail 'click>=7,<8.2' 'click>=8,<8.3' - ''; + # nixpkgs has keyring 25.6.0, but trezor 0.20.0 requires >= 25.7.0. + # 25.7.0 only adds KWallet 6 support and removes Python 3.8 cruft, + # so 25.6.0 is functionally equivalent for trezor's use. + # Relax the constraint until nixpkgs updates keyring. + trezor = python3PackagesWithUnlockedEcdsa.trezor.overridePythonAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ + python3PackagesWithUnlockedEcdsa.pythonRelaxDepsHook + ]; + pythonRelaxDeps = [ "keyring" ]; }); }; } diff --git a/test/nixos-search/flake.lock b/test/nixos-search/flake.lock index 728e8c6..b094289 100644 --- a/test/nixos-search/flake.lock +++ b/test/nixos-search/flake.lock @@ -21,11 +21,11 @@ "nixos-infra": { "flake": false, "locked": { - "lastModified": 1767225854, - "narHash": "sha256-RESYvk2PXt6SkYG6UnPSlMcSEAQpabiKha1lkv/NtT4=", + "lastModified": 1772134602, + "narHash": "sha256-vqa1J2OnLoMUZ2GPLSo5T90bQoRJznad6DhBK/VcZ0w=", "owner": "NixOS", "repo": "infra", - "rev": "cfa5982b9961fccd252ff550213a0eb00c77f6f8", + "rev": "aadf347162a2b8c9e930fb41f6fb117765e5a1d1", "type": "github" }, "original": { @@ -44,11 +44,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1767372151, - "narHash": "sha256-JOQu3GRk3hWsJilqJ8XgKKD2BHvve3FTfzDYxJV9Btc=", + "lastModified": 1772357117, + "narHash": "sha256-yWUQ3ho36kFIIwCGjaZFWDE2YkeQey2Y/wmqz6EZ/hQ=", "owner": "nixos", "repo": "nixos-search", - "rev": "9bce76e857f6874ede35d1065c39da42b1a70e2a", + "rev": "2e659d70e7381965e012b9e75ba0ba207603be70", "type": "github" }, "original": { @@ -59,11 +59,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1765472234, - "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", + "lastModified": 1772198003, + "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", + "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", "type": "github" }, "original": { @@ -131,11 +131,11 @@ ] }, "locked": { - "lastModified": 1762938485, - "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", + "lastModified": 1770228511, + "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", + "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7", "type": "github" }, "original": {