nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 16:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux: remove patch backport

Browse Source
This commit is contained in:
K900 2024-11-01 08:10:32 +03:00
parent 8fac93634b
commit c845b35460
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -60,14 +60,4 @@
name = "export-rt-sched-migrate"; name = "export-rt-sched-migrate";
patch = ./export-rt-sched-migrate.patch; patch = ./export-rt-sched-migrate.patch;
}; };
# Backport upstream fix for very annoying Tailscale issue
# FIXME: remove when merged upstream
netfilter-typo-fix = {
name = "netfilter-typo-fix";
patch = fetchpatch {
url = "https://lore.kernel.org/netdev/20241021094536.81487-3-pablo@netfilter.org/raw";
hash = "sha256-ZGc1xAIjf+MlV02jhIWZ4jHC742+z/WpN7RenqpU7e4=";
};
};
} }

10
pkgs/top-level/linux-kernels.nix
View File

@ -54,7 +54,7 @@ let
broken = kernel.meta.broken; broken = kernel.meta.broken;
}; };
}; };
kernelPatches = lib.filter ({ name ? null, ... }: name != "netfilter-typo-fix") kernel.kernelPatches ++ [ kernelPatches = kernel.kernelPatches ++ [
kernelPatches.hardened.${kernel.meta.branch} kernelPatches.hardened.${kernel.meta.branch}
]; ];
isHardened = true; isHardened = true;
@ -138,7 +138,6 @@ in {
kernelPatches = [ kernelPatches = [
kernelPatches.bridge_stp_helper kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper kernelPatches.request_key_helper
kernelPatches.netfilter-typo-fix
]; ];
}; };
@ -147,7 +146,6 @@ in {
kernelPatches.bridge_stp_helper kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper kernelPatches.request_key_helper
kernelPatches.export-rt-sched-migrate kernelPatches.export-rt-sched-migrate
kernelPatches.netfilter-typo-fix
]; ];
}; };
@ -156,7 +154,6 @@ in {
kernelPatches = [ kernelPatches = [
kernelPatches.bridge_stp_helper kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper kernelPatches.request_key_helper
kernelPatches.netfilter-typo-fix
]; ];
}; };
@ -165,7 +162,6 @@ in {
kernelPatches.bridge_stp_helper kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper kernelPatches.request_key_helper
kernelPatches.export-rt-sched-migrate kernelPatches.export-rt-sched-migrate
kernelPatches.netfilter-typo-fix
]; ];
}; };
@ -174,7 +170,6 @@ in {
kernelPatches = [ kernelPatches = [
kernelPatches.bridge_stp_helper kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper kernelPatches.request_key_helper
kernelPatches.netfilter-typo-fix
]; ];
}; };
@ -183,7 +178,6 @@ in {
kernelPatches.bridge_stp_helper kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper kernelPatches.request_key_helper
kernelPatches.export-rt-sched-migrate kernelPatches.export-rt-sched-migrate
kernelPatches.netfilter-typo-fix
]; ];
}; };
@ -192,7 +186,6 @@ in {
kernelPatches = [ kernelPatches = [
kernelPatches.bridge_stp_helper kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper kernelPatches.request_key_helper
kernelPatches.netfilter-typo-fix
]; ];
}; };
@ -204,7 +197,6 @@ in {
kernelPatches = [ kernelPatches = [
kernelPatches.bridge_stp_helper kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper kernelPatches.request_key_helper
kernelPatches.netfilter-typo-fix
]; ];
}; };
latest = packageAliases.linux_latest.kernel; latest = packageAliases.linux_latest.kernel;