From fe8a27cd64963504293ccf741e1aa1921a84b689 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 4 Sep 2015 23:57:00 -0700
Subject: [PATCH] mesos-dns: Move to go-packages

---
 pkgs/servers/dns/mesos-dns/default.nix | 31 -------------
 pkgs/top-level/all-packages.nix        |  2 +-
 pkgs/top-level/go-packages.nix         | 60 +++++++++++++++++++-------
 3 files changed, 45 insertions(+), 48 deletions(-)
 delete mode 100644 pkgs/servers/dns/mesos-dns/default.nix

diff --git a/pkgs/servers/dns/mesos-dns/default.nix b/pkgs/servers/dns/mesos-dns/default.nix
deleted file mode 100644
index bf672aa89d84..000000000000
--- a/pkgs/servers/dns/mesos-dns/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-with goPackages;
-
-buildGoPackage rec {
-  name = "mesos-dns-${version}";
-  version = "0.1";
-
-  goPackagePath = "github.com/mesosphere/mesos-dns";
-
-  src = fetchFromGitHub {
-    owner = "mesosphere";
-    repo = "mesos-dns";
-    rev = "f37051fc5a723eb021797e7d57d92755c011a28e";
-    sha256 = "0djzd4zdpr4dcp56rqprncan6pcff6gy4wxi9572fmni2ldj4l15";
-  };
-
-  # Avoid including the benchmarking test helper in the output:
-  subPackages = [ "." ];
-
-  buildInputs = with goPackages; [ go dns ];
-  dontInstallSrc = true;
-
-  meta = with lib; {
-    description = "DNS-based service discovery for Mesos clusters";
-    homepage = https://github.com/mesosphere/mesos-dns;
-    license = licenses.apsl20;
-    maintainers = with maintainers; [ benley ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d785060085a4..f649edc8fb67 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5039,7 +5039,7 @@ let
     perf = linuxPackages.perf;
   };
 
-  mesos-dns = callPackage ../servers/dns/mesos-dns { };
+  mesos-dns = goPackages.mesos-dns.bin // { outputs = [ "bin" ]; };
 
   mujs = callPackage ../development/interpreters/mujs { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 2d639f1f742c..45f5013e81c0 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -86,22 +86,6 @@ let
     goPackageAliases = [ "code.google.com/p/goprotobuf" ];
   };
 
-  gogo.protobuf = buildGoPackage rec {
-    rev = "499788908625f4d83de42a204d1350fde8588e4f";
-    name = "protobuf-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/gogo/protobuf";
-    goPackageAliases = [ "code.google.com/p/gogoprotobuf/proto" "code.google.com/p/goprotobuf/proto" ];
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "gogo";
-      repo = "protobuf";
-      sha256 = "09h2j0apl70709nbqasqrkss6fdk99xm7xr5ci311dl48rmm1dzn";
-    };
-
-    subPackages = [ "proto" ];
-  };
-
   snappy = buildFromGitHub {
     rev    = "0c7f8a7704bfec561913f4df52c832f094ef56f0";
     date   = "2015-07-21";
@@ -1265,6 +1249,13 @@ let
     };
   };
 
+  go-restful = buildFromGitHub {
+    rev    = "892402ba11a2e2fd5e1295dd633481f27365f14d";
+    owner  = "emicklei";
+    repo   = "go-restful";
+    sha256 = "0gr9f53vayc6501a1kaw4p3h9pgf376cgxsfnr3f2dvp0xacvw8x";
+  };
+
   go-runit = buildFromGitHub {
     rev    = "a9148323a615e2e1c93b7a9893914a360b4945c8";
     owner  = "soundcloud";
@@ -1739,6 +1730,27 @@ let
     propagatedBuildInputs = [ ugorji.go armon.go-metrics ];
   };
 
+  mesos-dns = buildFromGitHub {
+    rev = "v0.1.2";
+    owner = "mesosphere";
+    repo = "mesos-dns";
+    sha256 = "0zs6lcgk43j7jp370qnii7n55cd9pa8gl56r8hy4nagfvlvrcm02";
+
+    # Avoid including the benchmarking test helper in the output:
+    subPackages = [ "." ];
+
+    buildInputs = [ glog mesos-go dns go-restful ];
+  };
+
+  mesos-go = buildFromGitHub {
+    rev = "d98afa618cc9a9251758916f49ce87f9051b69a4";
+    owner = "mesos";
+    repo = "mesos-go";
+    sha256 = "01ab0jf3cfb1rdwwb21r38rcfr5vp86pkfk28mws8298mlzbpri7";
+    propagatedBuildInputs = [ gogo.protobuf glog net testify go-zookeeper objx uuid ];
+    excludedPackages = "test";
+  };
+
   mesos-stats = buildGoPackage rec {
     rev = "0c6ea494c19bedc67ebb85ce3d187ec21050e920";
     name = "mesos-stats-${stdenv.lib.strings.substring 0 7 rev}";
@@ -2412,6 +2424,14 @@ let
     };
   };
 
+  gogo.protobuf = buildFromGitHub {
+    rev = "932b70afa8b0bf4a8e167fdf0c3367cebba45903";
+    owner = "gogo";
+    repo = "protobuf";
+    sha256 = "1djhv9ckqhyjnnqajjv8ivcwpmjdnml30l6zhgbjcjwdyz3nyzhx";
+    excludedPackages = "test";
+  };
+
   pty = buildFromGitHub {
     rev    = "67e2db24c831afa6c64fc17b4a143390674365ef";
     owner  = "kr";
@@ -2813,6 +2833,14 @@ let
     buildInputs = [ pkgs.libusb1 ];
   };
 
+  uuid = buildFromGitHub {
+    rev = "cccd189d45f7ac3368a0d127efb7f4d08ae0b655";
+    date = "2015-08-24";
+    owner = "pborman";
+    repo = "uuid";
+    sha256 = "0hswk9ihv3js5blp9pk2bpig64zkmyp5p1zhmgydfhb0dr2w8iad";
+  };
+
   vault = buildFromGitHub {
     rev = "v0.2.0";
     owner = "hashicorp";