From 5f286763b0570961aaeb03c047adff26f3d54374 Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Mon, 20 Jul 2026 13:53:58 +0000 Subject: [PATCH] update nixpkgs bitcoind-knots: 29.3.knots20260210 -> 29.3.knots20260508 fulcrum: 1.12.0.1 -> 2.1.1 lightning-loop: 0.33.0-beta -> 0.33.2-beta lnd: 0.20.1-beta -> 0.21.1-beta --- flake.lock | 12 ++++++------ pkgs/clnrest/default.nix | 7 +++++++ pkgs/pinned.nix | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 6991c37..954abe6 100644 --- a/flake.lock +++ b/flake.lock @@ -44,11 +44,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1778737229, - "narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=", + "lastModified": 1782847189, + "narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5", + "rev": "b6018f87da91d19d0ab4cf979885689b469cdd41", "type": "github" }, "original": { @@ -76,11 +76,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1778869304, - "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", + "lastModified": 1784453100, + "narHash": "sha256-zpGZb8FYui+i8KLtC0nlcmb0voR2zB80Qn8pe7lzIbk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", + "rev": "b471514bed69eff5255c8e63c1f80e5fe56c616f", "type": "github" }, "original": { diff --git a/pkgs/clnrest/default.nix b/pkgs/clnrest/default.nix index b4d668a..8848472 100644 --- a/pkgs/clnrest/default.nix +++ b/pkgs/clnrest/default.nix @@ -31,6 +31,13 @@ rustPlatform.buildRustPackage rec { protobuf ]; + # `core::lsps2::htlc::tests::polls_until_channel_ready` (in the `cln-lsps` + # workspace member) is timing-dependent: it spawns a polling task, sleeps a + # real 10 ms, then asserts the loop ran more than once. Under the parallel + # test load in CI the spawned task gets starved and the assertion fails. + # Skip this single upstream test; the remaining workspace tests still run. + checkFlags = [ "--skip=polls_until_channel_ready" ]; + meta = with lib; { description = "REST plugin for clightning"; homepage = "https://github.com/ElementsProject/lightning/tree/master/plugins/rest-plugin"; diff --git a/pkgs/pinned.nix b/pkgs/pinned.nix index b7a329f..f5760f2 100644 --- a/pkgs/pinned.nix +++ b/pkgs/pinned.nix @@ -7,7 +7,6 @@ pkgs: pkgsUnstable: pkgs-25_05: charge-lnd electrs extra-container - fulcrum lightning-pool lndconnect; @@ -17,6 +16,7 @@ pkgs: pkgsUnstable: pkgs-25_05: clboss clightning elementsd + fulcrum lightning-loop lnd;