From e2372502d3d0503711ea792a74292373286e5c8f Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 30 Oct 2016 02:52:47 +0200 Subject: 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. --- pkgs/applications/misc/playonlinux/default.nix | 4 ++-- pkgs/build-support/vm/windows/bootstrap.nix | 4 ++-- pkgs/build-support/vm/windows/controller/default.nix | 6 +++--- pkgs/build-support/vm/windows/default.nix | 2 +- .../xfce/panel-plugins/xfce4-sensors-plugin.nix | 6 +++--- pkgs/tools/networking/netcat-gnu/default.nix | 17 +++++++++++++++++ pkgs/tools/networking/netcat/default.nix | 17 ----------------- pkgs/top-level/all-packages.nix | 4 +++- 8 files changed, 31 insertions(+), 29 deletions(-) create mode 100644 pkgs/tools/networking/netcat-gnu/default.nix delete mode 100644 pkgs/tools/networking/netcat/default.nix (limited to 'pkgs') diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 4050f8bf5894..b604905320b2 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -7,7 +7,7 @@ , gnupg1compat , icoutils , imagemagick -, netcat +, netcat-gnu , p7zip , python2Packages , unzip @@ -34,7 +34,7 @@ let gnupg1compat icoutils imagemagick - netcat + netcat-gnu p7zip unzip wget 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; }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix index 770f34490235..3314d313ad2c 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, gnome2, libxfce4ui, - libxfce4util, xfce4panel, libnotify, lm_sensors, hddtemp, netcat + libxfce4util, xfce4panel, libnotify, lm_sensors, hddtemp, netcat-gnu }: stdenv.mkDerivation rec { @@ -26,14 +26,14 @@ stdenv.mkDerivation rec { libnotify lm_sensors hddtemp - netcat + netcat-gnu ]; enableParallelBuilding = true; configureFlags = [ "--with-pathhddtemp=${hddtemp}/bin/hddtemp" - "--with-pathnetcat=${netcat}/bin/netcat" + "--with-pathnetcat=${netcat-gnu}/bin/netcat" ]; meta = { diff --git a/pkgs/tools/networking/netcat-gnu/default.nix b/pkgs/tools/networking/netcat-gnu/default.nix new file mode 100644 index 000000000000..47ec804e5d48 --- /dev/null +++ b/pkgs/tools/networking/netcat-gnu/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "netcat-gnu-0.7.1"; + + src = fetchurl { + url = mirror://sourceforge/netcat/netcat-0.7.1.tar.bz2; + sha256 = "1frjcdkhkpzk0f84hx6hmw5l0ynpmji8vcbaxg8h5k2svyxz0nmm"; + }; + + meta = with stdenv.lib; { + description = "Utility which reads and writes data across network connections"; + homepage = http://netcat.sourceforge.net/; + license = licenses.gpl2Plus; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/networking/netcat/default.nix b/pkgs/tools/networking/netcat/default.nix deleted file mode 100644 index 47ec804e5d48..000000000000 --- a/pkgs/tools/networking/netcat/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "netcat-gnu-0.7.1"; - - src = fetchurl { - url = mirror://sourceforge/netcat/netcat-0.7.1.tar.bz2; - sha256 = "1frjcdkhkpzk0f84hx6hmw5l0ynpmji8vcbaxg8h5k2svyxz0nmm"; - }; - - meta = with stdenv.lib; { - description = "Utility which reads and writes data across network connections"; - homepage = http://netcat.sourceforge.net/; - license = licenses.gpl2Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc0d7f1f6063..df4f8d066eca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2795,7 +2795,9 @@ in netboot = callPackage ../tools/networking/netboot {}; - netcat = callPackage ../tools/networking/netcat { }; + netcat = netcat-openbsd; + + netcat-gnu = callPackage ../tools/networking/netcat-gnu { }; netcat-openbsd = callPackage ../tools/networking/netcat-openbsd { }; -- cgit 1.4.1