iproute: deprecate alias
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{lib, stdenv, fetchurl, openssl, nettools, iproute, sysctl}:
|
||||
{lib, stdenv, fetchurl, openssl, nettools, iproute2, sysctl}:
|
||||
|
||||
let baseName = "gogoclient";
|
||||
version = "1.2";
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace "$out/template/linux.sh" \
|
||||
--replace "/sbin/ifconfig" "${nettools}/bin/ifconfig" \
|
||||
--replace "/sbin/route" "${nettools}/bin/route" \
|
||||
--replace "/sbin/ip" "${iproute}/sbin/ip" \
|
||||
--replace "/sbin/ip" "${iproute2}/sbin/ip" \
|
||||
--replace "/sbin/sysctl" "${sysctl}/bin/sysctl"
|
||||
sed -i -e 's/^.*Exec \$route -A.*$/& metric 128/' $out/template/linux.sh
|
||||
'';
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, python, kernel, makeWrapper, writeText
|
||||
, gawk, iproute }:
|
||||
, gawk, iproute2 }:
|
||||
|
||||
let
|
||||
libexec = "libexec/hypervkvpd";
|
||||
@@ -42,7 +42,7 @@ let
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/hv_kvp_daemon \
|
||||
--prefix PATH : $out/bin:${lib.makeBinPath [ gawk iproute ]}
|
||||
--prefix PATH : $out/bin:${lib.makeBinPath [ gawk iproute2 ]}
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib, iproute, fetchFromGitHub }:
|
||||
{ lib, iproute2, fetchFromGitHub }:
|
||||
|
||||
iproute.overrideAttrs (oa: rec {
|
||||
iproute2.overrideAttrs (oa: rec {
|
||||
pname = "iproute_mptcp";
|
||||
version = "0.95";
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, makeWrapper, pkg-config, util-linux, which
|
||||
, procps, libcap_ng, openssl, python2, iproute , perl
|
||||
, procps, libcap_ng, openssl, python2, perl
|
||||
, automake, autoconf, libtool, kernel ? null }:
|
||||
|
||||
with lib;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, fetchFromGitHub, makeWrapper
|
||||
, bridge-utils, iproute, lxc, openvswitch, docker, busybox, dhcpcd, dhcp
|
||||
, bridge-utils, iproute2, lxc, openvswitch, docker, busybox, dhcpcd, dhcp
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
|
||||
installPhase = ''
|
||||
install -D pipework $out/bin/pipework
|
||||
wrapProgram $out/bin/pipework --prefix PATH : \
|
||||
${lib.makeBinPath [ bridge-utils iproute lxc openvswitch docker busybox dhcpcd dhcp ]};
|
||||
${lib.makeBinPath [ bridge-utils iproute2 lxc openvswitch docker busybox dhcpcd dhcp ]};
|
||||
'';
|
||||
meta = with lib; {
|
||||
description = "Software-Defined Networking tools for LXC";
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, docutils
|
||||
, pandoc, ethtool, iproute, libnl, udev, python3, perl
|
||||
, pandoc, ethtool, iproute2, libnl, udev, python3, perl
|
||||
, makeWrapper
|
||||
} :
|
||||
|
||||
@@ -18,7 +18,7 @@ in stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config pandoc docutils makeWrapper ];
|
||||
buildInputs = [ libnl ethtool iproute udev python3 perl ];
|
||||
buildInputs = [ libnl ethtool iproute2 udev python3 perl ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_INSTALL_RUNDIR=/run"
|
||||
|
||||
Reference in New Issue
Block a user