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

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.

3 files changed, 6 insertions, 6 deletions

diff --git a/pkgs/build-support/vm/windows/bootstrap.nix b/pkgs/build-support/vm/windows/bootstrap.nix
index ebea819b1910..3b06d8f47490 100644
--- a/pkgs/build-support/vm/windows/bootstrap.nix
+++ b/pkgs/build-support/vm/windows/bootstrap.nix
@@ -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 {
diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix
index 06a0a2293064..9009702113ea 100644
--- a/pkgs/build-support/vm/windows/controller/default.nix
+++ b/pkgs/build-support/vm/windows/controller/default.nix
@@ -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
diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix
index f9f1d75c70d6..c668e7569a44 100644
--- a/pkgs/build-support/vm/windows/default.nix
+++ b/pkgs/build-support/vm/windows/default.nix
@@ -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;
   };