From e74ce644d04bda2fc239ade98f5b139655fda827 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 20 Nov 2024 06:42:36 +0000 Subject: [PATCH] iproute2: 6.11.0 -> 6.12.0 Changes: https://www.spinics.net/lists/netdev/msg1047599.html --- pkgs/by-name/ip/iproute2/package.nix | 29 +++------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/pkgs/by-name/ip/iproute2/package.nix b/pkgs/by-name/ip/iproute2/package.nix index 923a5cc8b309..6ca8651c9a4c 100644 --- a/pkgs/by-name/ip/iproute2/package.nix +++ b/pkgs/by-name/ip/iproute2/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl , buildPackages, bison, flex, pkg-config , db, iptables, elfutils, libmnl ,libbpf , gitUpdater, pkgsStatic @@ -6,36 +6,13 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "6.11.0"; + version = "6.12.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-H3lTmKBK6qzQao9qziz9kTwz+llTypnaroO7XFNGEcM="; + hash = "sha256-u9FB73tdASfMIVKEO6YfJ03DKBT6Pg8T59B6CAvvU9k="; }; - patches = [ - (fetchurl { - name = "musl-endian.patch"; - url = "https://lore.kernel.org/netdev/20240712191209.31324-1-contact@hacktivis.me/raw"; - hash = "sha256-MX+P+PSEh6XlhoWgzZEBlOV9aXhJNd20Gi0fJCcSZ5E="; - }) - (fetchurl { - name = "musl-msghdr.patch"; - url = "https://lore.kernel.org/netdev/20240712191209.31324-2-contact@hacktivis.me/raw"; - hash = "sha256-X5BYSZBxcvdjtX1069a1GfcpdoVd0loSAe4xTpbCipA="; - }) - (fetchurl { - name = "musl-basename.patch"; - url = "https://lore.kernel.org/netdev/20240804161054.942439-1-dilfridge@gentoo.org/raw"; - hash = "sha256-47obv6mIn/HO47lt47slpTAFDxiQ3U/voHKzIiIGCTM="; - }) - (fetchpatch { - name = "musl-mst.patch"; - url = "https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/patch/?id=6a77abab92516e65f07f8657fc4e384c4541ce0e"; - hash = "sha256-19FzTDvgnmqVFBykVgXl4VIsHs8Cy9NWGOLpxifxVlI="; - }) - ]; - postPatch = '' substituteInPlace Makefile \ --replace "CC := gcc" "CC ?= $CC"