From ed163fece1bcd40247f7d2e2b43f353c471e00fb Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Tue, 21 Jan 2025 16:06:41 +0000 Subject: [PATCH] update nixpkgs bitcoin: 28.0 -> 28.1 bitcoind: 28.0 -> 28.1 clightning: 24.11 -> 24.11.1 electrs: 0.10.7 -> 0.10.8 extra-container: 0.12 -> 0.13 lnd: 0.18.3-beta -> 0.18.4-beta --- flake.lock | 12 ++++++------ modules/lnd.nix | 6 ------ pkgs/pinned.nix | 10 +++++----- test/nixos-search/flake.lock | 18 +++++++++--------- 4 files changed, 20 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index eda1fba..2299a65 100644 --- a/flake.lock +++ b/flake.lock @@ -44,11 +44,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734323986, - "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", + "lastModified": 1737299813, + "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "394571358ce82dff7411395829aa6a3aad45b907", + "rev": "107d5ef05c0b1119749e381451389eded30fb0d5", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1734126203, - "narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=", + "lastModified": 1737370608, + "narHash": "sha256-hFA6SmioeqvGW/XvZa9bxniAeulksCOcj3kokdNT/YE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71a6392e367b08525ee710a93af2e80083b5b3e2", + "rev": "300081d0cc72df578b02d914df941b8ec62240e6", "type": "github" }, "original": { diff --git a/modules/lnd.nix b/modules/lnd.nix index 21f6717..05c8c7b 100644 --- a/modules/lnd.nix +++ b/modules/lnd.nix @@ -211,12 +211,6 @@ in { zmqpubrawblock = mkDefault "tcp://${bitcoindRpcAddress}:28332"; zmqpubrawtx = mkDefault "tcp://${bitcoindRpcAddress}:28333"; - - # TODO-EXTERNAL: remove when https://github.com/lightningnetwork/lnd/issues/9163 - # has been fixed. - extraConfig = '' - deprecatedrpc=warnings - ''; }; environment.systemPackages = [ cfg.package (hiPrio cfg.cli) ]; diff --git a/pkgs/pinned.nix b/pkgs/pinned.nix index d76438d..3746d64 100644 --- a/pkgs/pinned.nix +++ b/pkgs/pinned.nix @@ -2,24 +2,24 @@ pkgs: pkgsUnstable: { inherit (pkgs) - bitcoin - bitcoind btcpayserver charge-lnd - extra-container fulcrum hwi lightning-loop lightning-pool - lnd lndconnect nbxplorer; inherit (pkgsUnstable) + bitcoin + bitcoind clboss clightning electrs - elementsd; + elementsd + extra-container + lnd; inherit pkgs pkgsUnstable; } diff --git a/test/nixos-search/flake.lock b/test/nixos-search/flake.lock index 16fb214..3a5b64b 100644 --- a/test/nixos-search/flake.lock +++ b/test/nixos-search/flake.lock @@ -21,11 +21,11 @@ "nixos-infra": { "flake": false, "locked": { - "lastModified": 1733506865, - "narHash": "sha256-vI4fLD2lEj09J3s/rSERNUBM0t+YjpGmmEUzhGXpngM=", + "lastModified": 1736003076, + "narHash": "sha256-QXdl4ZJd287CRuBYBPrSvLv/ib7L41HhHemvbNxDUqQ=", "owner": "NixOS", "repo": "infra", - "rev": "fadaefc936f321e6f18f9144a2b9a18b3c703644", + "rev": "e5c6c097a0d575d16f9c407738d809af1a6cd4c6", "type": "github" }, "original": { @@ -43,11 +43,11 @@ "npmlock2nix": "npmlock2nix" }, "locked": { - "lastModified": 1733672217, - "narHash": "sha256-8VqXAkRpel6e50q6cetpXlSzmxgig3zf+THgMbf3Dd4=", + "lastModified": 1736159204, + "narHash": "sha256-YwZdrHHv6GNOWtpEp02ulBIrsrOB9dG2mc42mwxp5fk=", "owner": "nixos", "repo": "nixos-search", - "rev": "381ffa11f1d22cc4421ff88fbb6e0d75a4e5de26", + "rev": "510d42d847600c0f197a233a564b428d7551f510", "type": "github" }, "original": { @@ -58,11 +58,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733392399, - "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": {