From b38f14f58b2ca404c958f90d8313f0a2887d227c Mon Sep 17 00:00:00 2001 From: Yureka Date: Sun, 12 Oct 2025 18:59:38 +0200 Subject: [PATCH] iproute2: add patch for redefinition error musl Fixes pkgsMusl.iproute2 after the update to 6.17.0 --- pkgs/by-name/ip/iproute2/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/ip/iproute2/package.nix b/pkgs/by-name/ip/iproute2/package.nix index 645d8b07fd0d..ea44bacf92f2 100644 --- a/pkgs/by-name/ip/iproute2/package.nix +++ b/pkgs/by-name/ip/iproute2/package.nix @@ -36,6 +36,15 @@ stdenv.mkDerivation rec { url = "https://lore.kernel.org/netdev/20240804161054.942439-1-dilfridge@gentoo.org/raw"; hash = "sha256-47obv6mIn/HO47lt47slpTAFDxiQ3U/voHKzIiIGCTM="; }) + ] + # Temporarily gated to keep rebuild counts under control. + # The proper fix (targeted to staging) is done in https://github.com/NixOS/nixpkgs/pull/451397 + ++ lib.optionals stdenv.hostPlatform.isMusl [ + (fetchurl { + name = "musl-redefinition.patch"; + url = "https://lore.kernel.org/netdev/20251012124002.296018-1-yureka@cyberchaos.dev/raw"; + hash = "sha256-8gSpZb/B5sMd2OilUQqg0FqM9y3GZd5Ch5AXV5wrCZQ="; + }) ]; postPatch = ''