skydns: extracted from goPackages

5 files changed, 132 insertions, 13 deletions

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index c8bcc99194a..03107ea8e49 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -376,5 +376,95 @@
       "rev": "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539",
       "sha256": "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680"
     }
+  },
+  {
+    "goPackagePath": "github.com/prometheus/client_model",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/prometheus/client_model",
+      "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6",
+      "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"
+    }
+  },
+  {
+    "goPackagePath": "github.com/prometheus/common",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/prometheus/common",
+      "rev": "40456948a47496dc22168e6af39297a2f8fbf38c",
+      "sha256": "15700w18pifng0l2isa6v25y91r5rb7yfgljqw2g2gqrvac6sr5l"
+    }
+  },
+  {
+    "goPackagePath": "github.com/beorn7/perks",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/beorn7/perks",
+      "rev": "3ac7bf7a47d159a033b107610db8a1b6575507a4",
+      "sha256": "1qc3l4r818xpvrhshh1sisc5lvl9479qspcfcdbivdyh0apah83r"
+    }
+  },
+  {
+    "goPackagePath": "github.com/coreos/go-etcd",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/coreos/go-etcd",
+      "rev": "003851be7bb0694fe3cc457a49529a19388ee7cf",
+      "sha256": "0n78m4lwsjiaqhjizcsp25paj2l2d4fdr7c4i671ldvpggq76lrl"
+    }
+  },
+  {
+    "goPackagePath": "github.com/matttproud/golang_protobuf_extensions",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/matttproud/golang_protobuf_extensions",
+      "rev": "d0c3fe89de86839aecf2e0579c40ba3bb336a453",
+      "sha256": "0jkjgpi1s8l9bdbf14fh8050757jqy36kn1l1hxxlb2fjn1pcg0r"
+    }
+  },
+  {
+    "goPackagePath": "github.com/prometheus/client_golang",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/prometheus/client_golang",
+      "rev": "90c15b5efa0dc32a7d259234e02ac9a99e6d3b82",
+      "sha256": "11hbll3x7hm69a7b0pwnhz5diligjy5yykdkqz2rsvs8s1k796zm"
+    }
+  },
+  {
+    "goPackagePath": "github.com/stathat/go",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/stathat/go",
+      "rev": "91dfa3a59c5b233fef9a346a1460f6e2bc889d93",
+      "sha256": "105ql5v8r4hqcsq0ag7asdxqg9n7rvf83y1q1dj2nfjyn4manv6r"
+    }
+  },
+  {
+    "goPackagePath": "github.com/ugorji/go",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/ugorji/go",
+      "rev": "c062049c1793b01a3cc3fe786108edabbaf7756b",
+      "sha256": "00cy7flxlm52ahxmqsznv87im5hx6xa9qg09i7cvrm70r74zh58q"
+    }
+  },
+  {
+    "goPackagePath": "github.com/miekg/dns",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/miekg/dns",
+      "rev": "b9171237b0642de1d8e8004f16869970e065f46b",
+      "sha256": "1biz7j8mdyil2vks1hyvwkjh5na5fy45rn5fnxl68b9iw6r0xsc3"
+    }
+  },
+  {
+    "goPackagePath": "github.com/prometheus/procfs",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/prometheus/procfs",
+      "rev": "406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8",
+      "sha256": "0yla9hz15pg63394ygs9iiwzsqyv29labl8p424hijwsc9z9nka8"
+    }
   }
-]
\ No newline at end of file
+]
diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix
new file mode 100644
index 00000000000..fc4c82f5042
--- /dev/null
+++ b/pkgs/servers/skydns/default.nix
@@ -0,0 +1,20 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "skydns-${version}";
+  version = "2.5.3a";
+  rev = "${version}";
+  
+  goPackagePath = "github.com/skynetservices/skydns";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/skynetservices/skydns";
+    sha256 = "0i1iaif79cwnwm7pc8nxfa261cgl4zhm3p2a5a3smhy1ibgccpq7";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/servers/skydns/deps.json b/pkgs/servers/skydns/deps.json
new file mode 100644
index 00000000000..9ddbfa3c434
--- /dev/null
+++ b/pkgs/servers/skydns/deps.json
@@ -0,0 +1,20 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/miekg/dns",
+      "github.com/prometheus/client_golang",
+      "github.com/prometheus/client_model",
+      "github.com/prometheus/common",
+      "github.com/prometheus/procfs",
+      "github.com/coreos/go-systemd",
+      "github.com/matttproud/golang_protobuf_extensions",
+      "github.com/ugorji/go",
+      "github.com/golang/protobuf",
+      "github.com/stathat/go",
+      "github.com/beorn7/perks",
+      "github.com/coreos/go-etcd",
+      "github.com/rcrowley/go-metrics"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 909a33d4e8a..b7b3a0527b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3329,7 +3329,7 @@ in
 
   skippy-xd = callPackage ../tools/X11/skippy-xd {};
 
-  skydns = goPackages.skydns.bin // { outputs = [ "bin" ]; };
+  skydns = (callPackage ../servers/skydns { }).bin;
 
   sipcalc = callPackage ../tools/networking/sipcalc { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 52fd41d79ee..6b51ccacd47 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3483,17 +3483,6 @@ let
     sha256 = "0ybz1w3hndma8myq3pxan36533hy9f4w598hsv4hnj21l4br8jpx";
   };
 
-  skydns = buildFromGitHub {
-    rev = "2.5.3a";
-    owner = "skynetservices";
-    repo = "skydns";
-    sha256 = "0i1iaif79cwnwm7pc8nxfa261cgl4zhm3p2a5a3smhy1ibgccpq7";
-
-    buildInputs = [
-      go-etcd rcrowley.go-metrics dns go-systemd prometheus.client_golang
-    ];
-  };
-
   slices = buildGoPackage rec {
     rev = "bb44bb2e4817fe71ba7082d351fd582e7d40e3ea";
     name = "slices-${stdenv.lib.strings.substring 0 7 rev}";