Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace netcat-openbsd with libressl #39634

Merged
merged 4 commits into from
Apr 29, 2018
Merged

Replace netcat-openbsd with libressl #39634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99b8d10
netcat-gnu: move to pkgs/tools/networking/netcat
matthewbauer Apr 28, 2018
949bb98
libressl: build netcat
matthewbauer Apr 28, 2018
3c3b822
netcat-openbsd: remove
matthewbauer Apr 28, 2018
c214848
libressl: move netcat stuff to '.nc' output
matthewbauer Apr 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions pkgs/development/libraries/libressl/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:

let

Expand All @@ -11,13 +11,20 @@ let
inherit sha256;
};

configureFlags = [ "--enable-nc" ];

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;
Expand Down
51 changes: 0 additions & 51 deletions pkgs/tools/networking/netcat-openbsd/default.nix
View file
Open in desktop

This file was deleted.

0 pkgs/tools/networking/netcat-gnu/default.nix → pkgs/tools/networking/netcat/default.nix
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions pkgs/top-level/aliases.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.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
Expand Down
4 changes: 1 addition & 3 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3877,9 +3877,7 @@ with pkgs;

netcat = netcat-openbsd;

netcat-gnu = callPackage ../tools/networking/netcat-gnu { };

netcat-openbsd = callPackage ../tools/networking/netcat-openbsd { };
netcat-gnu = callPackage ../tools/networking/netcat { };

nethogs = callPackage ../tools/networking/nethogs { };

Expand Down