Merge fort-nix/nix-bitcoin#843: update nixpkgs
5f286763b0 update nixpkgs (Jonas Nick)
Pull request description:
Top commit has no ACKs.
Tree-SHA512: 7bbe7d73ea890c4cd315e1158c0e4e75095a0c16d563f463a892445313c07b547353be957d7899396d7ecc3681f1bbddc720cf62c34668b6b4f3b914f52bfc2f
This commit is contained in:
Generated
+6
-6
@@ -44,11 +44,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1778737229,
|
"lastModified": 1782847189,
|
||||||
"narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=",
|
"narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5",
|
"rev": "b6018f87da91d19d0ab4cf979885689b469cdd41",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -76,11 +76,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1778869304,
|
"lastModified": 1784453100,
|
||||||
"narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
|
"narHash": "sha256-zpGZb8FYui+i8KLtC0nlcmb0voR2zB80Qn8pe7lzIbk=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
|
"rev": "b471514bed69eff5255c8e63c1f80e5fe56c616f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -31,6 +31,13 @@ rustPlatform.buildRustPackage rec {
|
|||||||
protobuf
|
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; {
|
meta = with lib; {
|
||||||
description = "REST plugin for clightning";
|
description = "REST plugin for clightning";
|
||||||
homepage = "https://github.com/ElementsProject/lightning/tree/master/plugins/rest-plugin";
|
homepage = "https://github.com/ElementsProject/lightning/tree/master/plugins/rest-plugin";
|
||||||
|
|||||||
+1
-1
@@ -7,7 +7,6 @@ pkgs: pkgsUnstable: pkgs-25_05:
|
|||||||
charge-lnd
|
charge-lnd
|
||||||
electrs
|
electrs
|
||||||
extra-container
|
extra-container
|
||||||
fulcrum
|
|
||||||
lightning-pool
|
lightning-pool
|
||||||
lndconnect;
|
lndconnect;
|
||||||
|
|
||||||
@@ -17,6 +16,7 @@ pkgs: pkgsUnstable: pkgs-25_05:
|
|||||||
clboss
|
clboss
|
||||||
clightning
|
clightning
|
||||||
elementsd
|
elementsd
|
||||||
|
fulcrum
|
||||||
lightning-loop
|
lightning-loop
|
||||||
lnd;
|
lnd;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user