diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix deleted file mode 100644 index 1a79e17c659..00000000000 --- a/pkgs/tools/networking/netcat-openbsd/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{stdenv, fetchurl, fetchpatch, pkgconfig, libbsd}: - -stdenv.mkDerivation rec { - version = "1.190"; - deb-version = "${version}-1"; - name = "netcat-openbsd-${version}"; - - srcs = [ - (fetchurl { - url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${version}.orig.tar.gz"; - sha256 = "0dp571m42zc7wvb9bf4hz5a08rcc5fknf0gdp98yq19c754c9k38"; - }) - (fetchurl { - url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${deb-version}.debian.tar.xz"; - sha256 = "0plgrri85sghzn499jzd9d3h7w61ksqj0amkwmcah8dmfkp7jrgv"; - }) - ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libbsd ]; - - sourceRoot = name; - - prePatch = '' - for i in $(cat ../debian/patches/series); do - patch -p1 < "../debian/patches/$i" - done - ''; - - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl [ - (fetchpatch { - url = "https://gitweb.gentoo.org/proj/musl.git/plain/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-b64_ntop.patch?id=4a5864922232c7df550c21f2a7b77fe6f8ffc6d6"; - sha256 = "1cgqb6fxas5yiwf26hq57v627hhmcskl5j6rx30090ha2ksjqyvr"; - }) - ]; - - installPhase = '' - runHook preInstall - install -Dm0755 nc $out/bin/nc - install -Dm0644 nc.1 $out/share/man/man1/nc.1 - runHook postInstall - ''; - - meta = with stdenv.lib; { - homepage = https://packages.debian.org/netcat-openbsd; - description = "TCP/IP swiss army knife, OpenBSD variant"; - platforms = platforms.linux; - maintainers = with maintainers; [ willibutz ]; - }; - -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4b4dd2bf915..a7f59d1268f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -138,6 +138,7 @@ mapAliases (rec { mupen64plus1_5 = mupen64plus; # added 2016-02-12 mysqlWorkbench = mysql-workbench; # added 2017-01-19 ncat = nmap; # added 2016-01-26 + netcat-openbsd = libressl.bin; # added 2018-04-25 networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25 networkmanager_iodine = networkmanager-iodine; # added 2018-02-25 networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e61a555aac..0b59862c20e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3879,8 +3879,6 @@ with pkgs; netcat-gnu = callPackage ../tools/networking/netcat { }; - netcat-openbsd = callPackage ../tools/networking/netcat-openbsd { }; - nethogs = callPackage ../tools/networking/nethogs { }; netkittftp = callPackage ../tools/networking/netkit/tftp { };