From 589860b8420d5a1eeab792523ec9fbbac95c0fa0 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Mon, 24 Oct 2022 11:49:32 +0200
Subject: [PATCH] Revert "pkgs: add lnd 0.15.2"

This reverts commit cf836b5d3b75a6c634391aa78a0113f540e637b9.
---
 pkgs/default.nix    |  5 -----
 pkgs/lnd-0.15.2.nix | 40 ----------------------------------------
 pkgs/pinned.nix     |  1 +
 3 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 pkgs/lnd-0.15.2.nix

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 95d397c..21ede79 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -37,10 +37,5 @@ let self = {
 
   pinned = import ./pinned.nix pkgs pkgsUnstable;
 
-  # TODO-EXTERNAL:
-  # Remove this when https://github.com/NixOS/nixpkgs/pull/195337 is available in the
-  # nixpkgs-unstable channel
-  lnd = pkgsUnstable.callPackage ./lnd-0.15.2.nix {};
-
   modulesPkgs = self // self.pinned;
 }; in self
diff --git a/pkgs/lnd-0.15.2.nix b/pkgs/lnd-0.15.2.nix
deleted file mode 100644
index bb91e14..0000000
--- a/pkgs/lnd-0.15.2.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.2-beta";
-
-  src = fetchFromGitHub {
-    owner = "lightningnetwork";
-    repo = "lnd";
-    rev = "v${version}";
-    sha256 = "sha256-C7BZ6awY2v5Uvvh12YEosoEQyJoetWzH/1wIQSVjtEk=";
-  };
-
-  vendorSha256 = "sha256-rCdcPkgrFcDfLfF8wipFws7YTKEgotuVqVIJYLMOxbs=";
-
-  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)