diff --git a/pkgs/development/tools/etcdctl/default.nix b/pkgs/development/tools/etcdctl/default.nix deleted file mode 100644 index ae2c06d5a22..00000000000 --- a/pkgs/development/tools/etcdctl/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, goPackages, fetchFromGitHub }: - -with goPackages; - -buildGoPackage rec { - version = "0.4.5"; - name = "etcdctl-${version}"; - goPackagePath = "github.com/coreos/etcdctl"; - src = fetchFromGitHub { - owner = "coreos"; - repo = "etcdctl"; - rev = "v${version}"; - sha256 = "1kbri59ppil52v7s992q8r6i1zk9lac0s2w00z2lsgc9w1z59qs0"; - }; - - dontInstallSrc = true; - - meta = with lib; { - description = "A simple command line client for etcd"; - homepage = http://coreos.com/using-coreos/etcd/; - license = licenses.asl20; - maintainers = with maintainers; [ cstrahan ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb4b3365dde..a47de56f0f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8902,7 +8902,7 @@ let v8 = v8_3_24_10; }; - etcdctl = callPackage ../development/tools/etcdctl { }; + etcdctl = goPackages.etcd; exim = callPackage ../servers/mail/exim { };