diff options
Diffstat (limited to 'nixpkgs/pkgs/os-specific/linux/iproute')
-rw-r--r-- | nixpkgs/pkgs/os-specific/linux/iproute/default.nix | 7 | ||||
-rw-r--r-- | nixpkgs/pkgs/os-specific/linux/iproute/mptcp.nix | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/os-specific/linux/iproute/default.nix b/nixpkgs/pkgs/os-specific/linux/iproute/default.nix index 46312a637da..a9fcf455ee4 100644 --- a/nixpkgs/pkgs/os-specific/linux/iproute/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/iproute/default.nix @@ -5,16 +5,19 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "5.6.0"; + version = "5.8.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - sha256 = "14j6n1bc09xhq8lxs40vfsx8bb8lx12a07ga4rsxl8vfrqjhwnqv"; + sha256 = "0vk4vickrpahdhl3zazr2qn2bf99v5549ncirjpwiy4h0a4izkfg"; }; preConfigure = '' # Don't try to create /var/lib/arpd: sed -e '/ARPDDIR/d' -i Makefile + # TODO: Drop temporary version fix for 5.8 (53159d81) once 5.9 is out: + substituteInPlace include/version.h \ + --replace "v5.7.0-77-gb687d1067169" "5.8.0" ''; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/os-specific/linux/iproute/mptcp.nix b/nixpkgs/pkgs/os-specific/linux/iproute/mptcp.nix index 4a58ae9e046..63f0abcd2a2 100644 --- a/nixpkgs/pkgs/os-specific/linux/iproute/mptcp.nix +++ b/nixpkgs/pkgs/os-specific/linux/iproute/mptcp.nix @@ -11,6 +11,12 @@ iproute.overrideAttrs (oa: rec { sha256 = "07fihvwlaj0ng8s8sxqhd0a9h1narcnp4ibk88km9cpsd32xv4q3"; }; + preConfigure = '' + # Don't try to create /var/lib/arpd: + sed -e '/ARPDDIR/d' -i Makefile + patchShebangs configure + ''; + meta = with stdenv.lib; { homepage = "https://github.com/multipath-tcp/iproute-mptcp"; description = "IP-Route extensions for MultiPath TCP"; |