From db1e1ed86114fdd837a75a4d55ecd53faefefab4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 23 Oct 2024 21:21:17 +0200 Subject: [PATCH] linux_hardened: hacky build fix Closes #350681 The netfilter patch doesn't apply on the hardened branch. It will (hopefully) be upstream anyways soon, so let's just ignore it here to unbreak hardened for everyone else. --- pkgs/top-level/linux-kernels.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 384592c4124d..b9225acdb2b7 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -54,7 +54,7 @@ let broken = kernel.meta.broken; }; }; - kernelPatches = kernel.kernelPatches ++ [ + kernelPatches = lib.filter ({ name ? null, ... }: name != "netfilter-typo-fix") kernel.kernelPatches ++ [ kernelPatches.hardened.${kernel.meta.branch} ]; isHardened = true;