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

---
 pkgs/servers/etcd/default.nix   | 25 -------------------------
 pkgs/top-level/all-packages.nix |  2 +-
 2 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 pkgs/servers/etcd/default.nix

diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix
deleted file mode 100644
index 89ea70d46c53..000000000000
--- a/pkgs/servers/etcd/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-with goPackages;
-
-buildGoPackage rec {
-  version = "2.0.0";
-  name = "etcd-${version}";
-  goPackagePath = "github.com/coreos/etcd";
-  src = fetchFromGitHub {
-    owner = "coreos";
-    repo = "etcd";
-    rev = "v${version}";
-    sha256 = "1s3jilzlqyh2i81pv79cgap6dfj7qrfrwcv4w9lic5ivznz413vc";
-  };
-
-  subPackages = [ "./" ];
-
-  meta = with lib; {
-    description = "A highly-available key value store for shared configuration and service discovery";
-    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 14f98fd8dd00..bb4b3365dde9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8885,7 +8885,7 @@ let
 
   dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { };
 
-  etcd = callPackage ../servers/etcd { };
+  etcd = goPackages.etcd;
 
   ejabberd = callPackage ../servers/xmpp/ejabberd {
     erlang = erlangR16;