Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 89864a01d12f
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 24b7d0de7be3
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 24, 2020

  1. iputils: Increase the priority to avoid collisions with inetutils (#7… 

    …8408)

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'
    @primeos
    primeos committed Jan 24, 2020
    Copy the full SHA
    24b7d0d View commit details
    Browse the repository at this point in the history