From 2290dbb843f817d8249e4207e2ff25d430d90ee6 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <ben@folsomlabs.com>
Date: Fri, 20 Feb 2015 17:07:46 -0800
Subject: [PATCH 1/2] Update goPackages.dns to a more recent commit

Old: 2014-07-15
New: 2015-02-20, with many bugfixes and improvements and test coverage.
---
 pkgs/top-level/go-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index dfff0b680cd4..538506a5c1eb 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -167,14 +167,14 @@ let self = _self // overrides; _self = with self; {
   };
 
   dns = buildGoPackage rec {
-    rev = "fc67c4b981930a377f8a26a5a1f2c0ccd5dd1514";
+    rev = "0bd3fb7026404936cf18204ea527d27f067923cf";
     name = "dns-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/miekg/dns";
     src = fetchFromGitHub {
       inherit rev;
       owner = "miekg";
       repo = "dns";
-      sha256 = "1csjmkx0gl34r4hmkhdbdxb0693f1p10yrjaj8f2jwli9p9sl4mg";
+      sha256 = "1hv2ikpd9gr9idf7zh8nyqgdbnnffs057wsdpd7m44mllbmzhdxn";
     };
   };
 

From d382667537d5f967e61ffa5cba9a58c3ad09605d Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <ben@folsomlabs.com>
Date: Fri, 20 Feb 2015 13:55:33 -0800
Subject: [PATCH 2/2] New package: mesos-dns

---
 pkgs/servers/dns/mesos-dns/default.nix | 31 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 33 insertions(+)
 create 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
new file mode 100644
index 000000000000..5b7d96c14cf8
--- /dev/null
+++ b/pkgs/servers/dns/mesos-dns/default.nix
@@ -0,0 +1,31 @@
+{ 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 = "29940029d4b0c17142373c3280a8b452722b665b";
+    sha256 = "1fycywhdyymibsahjqx9vnigk3pdis3hnmfbxp74pmd9xqqlyv1n";
+  };
+
+  # 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 766d2a3a3cc6..341a2d7102dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4340,6 +4340,8 @@ let
     pythonProtobuf = pythonPackages.protobuf;
   };
 
+  mesos-dns = callPackage ../servers/dns/mesos-dns { };
+
   mujs = callPackage ../development/interpreters/mujs { };
 
   nix-exec = callPackage ../development/interpreters/nix-exec {