public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netcat: make netcat-openbsd the default netcat (#19411)

Browse Source 
The motivation for this change is the following: As gnu-netcat,
e. g. does not support ipv6, it is not suitable as default netcat.

This commit also fixes all obvious build issues caused by this change.
This commit is contained in:
sternenseemann
2016-10-30 15:06:04 +01:00
parent 750af04bad
commit e2372502d3
9 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/build-support/vm/windows/bootstrap.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, vmTools, writeScript, writeText, runCommand, makeInitrd
, python, perl, coreutils, dosfstools, gzip, mtools, netcat, openssh, qemu
, python, perl, coreutils, dosfstools, gzip, mtools, netcat-gnu, openssh, qemu
, samba, socat, vde2, cdrkit, pathsFromGraph, gnugrep
}:
@@ -10,7 +10,7 @@ with stdenv.lib;
let
controller = import ./controller {
inherit stdenv writeScript vmTools makeInitrd;
inherit samba vde2 openssh socat netcat coreutils gzip gnugrep;
inherit samba vde2 openssh socat netcat-gnu coreutils gzip gnugrep;
};
mkCygwinImage = import ./cygwin-iso {
pkgs/build-support/vm/windows/controller/default.nix
+3 -3
View File
@@ -1,5 +1,5 @@
{ stdenv, writeScript, vmTools, makeInitrd
, samba, vde2, openssh, socat, netcat, coreutils, gnugrep, gzip
, samba, vde2, openssh, socat, netcat-gnu, coreutils, gnugrep, gzip
}:
{ sshKey
@@ -79,7 +79,7 @@ let
${coreutils}/bin/chmod 600 /ssh.key
'' + (if installMode then ''
echo -n "Waiting for Windows installation to finish..."
while ! ${netcat}/bin/netcat -z 192.168.0.1 22; do
while ! ${netcat-gnu}/bin/netcat -z 192.168.0.1 22; do
echo -n .
# Print a dot every 10 seconds only to shorten line length.
${coreutils}/bin/sleep 10
@@ -118,7 +118,7 @@ let
${samba}/sbin/smbd -D
echo -n "Waiting for Windows VM to become available..."
while ! ${netcat}/bin/netcat -z 192.168.0.1 22; do
while ! ${netcat-gnu}/bin/netcat -z 192.168.0.1 22; do
echo -n .
${coreutils}/bin/sleep 1
done
pkgs/build-support/vm/windows/default.nix
+1 -1
View File
@@ -3,7 +3,7 @@ pkgs:
let
bootstrapper = import ./bootstrap.nix {
inherit (pkgs) stdenv vmTools writeScript writeText runCommand makeInitrd;
inherit (pkgs) coreutils dosfstools gzip mtools netcat openssh qemu samba;
inherit (pkgs) coreutils dosfstools gzip mtools netcat-gnu openssh qemu samba;
inherit (pkgs) socat vde2 fetchurl python perl cdrkit pathsFromGraph;
inherit (pkgs) gnugrep;
};