diff --git a/flake.lock b/flake.lock index 425906b..5020ca7 100644 --- a/flake.lock +++ b/flake.lock @@ -44,11 +44,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746422338, - "narHash": "sha256-NTtKOTLQv6dPfRe00OGSywg37A1FYqldS6xiNmqBUYc=", + "lastModified": 1748037224, + "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b35d248e9206c1f3baf8de6a7683fee126364aa", + "rev": "f09dede81861f3a83f7f06641ead34f02f37597f", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1746332716, - "narHash": "sha256-VBmKSkmw9PYBCEGhBKzORjx+nwNZkPZyHcUHE21A/ws=", + "lastModified": 1747958103, + "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6b1c028bce9c89e9824cde040d6986d428296055", + "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1", "type": "github" }, "original": { diff --git a/modules/charge-lnd.nix b/modules/charge-lnd.nix index ab2348a..5e6991b 100644 --- a/modules/charge-lnd.nix +++ b/modules/charge-lnd.nix @@ -70,9 +70,6 @@ let nbLib = config.nix-bitcoin.lib; lnd = config.services.lnd; - electrs = if (config.services ? electrs) && config.services.electrs.enable - then config.services.electrs - else null; user = "charge-lnd"; group = user; @@ -113,8 +110,6 @@ in --lnddir ${dataDir}/lnddir-proxy \ --grpc ${nbLib.addressWithPort lnd.rpcAddress lnd.rpcPort} \ --config ${checkedConfig} \ - ${optionalString (electrs != null) - "--electrum-server ${nbLib.addressWithPort electrs.address electrs.port}"} \ ${escapeShellArgs cfg.extraFlags} ''; Type = "oneshot"; diff --git a/pkgs/pinned.nix b/pkgs/pinned.nix index 26426d3..1b71d26 100644 --- a/pkgs/pinned.nix +++ b/pkgs/pinned.nix @@ -2,7 +2,6 @@ pkgs: pkgsUnstable: { inherit (pkgs) - charge-lnd extra-container hwi lightning-loop @@ -14,6 +13,7 @@ pkgs: pkgsUnstable: bitcoind bitcoind-knots btcpayserver + charge-lnd clboss clightning electrs diff --git a/test/nixos-search/flake.lock b/test/nixos-search/flake.lock index 2587d3c..6353c75 100644 --- a/test/nixos-search/flake.lock +++ b/test/nixos-search/flake.lock @@ -21,11 +21,11 @@ "nixos-infra": { "flake": false, "locked": { - "lastModified": 1746309510, - "narHash": "sha256-zp+318bDhi4/3rLk6uv8hWxQAbutoYMXk5B4Wzws02g=", + "lastModified": 1748042848, + "narHash": "sha256-3UeJJqdeGaHJe7AgnjwB7R43GdEx9inAfjZsFhpYN0o=", "owner": "NixOS", "repo": "infra", - "rev": "59f6670f2ef35c66c78c05edd487eeb701d2f5f4", + "rev": "2c052657bfc9906f57d839e50cb8e910c46f8452", "type": "github" }, "original": { @@ -43,11 +43,11 @@ "npmlock2nix": "npmlock2nix" }, "locked": { - "lastModified": 1746437871, - "narHash": "sha256-/nEYTmlqRS8JNGZqFJiUndUI4541jpz30tAYDX9RPRA=", + "lastModified": 1748161251, + "narHash": "sha256-9wy83e4izDe+QWhJo6qeIwVwd/dW9pdD/gzGYNFVmXA=", "owner": "nixos", "repo": "nixos-search", - "rev": "b270e843f087f65c3d079953de15d53d7fb7aaa9", + "rev": "022d0765fd7060842e8140079774169ec986a939", "type": "github" }, "original": { @@ -58,11 +58,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746232882, - "narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "type": "github" }, "original": {