Merge #758: update nixpkgs

ed163fe update nixpkgs (Jonas Nick) Pull request description: ACKs for top commit: erikarvstedt: ACK ed163fe Tree-SHA512: 671d40ed9e545a8076e67c29e32f74fd071d1d0f388c57e6204120d96a8a58e92f1559ddb33620e11f1260f0843ff5ceeb49bde0cbfb966f6ecbaeabd173270f
fort-nix · Jan 21, 2025 · dc4d14e · dc4d14e
2 parents 1113d2c + ed163fe
commit dc4d14e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 26 deletions.
diff --git a/flake.lock b/flake.lock
diff --git 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
@@ -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