From 1d9d1fa780b28a61e9644c9ab07f636a7e720501 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 15 May 2018 10:27:53 -0500 Subject: [PATCH] telnet: use inetutils Inetutils provides a cross-platform version of telnet. Normally I would try to contact the old maintainer, but none is listed. --- pkgs/tools/networking/telnet/default.nix | 22 ---------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 pkgs/tools/networking/telnet/default.nix diff --git a/pkgs/tools/networking/telnet/default.nix b/pkgs/tools/networking/telnet/default.nix deleted file mode 100644 index c38f3c46fa4..00000000000 --- a/pkgs/tools/networking/telnet/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{stdenv, fetchurl, ncurses}: - -stdenv.mkDerivation { - name = "telnet-1.2"; - - src = fetchurl { - #url = ftp://ftp.suse.com/pub/people/kukuk/ipv6/telnet-bsd-1.2.tar.bz2; # broken - url = mirror://gentoo/distfiles/telnet-bsd-1.2.tar.bz2; - sha256 = "0cs7ks22dhcn5qfjv2vl6ikhw93x68gg33zdn5f5cxgg81kx5afn"; - }; - - hardeningDisable = [ "format" ]; - - buildInputs = [ncurses]; - - meta = { - description = "A client and daemon for the Telnet protocol"; - homepage = ftp://ftp.suse.com/pub/people/kukuk/ipv6/; - license = "BSD"; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8b0812f8305..34906533a0a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -200,6 +200,7 @@ mapAliases (rec { sshfsFuse = sshfs-fuse; # added 2016-09 surf-webkit2 = surf; # added 2017-04-02 tahoelafs = tahoe-lafs; # added 2018-03-26 + telnet = inetutils; # added 2018-05-15 system_config_printer = system-config-printer; # added 2016-01-03 telepathy_farstream = telepathy-farstream; # added 2018-02-25 telepathy_gabble = telepathy-gabble; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46683b394c4..4a85484ba2a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5156,8 +5156,6 @@ with pkgs; teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { }; - telnet = callPackage ../tools/networking/telnet { }; - telegraf = callPackage ../servers/monitoring/telegraf { }; teleport = callPackage ../servers/teleport {};