From 95b42b62a853970317c3f1012574ba1f6e3b5d1e Mon Sep 17 00:00:00 2001
From: Clemens Fruhwirth <clemens@endorphin.org>
Date: Tue, 26 Mar 2019 14:57:17 +0100
Subject: [PATCH] Give pkgs their own directory and convert everything to
 callPackage.

---
 modules/nix-bitcoin-pkgs.nix                | 8 ++++----
 pkgs/{ => banlist}/banlist.sh               | 0
 pkgs/{banlist.nix => banlist/default.nix}   | 0
 pkgs/{electrs.nix => electrs/default.nix}   | 0
 pkgs/{liquidd.nix => liquidd/default.nix}   | 0
 pkgs/{nodeinfo.nix => nodeinfo/default.nix} | 0
 pkgs/{ => nodeinfo}/nodeinfo.sh             | 0
 7 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/{ => banlist}/banlist.sh (100%)
 rename pkgs/{banlist.nix => banlist/default.nix} (100%)
 rename pkgs/{electrs.nix => electrs/default.nix} (100%)
 rename pkgs/{liquidd.nix => liquidd/default.nix} (100%)
 rename pkgs/{nodeinfo.nix => nodeinfo/default.nix} (100%)
 rename pkgs/{ => nodeinfo}/nodeinfo.sh (100%)

diff --git a/modules/nix-bitcoin-pkgs.nix b/modules/nix-bitcoin-pkgs.nix
index 740fe6b..10036dd 100644
--- a/modules/nix-bitcoin-pkgs.nix
+++ b/modules/nix-bitcoin-pkgs.nix
@@ -4,13 +4,13 @@
    nixpkgs-unstable = import nixpkgs-pinned.nixpkgs-unstable { };
 
    # Custom packages
-   nodeinfo = (import ../pkgs/nodeinfo.nix) { inherit pkgs; };
-   banlist = (import ../pkgs/banlist.nix) { inherit pkgs; };
+   nodeinfo = pkgs.callPackage ../pkgs/nodeinfo { };
+   banlist = pkgs.callPackage ../pkgs/banlist { };
    lightning-charge = pkgs.callPackage ../pkgs/lightning-charge { };
    nanopos = pkgs.callPackage ../pkgs/nanopos { };
    spark-wallet = pkgs.callPackage ../pkgs/spark-wallet { };
-   electrs = pkgs.callPackage (import ../pkgs/electrs.nix) { };
-   liquidd = pkgs.callPackage (import ../pkgs/liquidd.nix) { };
+   electrs = pkgs.callPackage ../pkgs/electrs { };
+   liquidd = pkgs.callPackage ../pkgs/liquidd { };
 in {
   disabledModules = [ "services/security/tor.nix" ];
   imports = [
diff --git a/pkgs/banlist.sh b/pkgs/banlist/banlist.sh
similarity index 100%
rename from pkgs/banlist.sh
rename to pkgs/banlist/banlist.sh
diff --git a/pkgs/banlist.nix b/pkgs/banlist/default.nix
similarity index 100%
rename from pkgs/banlist.nix
rename to pkgs/banlist/default.nix
diff --git a/pkgs/electrs.nix b/pkgs/electrs/default.nix
similarity index 100%
rename from pkgs/electrs.nix
rename to pkgs/electrs/default.nix
diff --git a/pkgs/liquidd.nix b/pkgs/liquidd/default.nix
similarity index 100%
rename from pkgs/liquidd.nix
rename to pkgs/liquidd/default.nix
diff --git a/pkgs/nodeinfo.nix b/pkgs/nodeinfo/default.nix
similarity index 100%
rename from pkgs/nodeinfo.nix
rename to pkgs/nodeinfo/default.nix
diff --git a/pkgs/nodeinfo.sh b/pkgs/nodeinfo/nodeinfo.sh
similarity index 100%
rename from pkgs/nodeinfo.sh
rename to pkgs/nodeinfo/nodeinfo.sh