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

iproute: deprecate alias

Browse Source
This commit is contained in:
Sandro Jäckel
2021-04-04 01:43:46 +02:00
parent dd9862ba98
commit 9378fdf87e
71 changed files with 140 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/networking/ddclient/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ lib, fetchurl, perlPackages, iproute, perl }:
{ lib, fetchurl, perlPackages, iproute2, perl }:
perlPackages.buildPerlPackage rec {
pname = "ddclient";
@@ -19,8 +19,8 @@ perlPackages.buildPerlPackage rec {
touch Makefile.PL
substituteInPlace ddclient \
--replace 'in the output of ifconfig' 'in the output of ip addr show' \
--replace 'ifconfig -a' '${iproute}/sbin/ip addr show' \
--replace 'ifconfig $arg' '${iproute}/sbin/ip addr show $arg' \
--replace 'ifconfig -a' '${iproute2}/sbin/ip addr show' \
--replace 'ifconfig $arg' '${iproute2}/sbin/ip addr show $arg' \
--replace '/usr/bin/perl' '${perl}/bin/perl' # Until we get the patchShebangs fixed (issue #55786) we need to patch this manually
'';
pkgs/tools/networking/dhcp/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, file, nettools, iputils, iproute, makeWrapper
{ stdenv, fetchurl, perl, file, nettools, iputils, iproute2, makeWrapper
, coreutils, gnused, openldap ? null
, buildPackages, lib
}:
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
cp client/scripts/linux $out/sbin/dhclient-script
substituteInPlace $out/sbin/dhclient-script \
--replace /sbin/ip ${iproute}/sbin/ip
--replace /sbin/ip ${iproute2}/sbin/ip
wrapProgram "$out/sbin/dhclient-script" --prefix PATH : \
"${nettools}/bin:${nettools}/sbin:${iputils}/bin:${coreutils}/bin:${gnused}/bin"
'';
pkgs/tools/networking/gvpe/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, openssl, gmp, zlib, iproute, nettools }:
{ lib, stdenv, fetchurl, openssl, gmp, zlib, iproute2, nettools }:
stdenv.mkDerivation rec {
pname = "gvpe";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
];
preBuild = ''
sed -e 's@"/sbin/ifconfig.*"@"${iproute}/sbin/ip link set $IFNAME address $MAC mtu $MTU"@' -i src/device-linux.C
sed -e 's@"/sbin/ifconfig.*"@"${iproute2}/sbin/ip link set $IFNAME address $MAC mtu $MTU"@' -i src/device-linux.C
sed -e 's@/sbin/ifconfig@${nettools}/sbin/ifconfig@g' -i src/device-*.C
'';
pkgs/tools/networking/libreswan/default.nix
+3 -3
View File
@@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, makeWrapper,
pkg-config, systemd, gmp, unbound, bison, flex, pam, libevent, libcap_ng, curl, nspr,
bash, iproute, iptables, procps, coreutils, gnused, gawk, nss, which, python3,
bash, iproute2, iptables, procps, coreutils, gnused, gawk, nss, which, python3,
docs ? false, xmlto, libselinux, ldns
}:
let
binPath = lib.makeBinPath [
bash iproute iptables procps coreutils gnused gawk nss.tools which python3
bash iproute2 iptables procps coreutils gnused gawk nss.tools which python3
];
in
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
pkg-config
];
buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound pam libevent
buildInputs = [ bash iproute2 iptables systemd coreutils gnused gawk gmp unbound pam libevent
libcap_ng curl nspr nss python3 ldns ]
++ lib.optional docs xmlto
++ lib.optional stdenv.isLinux libselinux;
pkgs/tools/networking/miniupnpd/default.nix
+2 -2
View File
@@ -1,9 +1,9 @@
{ stdenv, lib, fetchurl, iptables, libuuid, pkg-config
, which, iproute, gnused, coreutils, gawk, makeWrapper
, which, iproute2, gnused, coreutils, gawk, makeWrapper
}:
let
scriptBinEnv = lib.makeBinPath [ which iproute iptables gnused coreutils gawk ];
scriptBinEnv = lib.makeBinPath [ which iproute2 iptables gnused coreutils gawk ];
in
stdenv.mkDerivation rec {
name = "miniupnpd-2.1.20190502";
pkgs/tools/networking/miredo/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, nettools, iproute, judy }:
{ lib, stdenv, fetchurl, nettools, iproute2, judy }:
stdenv.mkDerivation rec {
version = "1.2.6";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
substituteInPlace misc/client-hook.bsd \
--replace '/sbin/route' '${nettools}/bin/route' \
--replace '/sbin/ifconfig' '${nettools}/bin/ifconfig'
substituteInPlace misc/client-hook.iproute --replace '/sbin/ip' '${iproute}/bin/ip'
substituteInPlace misc/client-hook.iproute --replace '/sbin/ip' '${iproute2}/bin/ip'
'';
configureFlags = [ "--with-Judy" ];
pkgs/tools/networking/openvpn/default.nix
+4 -4
View File
@@ -3,7 +3,7 @@
, pkg-config
, makeWrapper
, runtimeShell
, iproute
, iproute2
, lzo
, openssl
, pam
@@ -40,13 +40,13 @@ let
buildInputs = [ lzo openssl ]
++ optional stdenv.isLinux pam
++ optional withIpRoute iproute
++ optional withIpRoute iproute2
++ optional useSystemd systemd
++ optional pkcs11Support pkcs11helper;
configureFlags = optionals withIpRoute [
"--enable-iproute2"
"IPROUTE=${iproute}/sbin/ip"
"IPROUTE=${iproute2}/sbin/ip"
]
++ optional useSystemd "--enable-systemd"
++ optional pkcs11Support "--enable-pkcs11"
@@ -60,7 +60,7 @@ let
'' + optionalString useSystemd ''
install -Dm555 ${update-resolved} $out/libexec/update-systemd-resolved
wrapProgram $out/libexec/update-systemd-resolved \
--prefix PATH : ${makeBinPath [ runtimeShell iproute systemd util-linux ]}
--prefix PATH : ${makeBinPath [ runtimeShell iproute2 systemd util-linux ]}
'';
enableParallelBuilding = true;
pkgs/tools/networking/openvpn/update-systemd-resolved.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub
, makeWrapper
, iproute, systemd, coreutils, util-linux }:
, iproute2, systemd, coreutils, util-linux }:
stdenv.mkDerivation rec {
pname = "update-systemd-resolved";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
installPhase = ''
wrapProgram $out/libexec/openvpn/update-systemd-resolved \
--prefix PATH : ${lib.makeBinPath [ iproute systemd coreutils util-linux ]}
--prefix PATH : ${lib.makeBinPath [ iproute2 systemd coreutils util-linux ]}
'';
meta = with lib; {
pkgs/tools/networking/pptp/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, perl, ppp, iproute }:
{ lib, stdenv, fetchurl, perl, ppp, iproute2 }:
stdenv.mkDerivation rec {
pname = "pptp";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
'';
preConfigure = ''
makeFlagsArray=( IP=${iproute}/bin/ip PPPD=${ppp}/sbin/pppd \
makeFlagsArray=( IP=${iproute2}/bin/ip PPPD=${ppp}/sbin/pppd \
BINDIR=$out/sbin MANDIR=$out/share/man/man8 \
PPPDIR=$out/etc/ppp )
'';
pkgs/tools/networking/shorewall/default.nix
+3 -3
View File
@@ -3,7 +3,7 @@
, fetchurl
, gnugrep
, gnused
, iproute
, iproute2
, ipset
, iptables
, perl
@@ -15,7 +15,7 @@
let
PATH = lib.concatStringsSep ":"
[ "${coreutils}/bin"
"${iproute}/bin"
"${iproute2}/bin"
"${iptables}/bin"
"${ipset}/bin"
"${ebtables}/bin"
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
buildInputs = [
coreutils
iproute
iproute2
ipset
iptables
ebtables
pkgs/tools/networking/wicd/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, python2Packages
, wpa_supplicant, dhcp, dhcpcd, wirelesstools
, nettools, openresolv, iproute, iputils }:
, nettools, openresolv, iproute2, iputils }:
let
inherit (python2Packages) python pygobject2 dbus-python pyGtkGlade pycairo;
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default
sed -i "2iexport PATH=${lib.makeBinPath [ python wpa_supplicant dhcpcd dhcp wirelesstools nettools nettools iputils openresolv iproute ]}\$\{PATH:+:\}\$PATH" in/scripts=wicd.in
sed -i "2iexport PATH=${lib.makeBinPath [ python wpa_supplicant dhcpcd dhcp wirelesstools nettools nettools iputils openresolv iproute2 ]}\$\{PATH:+:\}\$PATH" in/scripts=wicd.in
sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject2}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in
sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in
sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pygobject2})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in
pkgs/tools/networking/wireguard-tools/default.nix
+2 -2
View File
@@ -3,7 +3,7 @@
, fetchzip
, nixosTests
, iptables
, iproute
, iproute2
, makeWrapper
, openresolv
, procps
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
--replace /usr/bin $out/bin
'' + lib.optionalString stdenv.isLinux ''
for f in $out/bin/*; do
wrapProgram $f --prefix PATH : ${lib.makeBinPath [ procps iproute iptables openresolv ]}
wrapProgram $f --prefix PATH : ${lib.makeBinPath [ procps iproute2 iptables openresolv ]}
done
'' + lib.optionalString stdenv.isDarwin ''
for f in $out/bin/*; do
pkgs/tools/networking/zerotierone/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, buildPackages, fetchFromGitHub, openssl, lzo, zlib, iproute, ronn }:
{ lib, stdenv, buildPackages, fetchFromGitHub, openssl, lzo, zlib, iproute2, ronn }:
stdenv.mkDerivation rec {
pname = "zerotierone";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ ronn ];
buildInputs = [ openssl lzo zlib iproute ];
buildInputs = [ openssl lzo zlib iproute2 ];
enableParallelBuilding = true;