iproute2: 4.5.0 -> 4.7.0 (#18435)

iproute now packages a bash-completion file which it installs to
$BASH_COMPDIR.

* fanpatch: adjust for new version

- The patch did not apply because the code around the additions changed.
- The patch uses functions that got changed [1] & [2], I adjusted the
  patch to use the safe version. Probably not needed but better safe
  than sorry.
[1] format_host: http://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/commit/?id=a418e451643e77fe36861e53359587ba8aa41873
[2] rt_addr_n2a: http://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/commit/?id=7faf1588a755edb9c9cabbe1d3211265e9826d28
This commit is contained in:
Alexander Ried
2016-09-25 15:07:03 +02:00
committed by Franz Pletz
parent 30ae939142
commit 7615d6385a
4 changed files with 13 additions and 11 deletions
+4 -2
View File
@@ -3,11 +3,12 @@
}:
stdenv.mkDerivation rec {
name = "iproute2-4.5.0";
name = "iproute2-${version}";
version = "4.7.0";
src = fetchurl {
url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz";
sha256 = "0jj9phsi8m2sbnz7bbh9cf9vckm67hs62ab5srdwnrg4acpjj59z";
sha256 = "14kvpdlxq8204f5ayfdfb6mc0423mbf3px9q0spdly9sng7xnq4g";
};
patches = lib.optionals enableFan [
@@ -28,6 +29,7 @@ stdenv.mkDerivation rec {
"LIBDIR=$(out)/lib"
"SBINDIR=$(out)/sbin"
"MANDIR=$(out)/share/man"
"BASH_COMPDIR=$(out)/share/bash-completion/completions/iproute2"
"DOCDIR=$(TMPDIR)/share/doc/${name}" # Don't install docs
];