From 5f35b0f7dafbf67d447a28b916ce81edfb52dc7e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 2 Sep 2015 17:51:03 -0700
Subject: [PATCH] serfdom: Migrate to go-packages

---
 pkgs/servers/serfdom/default.nix | 28 ----------------------------
 pkgs/top-level/all-packages.nix  |  2 +-
 pkgs/top-level/go-packages.nix   | 15 +++++----------
 3 files changed, 6 insertions(+), 39 deletions(-)
 delete mode 100644 pkgs/servers/serfdom/default.nix

diff --git a/pkgs/servers/serfdom/default.nix b/pkgs/servers/serfdom/default.nix
deleted file mode 100644
index 94a46459d4e4..000000000000
--- a/pkgs/servers/serfdom/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-with goPackages;
-
-buildGoPackage rec {
-  version = "0.6.4";
-  name = "serfdom-${version}";
-  goPackagePath = "github.com/hashicorp/serf";
-
-  src = fetchFromGitHub {
-    owner = "hashicorp";
-    repo = "serf";
-    rev = "v${version}";
-    sha256 = "1fhz8wrvsmgaky22n255w9hkyfph2n45c47ivdyzrrxisg5j2438";
-  };
-
-  buildInputs = [ cli mapstructure memberlist_v2 logutils go-syslog mdns columnize circbuf ugorji.go ];
-
-  dontInstallSrc = true;
-
-  meta = with lib; {
-    description = "A service discovery and orchestration tool that is decentralized, highly available, and fault tolerant";
-    homepage = http://www.serfdom.io/;
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ msackman cstrahan ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94bce20d75bf..018793fbe299 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9328,7 +9328,7 @@ let
 
   shairport-sync = callPackage ../servers/shairport-sync { };
 
-  serfdom = callPackage ../servers/serfdom { };
+  serfdom = pkgs.goPackages.serf.bin // { outputs = [ "bin" ]; };
 
   seyren = callPackage ../servers/monitoring/seyren { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index a3bbc6ed4fdf..1c53e986651b 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2489,17 +2489,12 @@ let
     buildInputs = [ armon.go-metrics net-rpc-msgpackrpc yamux ];
   };
 
-  serf = buildGoPackage rec {
+  serf = buildFromGitHub {
     rev = "668982d8f90f5eff4a766583c1286393c1d27f68";
-    name = "serf-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/hashicorp/serf";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "hashicorp";
-      repo   = "serf";
-      sha256 = "1h05h5xhaj27r1mh5zshnykax29lqjhfc0bx4v9swiwb873c24qk";
-    };
+    date = "2015-05-15";
+    owner  = "hashicorp";
+    repo   = "serf";
+    sha256 = "1h05h5xhaj27r1mh5zshnykax29lqjhfc0bx4v9swiwb873c24qk";
 
     buildInputs = [
       circbuf armon.go-metrics ugorji.go go-syslog logutils mdns memberlist