From 99b8d106e987b7fcddf4a92bd54e7f2ba8b0006a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 27 Apr 2018 19:32:19 -0500 Subject: [PATCH 1/4] netcat-gnu: move to pkgs/tools/networking/netcat --- pkgs/tools/networking/{netcat-gnu => netcat}/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/tools/networking/{netcat-gnu => netcat}/default.nix (100%) diff --git a/pkgs/tools/networking/netcat-gnu/default.nix b/pkgs/tools/networking/netcat/default.nix similarity index 100% rename from pkgs/tools/networking/netcat-gnu/default.nix rename to pkgs/tools/networking/netcat/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31e091b810e..8e61a555aac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3877,7 +3877,7 @@ with pkgs; netcat = netcat-openbsd; - netcat-gnu = callPackage ../tools/networking/netcat-gnu { }; + netcat-gnu = callPackage ../tools/networking/netcat { }; netcat-openbsd = callPackage ../tools/networking/netcat-openbsd { }; From 949bb9887254be8b56cd7837e09bc7366b3e097f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 27 Apr 2018 19:33:05 -0500 Subject: [PATCH 2/4] libressl: build netcat --- pkgs/development/libraries/libressl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index ae03ef7ecb9..8f028bcb546 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -11,6 +11,8 @@ let inherit sha256; }; + configureFlags = [ "--enable-nc" ]; + enableParallelBuilding = true; outputs = [ "bin" "dev" "out" "man" ]; From 3c3b82234a6faa5a4c07323d0066452055d1ea81 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 27 Apr 2018 19:34:41 -0500 Subject: [PATCH 3/4] netcat-openbsd: remove --- .../networking/netcat-openbsd/default.nix | 51 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 pkgs/tools/networking/netcat-openbsd/default.nix 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 { }; From c2148482c2b4d479017d94c5e8b80bdc9bdb9a03 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 29 Apr 2018 14:46:54 -0500 Subject: [PATCH 4/4] libressl: move netcat stuff to '.nc' output I still feel weird about doing this because it seems a little hacky but this was requested by @Mic92 and seems understandable to not want to mix up libressl outputs with netcat stuff. --- pkgs/development/libraries/libressl/default.nix | 11 ++++++++--- pkgs/top-level/aliases.nix | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 8f028bcb546..b65c813f230 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, lib }: let @@ -15,11 +15,16 @@ let enableParallelBuilding = true; - outputs = [ "bin" "dev" "out" "man" ]; + outputs = [ "bin" "dev" "out" "man" "nc" ]; + + postFixup = '' + moveToOutput "bin/nc" "$nc" + moveToOutput "share/man/man1/nc.1${lib.optionalString (!dontGzipMan) ".gz"}" "$nc" + ''; dontGzipMan = if stdenv.isDarwin then true else null; # not sure what's wrong - meta = with stdenv.lib; { + meta = with lib; { description = "Free TLS/SSL implementation"; homepage = "http://www.libressl.org"; platforms = platforms.all; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a7f59d1268f..334905b79f2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -138,7 +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 + netcat-openbsd = libressl.nc; # 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