Merge #570: Update nixpkgs

a333989 update nixpkgs (Jonas Nick)
313e374 Revert "pkgs: add lnd 0.15.4 (hotfix)" (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK a333989

Tree-SHA512: cf9a0c42002f00eadcb6e97211358210c6ab214f467b25af23c70477c40134b3d9a26c7ff00ec15d5a06f2a4bfe9832b11e6ae0faa136249c1180f5ae2e59734

Author: jonasnick

flake.lock

@@ -37,9 +37,5 @@ let self = {
 
   pinned = import ./pinned.nix pkgs pkgsUnstable;
 
-  # TODO-EXTERNAL:
-  # Remove this when lnd 0.15.4 is available in the nixpkgs-unstable channel
-  lnd = pkgsUnstable.callPackage ./lnd-0.15.4.nix {};
-
   modulesPkgs = self // self.pinned;
 }; in self

pkgs/default.nix

@@ -4,8 +4,8 @@ pkgs: pkgsUnstable:
   inherit (pkgs)
     bitcoin
     bitcoind
-    extra-container
     lightning-pool
+    lnd
     lndconnect;
 
   inherit (pkgsUnstable)
@@ -14,6 +14,7 @@ pkgs: pkgsUnstable:
     clightning
     electrs
     elementsd
+    extra-container
     fulcrum
     hwi
     lightning-loop