Merge pull request #6489 from benley/mesos-dns

New package: mesos-dns

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;
+  };
+}

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 {

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";
     };
   };