dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge: Kernel updates for 2024-11-01 (#352789)

Browse Source
This commit is contained in:
Maximilian Bosch 2024-11-01 15:43:30 +01:00 committed by GitHub
commit d9118f0d0d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/os-specific/linux/kernel/kernels-org.json
View File

@ -1,15 +1,15 @@
{
"testing": {
"version": "6.12-rc4",
"hash": "sha256:0qr5sbpm512rlkylqmqhy644s4lmfr1igvmx8ds0mrb54h3qhkwk"
"version": "6.12-rc5",
"hash": "sha256:18zh3nwhsz1hpyhmlim9a2hz8yvx5psrrav4346k46x9ybfardqy"
},
"6.1": {
"version": "6.1.114",
"hash": "sha256:0mm2392qk01p9685bv9pilmvm5591br7kxyv4d8fdyx25shf91i2"
"version": "6.1.115",
"hash": "sha256:0vxs6zj4p0ihcp11h3svqy3wa1yph0f1vzc8dlvqh60zgs1bmn0g"
},
"5.15": {
"version": "5.15.169",
"hash": "sha256:0w2k4yrfrdnywbg3lqppig41yydy9c48v3jhfyach6zx8pccc676"
"version": "5.15.170",
"hash": "sha256:1ag7fvixhdcyxv6rqfsvq2wh02g64r4rx8izvfb33nfnld2nangx"
},
"5.10": {
"version": "5.10.228",
@ -20,11 +20,11 @@
"hash": "sha256:0axkwfhvq3w2072xjqww476qa3rjglxyqmf72mlp9b5ymswil8kp"
},
"6.6": {
"version": "6.6.58",
"hash": "sha256:1nwrd017l5m4w12yrcf31y3g0l9xqm5b0fzcqdgan3ypi3jq3pz7"
"version": "6.6.59",
"hash": "sha256:0vd76ccd4li4wsg04gc4nai9f4y1nknz967qby0i53y0v046hq93"
},
"6.11": {
"version": "6.11.5",
"hash": "sha256:01rafnqal2v96dzkabz0irymq4sc9ja00ggyv1xn7yzjnyrqa527"
"version": "6.11.6",
"hash": "sha256:1kiky6viwrgm47slpv234lfq1wrwj29p5rx168gix3q0jw0zcm69"
}
}

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

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