From 24b7d0de7be34a7612d13536963b8e35ec9b261a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 24 Jan 2020 19:05:23 +0100 Subject: iputils: Increase the priority to avoid collisions with inetutils (#78408) The ping binary will be from iputils anyway since it's installed in /run/wrappers/bin/ (first in $PATH) and tftpd will be from iputils as well since inetutils installs it into libexec (not in $PATH). Therefore, there's not even a real choice here (though we should most likely prefer iputils anyway). Current collisions: collision between `/nix/store/...-iputils-20190709/bin/ping' and `/nix/store/...-inetutils-1.9.4/bin/ping' collision between `/nix/store/...-iputils-20190709/share/man/man8/tftpd.8.gz' and `/nix/store/...-inetutils-1.9.4/share/man/man8/tftpd.8.gz' --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/top-level') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23e4b40130b..9b4cba331d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16259,7 +16259,8 @@ in iproute_mptcp = callPackage ../os-specific/linux/iproute/mptcp.nix { }; - iputils = callPackage ../os-specific/linux/iputils { }; + iputils = hiPrio (callPackage ../os-specific/linux/iputils { }); + # hiPrio for collisions with inetutils (ping and tftpd.8.gz) iptables = iptables-legacy; iptables-legacy = callPackage ../os-specific/linux/iptables { }; -- cgit 1.4.1