summary refs log tree commit diff
path: root/pkgs/os-specific/linux/iproute
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2021-09-04 17:03:10 +0200
committerMichael Weiss <dev.primeos@gmail.com>2021-09-04 17:06:11 +0200
commit247aed0528087cb3f29d6d6798731756cdb6a681 (patch)
treea685aca1507a7c8142c6c6c2c7ec5b1aa8cd59da /pkgs/os-specific/linux/iproute
parentb1db7ae7fb8af14735904421fa7359e2a2e785d1 (diff)
downloadnixpkgs-247aed0528087cb3f29d6d6798731756cdb6a681.tar
nixpkgs-247aed0528087cb3f29d6d6798731756cdb6a681.tar.gz
nixpkgs-247aed0528087cb3f29d6d6798731756cdb6a681.tar.bz2
nixpkgs-247aed0528087cb3f29d6d6798731756cdb6a681.tar.lz
nixpkgs-247aed0528087cb3f29d6d6798731756cdb6a681.tar.xz
nixpkgs-247aed0528087cb3f29d6d6798731756cdb6a681.tar.zst
nixpkgs-247aed0528087cb3f29d6d6798731756cdb6a681.zip
iproute2: 5.13.0 -> 5.14.0
"End of summer sale, get your new iproute2 just in time for fall!
This is a relatively low volume release (maybe because of summer
doldrums)." [0]

[0]: https://lore.kernel.org/netdev/20210831120452.71325cd8@hermes.local/
Diffstat (limited to 'pkgs/os-specific/linux/iproute')
-rw-r--r--pkgs/os-specific/linux/iproute/default.nix14
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index ea3c4d36958..74003ff83b8 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -1,17 +1,25 @@
-{ lib, stdenv, fetchurl
+{ lib, stdenv, fetchurl, fetchpatch
 , buildPackages, bison, flex, pkg-config
 , db, iptables, libelf, libmnl
 }:
 
 stdenv.mkDerivation rec {
   pname = "iproute2";
-  version = "5.13.0";
+  version = "5.14.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-cqLlN3TKyeZfe2F97rsgWfh+iWDW6XE+TXiM6pZvGzY=";
+    sha256 = "1m4ifnxq7lxnm95l5354z8dk3xj6w9isxmbz53266drgln2sf3r1";
   };
 
+  patches = [
+    # To avoid ./configure failing due to invalid arguments:
+    (fetchpatch { # configure: restore backward compatibility
+      url = "https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/patch/?id=a3272b93725a406bc98b67373da67a4bdf6fcdb0";
+      sha256 = "0hyagh2lf6rrfss4z7ca8q3ydya6gg7vfhh25slhpgcn6lnk0xbv";
+    })
+  ];
+
   preConfigure = ''
     # Don't try to create /var/lib/arpd:
     sed -e '/ARPDDIR/d' -i Makefile