From c263aec3357eeded8623b5edcda37ad19c2a4d13 Mon Sep 17 00:00:00 2001
From: Jonas Nick <jonasd.nick@gmail.com>
Date: Thu, 10 Nov 2022 10:56:12 +0000
Subject: [PATCH] Revert "pkgs: add lnd 0.15.4 (hotfix)"

This reverts commit 57b76d44613d3b71e01c8cb1a97bd77ce66524f7.
---
 pkgs/default.nix    |  4 ----
 pkgs/lnd-0.15.4.nix | 40 ----------------------------------------
 pkgs/pinned.nix     |  1 +
 3 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 pkgs/lnd-0.15.4.nix

diff --git a/pkgs/default.nix b/pkgs/default.nix
index c142a9f..21ede79 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -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
diff --git a/pkgs/lnd-0.15.4.nix b/pkgs/lnd-0.15.4.nix
deleted file mode 100644
index a5cc743..0000000
--- a/pkgs/lnd-0.15.4.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ buildGoModule
-, fetchFromGitHub
-, lib
-, tags ? [ "autopilotrpc" "signrpc" "walletrpc" "chainrpc" "invoicesrpc" "watchtowerrpc" "routerrpc" "monitoring" "kvdb_postgres" "kvdb_etcd" ]
-}:
-
-buildGoModule rec {
-  pname = "lnd";
-  version = "0.15.4-beta";
-
-  src = fetchFromGitHub {
-    owner = "lightningnetwork";
-    repo = "lnd";
-    rev = "v${version}";
-    sha256 = "sha256-/PKW2Y6+PlWk88pC4DHFi1ZRqMfQzoO9MVLYZrB2UNc=";
-  };
-
-  vendorSha256 = "sha256-bUo0PhtOFhsZfhAXtRJMjfaLrAsOv3ksxsrPOlMNv48=";
-
-  subPackages = [ "cmd/lncli" "cmd/lnd" ];
-
-  preBuild = let
-    buildVars = {
-      RawTags = lib.concatStringsSep "," tags;
-      GoVersion = "$(go version | egrep -o 'go[0-9]+[.][^ ]*')";
-    };
-    buildVarsFlags = lib.concatStringsSep " " (lib.mapAttrsToList (k: v: "-X github.com/lightningnetwork/lnd/build.${k}=${v}") buildVars);
-  in
-  lib.optionalString (tags != []) ''
-    buildFlagsArray+=("-tags=${lib.concatStringsSep " " tags}")
-    buildFlagsArray+=("-ldflags=${buildVarsFlags}")
-  '';
-
-  meta = with lib; {
-    description = "Lightning Network Daemon";
-    homepage = "https://github.com/lightningnetwork/lnd";
-    license = licenses.mit;
-    maintainers = with maintainers; [ cypherpunk2140 prusnak ];
-  };
-}
diff --git a/pkgs/pinned.nix b/pkgs/pinned.nix
index 868d3fe..1ff832b 100644
--- a/pkgs/pinned.nix
+++ b/pkgs/pinned.nix
@@ -6,6 +6,7 @@ pkgs: pkgsUnstable:
     bitcoind
     extra-container
     lightning-pool
+    lnd
     lndconnect;
 
   inherit (pkgsUnstable)