From af6d8b5182f5482738eb88f6c6849e37cc1c7ec3 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 29 Jul 2015 18:31:06 -0700
Subject: [PATCH] etcdctl: Use goPackages version of etcd

cc @cstrahan
---
 pkgs/development/tools/etcdctl/default.nix | 25 ----------------------
 pkgs/top-level/all-packages.nix            |  2 +-
 2 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 pkgs/development/tools/etcdctl/default.nix

diff --git a/pkgs/development/tools/etcdctl/default.nix b/pkgs/development/tools/etcdctl/default.nix
deleted file mode 100644
index ae2c06d5a22..00000000000
--- a/pkgs/development/tools/etcdctl/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-with goPackages;
-
-buildGoPackage rec {
-  version = "0.4.5";
-  name = "etcdctl-${version}";
-  goPackagePath = "github.com/coreos/etcdctl";
-  src = fetchFromGitHub {
-    owner = "coreos";
-    repo = "etcdctl";
-    rev = "v${version}";
-    sha256 = "1kbri59ppil52v7s992q8r6i1zk9lac0s2w00z2lsgc9w1z59qs0";
-  };
-
-  dontInstallSrc = true;
-
-  meta = with lib; {
-    description = "A simple command line client for etcd";
-    homepage = http://coreos.com/using-coreos/etcd/;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ cstrahan ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb4b3365dde..a47de56f0f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8902,7 +8902,7 @@ let
     v8 = v8_3_24_10;
   };
 
-  etcdctl = callPackage ../development/tools/etcdctl { };
+  etcdctl = goPackages.etcd;
 
   exim = callPackage ../servers/mail/exim { };