about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-09-04 21:26:35 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-09-04 21:26:35 -0700
commit68be570a0a60794e7aa36ba48f308cb11fe3c132 (patch)
tree845a1e905d1f01355bf41d105d04b1301738135c /pkgs/top-level
parent8fe216dd3ec331656ff430e1fa387a09fe481015 (diff)
downloadnixlib-68be570a0a60794e7aa36ba48f308cb11fe3c132.tar
nixlib-68be570a0a60794e7aa36ba48f308cb11fe3c132.tar.gz
nixlib-68be570a0a60794e7aa36ba48f308cb11fe3c132.tar.bz2
nixlib-68be570a0a60794e7aa36ba48f308cb11fe3c132.tar.lz
nixlib-68be570a0a60794e7aa36ba48f308cb11fe3c132.tar.xz
nixlib-68be570a0a60794e7aa36ba48f308cb11fe3c132.tar.zst
nixlib-68be570a0a60794e7aa36ba48f308cb11fe3c132.zip
skydns: Move to go-packages
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/go-packages.nix11
2 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2c6222996ad3..d785060085a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3012,7 +3012,7 @@ let
 
   skippy-xd = callPackage ../tools/X11/skippy-xd {};
 
-  skydns = callPackage ../servers/dns/skydns { };
+  skydns = goPackages.skydns.bin // { outputs = [ "bin" ]; };
 
   sipcalc = callPackage ../tools/networking/sipcalc { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 8ca1e2336a7a..2d639f1f742c 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2620,6 +2620,17 @@ let
     propagatedBuildInputs = [ slices ];
   };
 
+  skydns = buildFromGitHub {
+    rev = "2.5.2b";
+    owner = "skynetservices";
+    repo = "skydns";
+    sha256 = "01vac6bd71wky5jbd5k4a0x665bjn1cpmw7p655jrdcn5757c2lv";
+
+    buildInputs = [
+      go-etcd rcrowley.go-metrics influxdb go-systemd go-log dns stathat osext
+    ];
+  };
+
   slices = buildGoPackage rec {
     rev = "bb44bb2e4817fe71ba7082d351fd582e7d40e3ea";
     name = "slices-${stdenv.lib.strings.substring 0 7 rev}";