From d148d0de777c4d2b707a9d4154a1f7e37ed2d995 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 3 Dec 2024 21:18:05 +0100 Subject: treewide: iproute -> iproute2 --- pkgs/simple/q/default.nix | 4 ++-- pkgs/simple/xkiller.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/simple') diff --git a/pkgs/simple/q/default.nix b/pkgs/simple/q/default.nix index a1e60e3..ca4a466 100644 --- a/pkgs/simple/q/default.nix +++ b/pkgs/simple/q/default.nix @@ -83,13 +83,13 @@ let q-net = /* sh */ '' for dev in $( - ${pkgs.iproute}/bin/ip a | + ${pkgs.iproute2}/bin/ip a | ${pkgs.gnused}/bin/sed -rn 's/^[0-9]+: ([^:]+):.*/\1/p' | ${pkgs.gnugrep}/bin/grep -Ev '^(lo|retiolum|wiregrill)$' # TODO wiregrill ping ni.w, retiolum ping ni.r ); do { - inet=$(${pkgs.iproute}/bin/ip addr show $dev \ + inet=$(${pkgs.iproute2}/bin/ip addr show $dev \ | ${pkgs.gnused}/bin/sed -n ' s/.*inet \([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/p ') diff --git a/pkgs/simple/xkiller.nix b/pkgs/simple/xkiller.nix index 8d8f016..9d83047 100644 --- a/pkgs/simple/xkiller.nix +++ b/pkgs/simple/xkiller.nix @@ -2,7 +2,7 @@ pkgs.writeDash "xkiller" '' set -efu exec >&2 - ${pkgs.iproute}/bin/ss -lp src unix:/tmp/.X11-unix/X* | + ${pkgs.iproute2}/bin/ss -lp src unix:/tmp/.X11-unix/X* | ${pkgs.gnused}/bin/sed -n ' s|.*/tmp/.X11-unix/X\([0-9]\+\)\>.*("X[^"]*",pid=\([0-9]\+\)\>.*|\1 \2|p ' | -- cgit v1.2.3 [cgit] Unable to lock slot /tmp/cgit/ff200000.lock: Permission denied (13)