From 9e273d5b29290a26ce28554582ca45ab80cea9fa Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sat, 4 Jun 2016 22:31:11 +0200
Subject: [PATCH] consul--template: extracted from goPackages

---
 pkgs/tools/system/consul-template/default.nix | 18 ++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/go-packages.nix                | 21 -------------------
 3 files changed, 19 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/tools/system/consul-template/default.nix

diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix
new file mode 100644
index 000000000000..989ad2b51a18
--- /dev/null
+++ b/pkgs/tools/system/consul-template/default.nix
@@ -0,0 +1,18 @@
+# This file was generated by go2nix.
+{ stdenv, lib, go16Packages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with go16Packages;
+
+buildGoPackage rec {
+  name = "consul-template-${version}";
+  version = "0.14.0";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/hashicorp/consul-template";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/hashicorp/consul-template";
+    sha256 = "15zsax44g3dwjmmm4fpb54mvsjvjf3b6g3ijskgipvhcy0d3j938";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 522a81c0d792..271e1eec2dda 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -708,7 +708,7 @@ in
 
   consul-alerts = callPackage ../servers/monitoring/consul-alerts { };
 
-  consul-template = goPackages.consul-template.bin // { outputs = [ "bin" ]; };
+  consul-template = callPackage ../tools/system/consul-template { };
 
   corosync = callPackage ../servers/corosync { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index f0bfad95df45..a1085ad0497e 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -522,27 +522,6 @@ let
     buildInputs = [ raft raft-boltdb raft-mdb ];
   };
 
-  consul-template = buildGoPackage rec {
-    rev = "v0.14.0";
-    name = "consul-template-${rev}";
-    goPackagePath = "github.com/hashicorp/consul-template";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "hashicorp";
-      repo = "consul-template";
-      sha256 = "15zsax44g3dwjmmm4fpb54mvsjvjf3b6g3ijskgipvhcy0d3j938";
-    };
-
-    # We just want the consul api not all of consul and vault
-    extraSrcs = [
-      { inherit (consul) src goPackagePath; }
-      { inherit (vault) src goPackagePath; }
-    ];
-
-    buildInputs = [ go-multierror go-syslog hcl logutils mapstructure pkgs.zip ];
-  };
-
   context = buildGoPackage rec {
     rev = "215affda49addc4c8ef7e2534915df2c8c35c6cd";
     name = "config-${stdenv.lib.strings.substring 0 7 rev}";