summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2018-05-15 10:27:53 -0500
committerMatthew Bauer <mjbauer95@gmail.com>2018-05-15 10:43:00 -0500
commit1d9d1fa780b28a61e9644c9ab07f636a7e720501 (patch)
tree1344c6ca4a091d2829d43bb1b4783318dd03fd15
parent202f19b225b08919f331444c5f8f37704c0d4d0d (diff)
downloadnixlib-1d9d1fa780b28a61e9644c9ab07f636a7e720501.tar
nixlib-1d9d1fa780b28a61e9644c9ab07f636a7e720501.tar.gz
nixlib-1d9d1fa780b28a61e9644c9ab07f636a7e720501.tar.bz2
nixlib-1d9d1fa780b28a61e9644c9ab07f636a7e720501.tar.lz
nixlib-1d9d1fa780b28a61e9644c9ab07f636a7e720501.tar.xz
nixlib-1d9d1fa780b28a61e9644c9ab07f636a7e720501.tar.zst
nixlib-1d9d1fa780b28a61e9644c9ab07f636a7e720501.zip
telnet: use inetutils
Inetutils provides a cross-platform version of telnet. Normally I
would try to contact the old maintainer, but none is listed.
-rw-r--r--pkgs/tools/networking/telnet/default.nix22
-rw-r--r--pkgs/top-level/aliases.nix1
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 1 insertions, 24 deletions
diff --git a/pkgs/tools/networking/telnet/default.nix b/pkgs/tools/networking/telnet/default.nix
deleted file mode 100644
index c38f3c46fa46..000000000000
--- 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 8b0812f8305d..34906533a0aa 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 46683b394c46..4a85484ba2a1 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 {};