diff --git a/pkgs/servers/dns/skydns/default.nix b/pkgs/servers/dns/skydns/default.nix deleted file mode 100644 index c430ed4b37c..00000000000 --- a/pkgs/servers/dns/skydns/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, goPackages, fetchFromGitHub, etcd }: - -with goPackages; - -buildGoPackage rec { - name = "skydns-${version}"; - version = "2.5.2b"; - - goPackagePath = "github.com/skynetservices/skydns"; - - src = fetchFromGitHub { - owner = "skynetservices"; - repo = "skydns"; - rev = version; - sha256 = "01vac6bd71wky5jbd5k4a0x665bjn1cpmw7p655jrdcn5757c2lv"; - }; - - buildInputs = with goPackages; [ go-etcd rcrowley.go-metrics influxdb 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c6222996ad..d785060085a 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 8ca1e2336a7..2d639f1f742 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}";