mesos-dns: extracted from goPackages

5 files changed, 128 insertions, 27 deletions

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 3d54517796c5..18ddb080b19d 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -85,8 +85,8 @@
     "fetch": {
       "type": "git",
       "url": "https://go.googlesource.com/net",
-      "rev": "ef00b378c73f107bf44d5c9b69875255ce89b79a",
-      "sha256": "168dhvl0wqiac8xmy8mqkvspd7cq6vfjpj80zdnriwy169nykcyz"
+      "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4",
+      "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"
     }
   },
   {
@@ -454,8 +454,8 @@
     "fetch": {
       "type": "git",
       "url": "https://github.com/miekg/dns",
-      "rev": "b9171237b0642de1d8e8004f16869970e065f46b",
-      "sha256": "1biz7j8mdyil2vks1hyvwkjh5na5fy45rn5fnxl68b9iw6r0xsc3"
+      "rev": "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa",
+      "sha256": "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl"
     }
   },
   {
@@ -502,5 +502,86 @@
       "rev": "b584a329b193e206025682ae6c10cdbe03b0cd77",
       "sha256": "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b"
     }
+  },
+  {
+    "goPackagePath": "github.com/gogo/protobuf",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/gogo/protobuf",
+      "rev": "7883e1468d48d969e1c3ce4bcde89b6a7dd4adc4",
+      "sha256": "16ja7lqq96q0pnzgnbwnh0j8qzvqgns1nfk8ndxgkg4sg93bg372"
+    }
+  },
+  {
+    "goPackagePath": "github.com/golang/glog",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/golang/glog",
+      "rev": "fca8c8854093a154ff1eb580aae10276ad6b1b5f",
+      "sha256": "1nr2q0vas0a2f395f4shjxqpas18mjsf8yhgndsav7svngpbbpg8"
+    }
+  },
+  {
+    "goPackagePath": "github.com/mesos/mesos-go",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/mesos/mesos-go",
+      "rev": "aaa5b2fecf0e2db463f4f996c89617d6766b2969",
+      "sha256": "1pk1fpxksjln6kqvgm1igw3582jgrn14fwa8bdj5cwbpy6skjdvk"
+    }
+  },
+  {
+    "goPackagePath": "github.com/pmezard/go-difflib",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/pmezard/go-difflib",
+      "rev": "d8ed2627bdf02c080bf22230dbb337003b7aba2d",
+      "sha256": "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs"
+    }
+  },
+  {
+    "goPackagePath": "github.com/samuel/go-zookeeper",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/samuel/go-zookeeper",
+      "rev": "5bb5cfc093ad18a28148c578f8632cfdb4d802e4",
+      "sha256": "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z"
+    }
+  },
+  {
+    "goPackagePath": "github.com/stretchr/objx",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/stretchr/objx",
+      "rev": "cbeaeb16a013161a98496fad62933b1d21786672",
+      "sha256": "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1"
+    }
+  },
+  {
+    "goPackagePath": "github.com/davecgh/go-spew",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/davecgh/go-spew",
+      "rev": "5215b55f46b2b919f50a1df0eaa5886afe4e3b3d",
+      "sha256": "15h9kl73rdbzlfmsdxp13jja5gs7sknvqkpq2qizq3qv3nr1x8dk"
+    }
+  },
+  {
+    "goPackagePath": "github.com/emicklei/go-restful",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/emicklei/go-restful",
+      "rev": "892402ba11a2e2fd5e1295dd633481f27365f14d",
+      "sha256": "0gr9f53vayc6501a1kaw4p3h9pgf376cgxsfnr3f2dvp0xacvw8x"
+    }
+  },
+  {
+    "goPackagePath": "github.com/stretchr/testify",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/stretchr/testify",
+      "rev": "089c7181b8c728499929ff09b62d3fdd8df8adff",
+      "sha256": "03dzxkxbs298pvfsjz4kdadfaf9jkzsdhshqmg4p12wbyaj09s4p"
+    }
   }
-]
\ No newline at end of file
+]
diff --git a/pkgs/servers/mesos-dns/default.nix b/pkgs/servers/mesos-dns/default.nix
new file mode 100644
index 000000000000..1fa2a6101788
--- /dev/null
+++ b/pkgs/servers/mesos-dns/default.nix
@@ -0,0 +1,23 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "mesos-dns-${version}";
+  version = "0.1.2";
+  rev = "v${version}";
+  
+  goPackagePath = "github.com/mesosphere/mesos-dns";
+
+  # Avoid including the benchmarking test helper in the output:
+  subPackages = [ "." ];
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/mesosphere/mesos-dns";
+    sha256 = "0zs6lcgk43j7jp370qnii7n55cd9pa8gl56r8hy4nagfvlvrcm02";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/servers/mesos-dns/deps.json b/pkgs/servers/mesos-dns/deps.json
new file mode 100644
index 000000000000..8ac9d7058413
--- /dev/null
+++ b/pkgs/servers/mesos-dns/deps.json
@@ -0,0 +1,18 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/gogo/protobuf",
+      "github.com/golang/glog",
+      "github.com/mesos/mesos-go",
+      "github.com/pmezard/go-difflib",
+      "github.com/samuel/go-zookeeper",
+      "github.com/stretchr/objx",
+      "github.com/davecgh/go-spew",
+      "github.com/emicklei/go-restful",
+      "github.com/stretchr/testify",
+      "github.com/miekg/dns",
+      "golang.org/x/net"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9406c7120b2f..d9a60f50f464 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5607,7 +5607,7 @@ in
     perf = linuxPackages.perf;
   };
 
-  mesos-dns = goPackages.mesos-dns.bin // { outputs = [ "bin" ]; };
+  mesos-dns = (callPackage ../servers/mesos-dns { }).bin;
 
   mujs = callPackage ../development/interpreters/mujs { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index a435283abebc..3be6aa47dd88 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2370,27 +2370,6 @@ 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}";