update nixpkgs
bitcoin: 30.2 -> 31.0 bitcoind: 30.2 -> 31.0 clboss: 0.15.1 -> 0.16.0 clightning: 25.12.1 -> 26.04.1 elementsd: 23.3.2 -> 23.3.3 lightning-loop: 0.31.5-beta -> 0.33.0-beta lightning-loop 0.31.7+ blocks until lnd's chain notifier is ready (lightninglabs/loop@bde49d7a), so the workaround sleep added in the previous commit is no longer needed for lightning-loop. The lightning-pool workaround stays — pool has no equivalent fix and isn't actively maintained. Note: nbxplorer test fails (presumed incompatibility with bitcoin 31).
This commit is contained in:
Generated
+6
-6
@@ -44,11 +44,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772822230,
|
"lastModified": 1777673416,
|
||||||
"narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=",
|
"narHash": "sha256-5c2POKPOjU40Kh0MirOdScBLG0bu9TAuPYAtPRNZMBs=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "71caefce12ba78d84fe618cf61644dce01cf3a96",
|
"rev": "26ef669cffa904b6f6832ab57b77892a37c1a671",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -76,11 +76,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772736753,
|
"lastModified": 1777826146,
|
||||||
"narHash": "sha256-au/m3+EuBLoSzWUCb64a/MZq6QUtOV8oC0D9tY2scPQ=",
|
"narHash": "sha256-wQ/iN5Zp5VIa3ebBibijPnLyKhor+xEbDy4d0goa9Zs=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "917fec990948658ef1ccd07cef2a1ef060786846",
|
"rev": "73c703c22422b8951895a960959dbbaca7296492",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -128,8 +128,6 @@ in {
|
|||||||
requires = [ "lnd.service" ];
|
requires = [ "lnd.service" ];
|
||||||
after = [ "lnd.service" "nix-bitcoin-secrets.target" ];
|
after = [ "lnd.service" "nix-bitcoin-secrets.target" ];
|
||||||
serviceConfig = nbLib.defaultHardening // {
|
serviceConfig = nbLib.defaultHardening // {
|
||||||
# TODO: temporary sleep to prevent race condition
|
|
||||||
ExecStartPre = "${pkgs.coreutils}/bin/sleep 5";
|
|
||||||
ExecStart = "${cfg.package}/bin/loopd --configfile=${configFile}";
|
ExecStart = "${cfg.package}/bin/loopd --configfile=${configFile}";
|
||||||
User = lnd.user;
|
User = lnd.user;
|
||||||
Restart = "on-failure";
|
Restart = "on-failure";
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
|
|||||||
|
|
||||||
inherit (clightning) src;
|
inherit (clightning) src;
|
||||||
|
|
||||||
cargoHash = "sha256-SjGvKeDBZzbn4TR2nbGHb3XAon0Dv4KtSlkzX+eji8c=";
|
cargoHash = "sha256-0rpr941QkDeNLQ6Se9+DbbVBCmGyU721a27XNzylpPw=";
|
||||||
|
|
||||||
depsExtraArgs = {
|
depsExtraArgs = {
|
||||||
nativeBuildInputs = [ unzip ];
|
nativeBuildInputs = [ unzip ];
|
||||||
|
|||||||
+2
-2
@@ -5,19 +5,19 @@ pkgs: pkgsUnstable: pkgs-25_05:
|
|||||||
bitcoin
|
bitcoin
|
||||||
bitcoind
|
bitcoind
|
||||||
charge-lnd
|
charge-lnd
|
||||||
clboss
|
|
||||||
electrs
|
electrs
|
||||||
extra-container
|
extra-container
|
||||||
fulcrum
|
fulcrum
|
||||||
lightning-loop
|
|
||||||
lightning-pool
|
lightning-pool
|
||||||
lndconnect;
|
lndconnect;
|
||||||
|
|
||||||
inherit (pkgsUnstable)
|
inherit (pkgsUnstable)
|
||||||
bitcoind-knots
|
bitcoind-knots
|
||||||
btcpayserver
|
btcpayserver
|
||||||
|
clboss
|
||||||
clightning
|
clightning
|
||||||
elementsd
|
elementsd
|
||||||
|
lightning-loop
|
||||||
lnd;
|
lnd;
|
||||||
|
|
||||||
inherit pkgs pkgsUnstable pkgs-25_05;
|
inherit pkgs pkgsUnstable pkgs-25_05;
|
||||||
|
|||||||
Generated
+12
-12
@@ -21,11 +21,11 @@
|
|||||||
"nixos-infra": {
|
"nixos-infra": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772134602,
|
"lastModified": 1777369279,
|
||||||
"narHash": "sha256-vqa1J2OnLoMUZ2GPLSo5T90bQoRJznad6DhBK/VcZ0w=",
|
"narHash": "sha256-ewYONJDiRt9Vc2Ar6SKyiQ0zBUSz3ws2HY9lU2NEiXM=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "infra",
|
"repo": "infra",
|
||||||
"rev": "aadf347162a2b8c9e930fb41f6fb117765e5a1d1",
|
"rev": "5ecd8f26fc30311913f1c19b29a4d8853e28123a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -44,11 +44,11 @@
|
|||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772357117,
|
"lastModified": 1777878641,
|
||||||
"narHash": "sha256-yWUQ3ho36kFIIwCGjaZFWDE2YkeQey2Y/wmqz6EZ/hQ=",
|
"narHash": "sha256-saijRTtAhxOe9ZiaPbJOCWgfnlNzksLQBK00gf7OOcg=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixos-search",
|
"repo": "nixos-search",
|
||||||
"rev": "2e659d70e7381965e012b9e75ba0ba207603be70",
|
"rev": "e9806088e52087ea6414bf4a447b345a81e03a32",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -59,11 +59,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772198003,
|
"lastModified": 1777268161,
|
||||||
"narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=",
|
"narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61",
|
"rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -131,11 +131,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770228511,
|
"lastModified": 1775636079,
|
||||||
"narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=",
|
"narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "337a4fe074be1042a35086f15481d763b8ddc0e7",
|
"rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
Reference in New Issue
Block a user