Merge fort-nix/nix-bitcoin#654: update nixpkgs

1fad7c730b update nixpkgs (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 1fad7c730b

Tree-SHA512: 41cd3482e7878daa1152be2e982a2c8a07c464127d670e0e70ab0f80e6ac819b5714c8162efa3b35f7a9bd2633f0a25508044c1b7f60e6a34fdf07f3c0e07333

flake.lock

@@ -43,11 +43,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1694753796,
-        "narHash": "sha256-QPE7dqcicQH/nq9aywVXJWWtci4FvxHaM+BSIEbGBvA=",
+        "lastModified": 1697226376,
+        "narHash": "sha256-cumLLb1QOUtWieUnLGqo+ylNt3+fU8Lcv5Zl+tYbRUE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "360a7d31c30abefdc490d203f80e3221b7a24af2",
+        "rev": "898cb2064b6e98b8c5499f37e81adbdf2925f7c5",
         "type": "github"
       },
       "original": {
@@ -59,11 +59,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1694760568,
-        "narHash": "sha256-3G07BiXrp2YQKxdcdms22MUx6spc6A++MSePtatCYuI=",
+        "lastModified": 1697379843,
+        "narHash": "sha256-RcnGuJgC2K/UpTy+d32piEoBXq2M+nVFzM3ah/ZdJzg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "46688f8eb5cd6f1298d873d4d2b9cf245e09e88e",
+        "rev": "12bdeb01ff9e2d3917e6a44037ed7df6e6c3df9d",
         "type": "github"
       },
       "original": {

pkgs/default.nix

@@ -34,11 +34,6 @@ let self = {
   secp256k1 = pkgs.callPackage ./secp256k1 { };
   trustedcoin = pkgs.callPackage ./trustedcoin { };
 
-  # TODO-EXTERNAL:
-  # Remove this when https://github.com/lightningnetwork/lnd/pull/7672
-  # has been resolved
-  lnd = pkgsUnstable.callPackage ./lnd { };
-
   pyPkgs = import ./python-packages self pkgs.python3;
   inherit (self.pyPkgs)
     nbPython3Packages

pkgs/lnd/default.nix

@@ -1,12 +0,0 @@
-{ lnd, fetchpatch }:
-
-lnd.overrideAttrs (_: {
-  patches = [
-    (fetchpatch {
-      # https://github.com/lightningnetwork/lnd/pull/7672
-      name = "fix-PKCS8-cert-key-support";
-      url = "https://github.com/lightningnetwork/lnd/commit/bfdd5db0d97a6d65489d980a917bbd2243dfe15c.patch";
-      hash = "sha256-j9EirxyNi48DGzLuHcZ36LrFlbJLXrE8L+1TYh5Yznk=";
-    })
-  ];
-})

pkgs/pinned.nix

@@ -6,15 +6,16 @@ pkgs: pkgsUnstable:
     electrs
     elementsd
     extra-container
-    fulcrum
     lndconnect;
 
   inherit (pkgsUnstable)
     btcpayserver
     clightning
+    fulcrum
     hwi
     lightning-loop
     lightning-pool
+    lnd
     nbxplorer;
 
   inherit pkgs pkgsUnstable;