From c2148482c2b4d479017d94c5e8b80bdc9bdb9a03 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 29 Apr 2018 14:46:54 -0500 Subject: [PATCH] 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