From d28c65ff05d0c1bfb9fc00c20dbd3ba2215f95a1 Mon Sep 17 00:00:00 2001
From: Matej Cotman <cotman.matej@gmail.com>
Date: Mon, 29 Dec 2014 01:53:49 +0100
Subject: [PATCH] etcd: upgrade server and ctl

---
 pkgs/development/tools/etcdctl/default.nix | 2 +-
 pkgs/development/tools/etcdctl/deps.nix    | 4 ++--
 pkgs/servers/etcd/default.nix              | 2 +-
 pkgs/servers/etcd/deps.nix                 | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/etcdctl/default.nix b/pkgs/development/tools/etcdctl/default.nix
index 5e6438d0f5ff..a2236f6c843f 100644
--- a/pkgs/development/tools/etcdctl/default.nix
+++ b/pkgs/development/tools/etcdctl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.3";
+  version = "0.4.5";
   name = "etcdctl-${version}";
 
   src = import ./deps.nix {
diff --git a/pkgs/development/tools/etcdctl/deps.nix b/pkgs/development/tools/etcdctl/deps.nix
index 98bdda95a433..c76a162f193b 100644
--- a/pkgs/development/tools/etcdctl/deps.nix
+++ b/pkgs/development/tools/etcdctl/deps.nix
@@ -7,8 +7,8 @@ let
       src = fetchFromGitHub {
         owner = "coreos";
         repo = "etcdctl";
-        rev = "061135b2a02797a6b3c2b6c01183517c1bc76a2c";
-        sha256 = "1hl9cz9ygr2k4d67qj9q1xj0n64b28qjy5sv7zylgg9h9ag2j2p4";
+        rev = "a1b38c93245542e340971189750baef7a55d306e";
+        sha256 = "1kbri59ppil52v7s992q8r6i1zk9lac0s2w00z2lsgc9w1z59qs0";
       };
     }
   ];
diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix
index ea91993e7231..5d5939f83bef 100644
--- a/pkgs/servers/etcd/default.nix
+++ b/pkgs/servers/etcd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "0.5.0-alpha.4";
+  version = "2.0.0-rc.1";
   name = "etcd-${version}";
 
   src = import ./deps.nix {
diff --git a/pkgs/servers/etcd/deps.nix b/pkgs/servers/etcd/deps.nix
index 1cd8309ad5d0..b07ee1d74892 100644
--- a/pkgs/servers/etcd/deps.nix
+++ b/pkgs/servers/etcd/deps.nix
@@ -8,8 +8,8 @@ let
       src = fetchFromGitHub {
         owner = "coreos";
         repo = "etcd";
-        rev = "d01d6119e54f729f54e9776ad5729277fcf38668";
-        sha256 = "0h9d6rc8yx7vyv2ggvzsddyng03pjhyb7avm9wrc805qr7p8nhns";
+        rev = "221abdcb3b755b36d1e7d70149f6de3450351619";
+        sha256 = "1wkd238ap9gp5irrb3f6nnh83rzizwfrfac76j0dvqdka35l247k";
       };
     }
   ];