etcd: extracted from goPackages

pkgs/servers/etcd/default.nix

@@ -0,0 +1,22 @@
+# This file was generated by go2nix.
+{ stdenv, lib, libpcap, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "etcd-${version}";
+  version = "2.3.0";
+  rev = "v${version}";
+  
+  goPackagePath = "github.com/coreos/etcd";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/coreos/etcd";
+    sha256 = "1cchlhsdbbqal145cvdiq7rzqqi131iq7z0r2hmzwx414k04wyn7";
+  };
+
+  goDeps = ./deps.json;
+
+  buildInputs = [ libpcap ];
+}

pkgs/servers/etcd/deps.json

@@ -0,0 +1,9 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/olekukonko/tablewriter",
+      "github.com/mattn/go-runewidth"
+    ]
+  }
+]

pkgs/top-level/all-packages.nix

@@ -9903,7 +9903,7 @@ in
     inherit (perlPackages) NetSMTP;
   };
 
-  etcd = goPackages.etcd.bin // { outputs = [ "bin" ]; };
+  etcd = callPackage ../servers/etcd { };
 
   ejabberd = callPackage ../servers/xmpp/ejabberd { };
 

pkgs/top-level/go-packages.nix

@@ -827,14 +827,6 @@ let
     sha256 = "0kmv0p605di6jc8i1778qzass18m0mv9ks9vxxrfsiwcp4la82jf";
   };
 
-  etcd = buildFromGitHub {
-    rev    = "v2.3.0";
-    owner  = "coreos";
-    repo   = "etcd";
-    sha256 = "1cchlhsdbbqal145cvdiq7rzqqi131iq7z0r2hmzwx414k04wyn7";
-    buildInputs = [ pkgs.libpcap tablewriter ];
-  };
-
   fsnotify.v0 = buildGoPackage rec {
     rev = "v0.9.3";
     name = "fsnotify.v0-${rev}";