From 26f671155e397582e8a034fe8a40e7e9a787027e Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Wed, 18 Mar 2015 20:22:55 +0100
Subject: [PATCH] Add skydns

---
 pkgs/servers/dns/skydns/default.nix | 30 ++++++++++++++
 pkgs/servers/etcd/default.nix       |  2 -
 pkgs/top-level/all-packages.nix     |  2 +
 pkgs/top-level/go-packages.nix      | 64 +++++++++++++++++++++++++++--
 4 files changed, 92 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/servers/dns/skydns/default.nix

diff --git a/pkgs/servers/dns/skydns/default.nix b/pkgs/servers/dns/skydns/default.nix
new file mode 100644
index 000000000000..6536ad972b74
--- /dev/null
+++ b/pkgs/servers/dns/skydns/default.nix
@@ -0,0 +1,30 @@
+{ lib, goPackages, fetchFromGitHub, etcd }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "skydns-${version}";
+  version = "2.1.0a";
+
+  goPackagePath = "github.com/skynetservices/skydns";
+
+  src = fetchFromGitHub {
+    owner = "skynetservices";
+    repo = "skydns";
+    rev = "f5141ee69309fb4c542d5a0b50fc7616370c5c06";
+    sha256 = "1bnc9r22kwvmn1bgz7zaidkjqm7pmw99bn5n87r76vcrd7n2a9pd";
+  };
+
+  buildInputs = with goPackages; [ go-etcd rcrowley.go-metrics influxdb-go go-systemd go-log dns stathat osext etcd ];
+  dontInstallSrc = true;
+
+  subPackages = [ "." ];
+
+  meta = with lib; {
+    description = "DNS service discovery for etcd";
+    homepage = https://github.com/skynetservices/skydns;
+    license = licenses.mit;
+    maintainers = with maintainers; [ offline ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix
index abec19663ff2..89ea70d46c53 100644
--- a/pkgs/servers/etcd/default.nix
+++ b/pkgs/servers/etcd/default.nix
@@ -15,8 +15,6 @@ buildGoPackage rec {
 
   subPackages = [ "./" ];
 
-  dontInstallSrc = true;
-
   meta = with lib; {
     description = "A highly-available key value store for shared configuration and service discovery";
     homepage = http://coreos.com/using-coreos/etcd/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4f731372988..cfeaa75b938b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2646,6 +2646,8 @@ let
 
   simplescreenrecorder = callPackage ../applications/video/simplescreenrecorder { };
 
+  skydns = callPackage ../servers/dns/skydns { };
+
   sleuthkit = callPackage ../tools/system/sleuthkit {};
 
   slimrat = callPackage ../tools/networking/slimrat {
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 94ef8a4ae077..633179d9370f 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -179,15 +179,31 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  dbus = buildGoPackage rec {
+    rev = "88765d85c0fdadcd98a54e30694fa4e4f5b51133";
+    name = "dbus-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/godbus/dbus";
+    preBuild = ''
+      cd "go/src/$goPackagePath"
+      rm -r _examples
+    '';
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "godbus";
+      repo = "dbus";
+      sha256 = "0k80wzdx8091y3012nd4giwgc08n1pj6lcr9i44dsapcjnb80jkn";
+    };
+  };
+
   dns = buildGoPackage rec {
-    rev = "0bd3fb7026404936cf18204ea527d27f067923cf";
+    rev = "fd694e564b3ceaf34a8bbe9ef18f65c64df8ed03";
     name = "dns-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/miekg/dns";
     src = fetchFromGitHub {
       inherit rev;
       owner = "miekg";
       repo = "dns";
-      sha256 = "1hv2ikpd9gr9idf7zh8nyqgdbnnffs057wsdpd7m44mllbmzhdxn";
+      sha256 = "1g15l00jypjac0fd2j39lifw1j3md49vk6fq35mv8kc8ighhvxaq";
     };
   };
 
@@ -325,6 +341,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  go-etcd = buildGoPackage rec {
+    rev = "4734e7aca379f0d7fcdf04fbb2101696a4b45ce8";
+    name = "go-etcd-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/coreos/go-etcd";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "coreos";
+      repo = "go-etcd";
+      sha256 = "0zqr7mzd5kq0rnxj3zx5x5wwbmjkg365farwv72hzrsvq6g8zczr";
+    };
+    buildInputs = [ pkgs.etcd ];
+  };
+
   go-fuse = buildGoPackage rec {
     rev = "5d16aa11eef4643de2d91e88a64dcb6138705d58";
     name = "go-fuse-${stdenv.lib.strings.substring 0 7 rev}";
@@ -374,6 +403,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  go-log = buildGoPackage rec {
+    rev = "70d039bee4b0e389e5be560491d8291708506f59";
+    name = "go-log-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/coreos/go-log";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "coreos";
+      repo = "go-log";
+      sha256 = "1s95xmmhcgw4ascf4zr8c4ij2n4s3mr881nxcpmc61g0gb722b13";
+    };
+    buildInputs = [ go-systemd osext ];
+  };
+
   rcrowley.go-metrics = buildGoPackage rec {
     rev = "f770e6f5e91a8770cecee02d5d3f7c00b023b4df";
     name = "rcrowley.go-metrics-${stdenv.lib.strings.substring 0 7 rev}";
@@ -473,7 +515,21 @@ let self = _self // overrides; _self = with self; {
       sha256 = "1r9s1gsa4azcs05gx1179ixk7qvrkrik3v92wr4s8gwm00m0gf81";
     };
   };
- 
+
+  go-systemd = buildGoPackage rec {
+    rev = "2d21675230a81a503f4363f4aa3490af06d52bb8";
+    name = "go-systemd-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/coreos/go-systemd";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "coreos";
+      repo = "go-systemd";
+      sha256 = "07g5c8khlcjnr86gniw3zr7l8jwrb9fhrj18zm5n6ccj24nidwam";
+    };
+    subPackages = [ "activation" "daemon" "dbus" "journal" "login1" ];
+    buildInputs = [ dbus ];
+  };
+
   go-update = buildGoPackage rec {
     rev = "c1385108bc3a016f1c88b75ea7d2e2a356a1571d";
     name = "go-update-${stdenv.lib.strings.substring 0 7 rev}";
@@ -643,7 +699,7 @@ let self = _self // overrides; _self = with self; {
 
   mgo = buildGoPackage rec {
     rev = "2";
-    name = "mgo-${rev}"; 
+    name = "mgo-${rev}";
     goPackagePath = "launchpad.net/mgo";
     src = fetchbzr {
       inherit rev;