diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2020-01-24 19:05:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-24 19:05:23 +0100 |
| commit | 24b7d0de7be34a7612d13536963b8e35ec9b261a (patch) | |
| tree | bf70f500cab8f05ee07fc6fff9e22554f9a7e533 /pkgs/top-level | |
| parent | 89864a01d12fa10724dca23c60e8b20ed9daff88 (diff) | |
| download | nixpkgs-24b7d0de7be34a7612d13536963b8e35ec9b261a.tar nixpkgs-24b7d0de7be34a7612d13536963b8e35ec9b261a.tar.gz nixpkgs-24b7d0de7be34a7612d13536963b8e35ec9b261a.tar.bz2 nixpkgs-24b7d0de7be34a7612d13536963b8e35ec9b261a.tar.lz nixpkgs-24b7d0de7be34a7612d13536963b8e35ec9b261a.tar.xz nixpkgs-24b7d0de7be34a7612d13536963b8e35ec9b261a.tar.zst nixpkgs-24b7d0de7be34a7612d13536963b8e35ec9b261a.zip | |
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'
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
1 files changed, 2 insertions, 1 deletions
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 { }; |