Merge #606: Update nixpkgs

9f3daab lnd: fix cert key format bug (Erik Arvstedt) 744d8fe update nixpkgs (Erik Arvstedt) Pull request description: ACKs for top commit: jonasnick: ACK 9f3daab Tree-SHA512: eb99133c495d9e0df6ba50efb9c693a94883467845aa30537fbb7f40c60c36acb414d1865653ad33a3a05ac2e0dbfcfdc54039754aa54e83f60b9b3f071c7640
fort-nix · May 7, 2023 · 30c874d · 30c874d
2 parents 490146f + 9f3daab
commit 30c874d
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 11 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -22,6 +22,11 @@ let self = {
   spark-wallet = pkgs.callPackage ./spark-wallet { };
   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

diff --git a/pkgs/lnd/default.nix b/pkgs/lnd/default.nix
@@ -0,0 +1,12 @@
+{ 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/pull/7672.patch";
+      hash = "sha256-j9EirxyNi48DGzLuHcZ36LrFlbJLXrE8L+1TYh5Yznk=";
+    })
+  ];
+})
diff --git a/pkgs/pinned.nix b/pkgs/pinned.nix
@@ -5,7 +5,6 @@ pkgs: pkgsUnstable:
     bitcoin
     bitcoind
     extra-container
-    lightning-loop
     lightning-pool
     lndconnect;
 
@@ -17,7 +16,7 @@ pkgs: pkgsUnstable:
     elementsd
     fulcrum
     hwi
-    lnd
+    lightning-loop
     nbxplorer;
 
   inherit pkgs pkgsUnstable;

diff --git a/test/nixos-search/flake.lock b/test/nixos-search/flake.lock