diff options
| author | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-06-03 18:17:43 +0200 |
|---|---|---|
| committer | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-06-09 11:21:30 +0200 |
| commit | d010d39e15cda42f76105baf5fcf69363d4d4fe4 (patch) | |
| tree | 0465839e041a627e3eefdab42a0f61c97d4f205f /pkgs/top-level | |
| parent | e44d38125ce2bf1ec6ba2f72f04c4bf105cc859d (diff) | |
| download | nixlib-d010d39e15cda42f76105baf5fcf69363d4d4fe4.tar nixlib-d010d39e15cda42f76105baf5fcf69363d4d4fe4.tar.gz nixlib-d010d39e15cda42f76105baf5fcf69363d4d4fe4.tar.bz2 nixlib-d010d39e15cda42f76105baf5fcf69363d4d4fe4.tar.lz nixlib-d010d39e15cda42f76105baf5fcf69363d4d4fe4.tar.xz nixlib-d010d39e15cda42f76105baf5fcf69363d4d4fe4.tar.zst nixlib-d010d39e15cda42f76105baf5fcf69363d4d4fe4.zip | |
skydns: extracted from goPackages
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/go-packages.nix | 11 |
2 files changed, 1 insertions, 12 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 909a33d4e8a8..b7b3a0527b2e 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 52fd41d79eea..6b51ccacd473 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}"; |