From a7c029235d39456ff4305dffcb91711af27520a3 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 18 Nov 2024 09:12:17 +0300 Subject: [PATCH 1/8] linux_6_12: init at 6.12 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++++ pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/linux-kernels.nix | 11 ++++++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index cdc2221695fc..b484e12dba7e 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -26,5 +26,9 @@ "6.11": { "version": "6.11.8", "hash": "sha256:0g9wz6dqbq9h5yiiz8sdma4k1cmr4n2sxzvhrsz2090mzr2ais5f" + }, + "6.12": { + "version": "6.12", + "hash": "sha256:1sr58vsh39hdwk0z27lg14isqwn4g8m4r7a8z2rsyhkfwlmmd8mi" } } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d84b67f44d01..66d435657324 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -665,6 +665,7 @@ mapAliases { linuxPackages_6_9 = linuxKernel.packages.linux_6_9; linuxPackages_6_10 = linuxKernel.packages.linux_6_10; linuxPackages_6_11 = linuxKernel.packages.linux_6_11; + linuxPackages_6_12 = linuxKernel.packages.linux_6_12; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3; linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1; @@ -689,6 +690,7 @@ mapAliases { linux_6_9 = linuxKernel.kernels.linux_6_9; linux_6_10 = linuxKernel.kernels.linux_6_10; linux_6_11 = linuxKernel.kernels.linux_6_11; + linux_6_12 = linuxKernel.kernels.linux_6_12; linux_rpi0 = linuxKernel.kernels.linux_rpi1; linux_rpi02w = linuxKernel.kernels.linux_rpi3; linux_rpi1 = linuxKernel.kernels.linux_rpi1; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 82ffe09e97e4..5dc2bf56e8af 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -189,6 +189,14 @@ in { ]; }; + linux_6_12 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "6.12"; + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_testing = let testing = callPackage ../os-specific/linux/kernel/mainline.nix { # A special branch that tracks the kernel under the release process @@ -626,6 +634,7 @@ in { linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6); linux_6_11 = recurseIntoAttrs (packagesFor kernels.linux_6_11); + linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12); } // lib.optionalAttrs config.allowAliases { linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; # Added 2023-10-11 linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-21 @@ -691,7 +700,7 @@ in { packageAliases = { linux_default = packages.linux_6_6; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_6_11; + linux_latest = packages.linux_6_12; linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; linux_rt_default = packages.linux_rt_5_15; linux_rt_latest = packages.linux_rt_6_6; From 78450026fea2f4cf95dc9793ecc0c73865c8c49d Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 18 Nov 2024 09:12:20 +0300 Subject: [PATCH 2/8] linux_6_11: 6.11.8 -> 6.11.9 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index b484e12dba7e..9a8fb1d3d239 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -24,8 +24,8 @@ "hash": "sha256:02vw0jphzqj8cd5apf8wbjp2wahwcnvw6vchv4z1q3qrz56w53s1" }, "6.11": { - "version": "6.11.8", - "hash": "sha256:0g9wz6dqbq9h5yiiz8sdma4k1cmr4n2sxzvhrsz2090mzr2ais5f" + "version": "6.11.9", + "hash": "sha256:1d44yfk105bsf9f853f2fpnzqd0xbqn8drg1dv4ri5dxldx8lrbm" }, "6.12": { "version": "6.12", From 3471123c6da3e01ce561e947724e68e9f9daba2d Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 18 Nov 2024 09:12:26 +0300 Subject: [PATCH 3/8] linux_6_6: 6.6.61 -> 6.6.62 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 9a8fb1d3d239..ba0fda0d0557 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "hash": "sha256:1722sc365ajxmqyr4r49yp73mzdckay3rx5c2gx29xzny9zc6cmy" }, "6.6": { - "version": "6.6.61", - "hash": "sha256:02vw0jphzqj8cd5apf8wbjp2wahwcnvw6vchv4z1q3qrz56w53s1" + "version": "6.6.62", + "hash": "sha256:0dlkgph6chvqrask746wjijqp62vmvrp3n2dkldr8d2mfw8mdhz2" }, "6.11": { "version": "6.11.9", From 3f7febe1b4df8620cc2f479fcffa025c396606f5 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 18 Nov 2024 09:12:30 +0300 Subject: [PATCH 4/8] linux_6_1: 6.1.117 -> 6.1.118 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index ba0fda0d0557..8da763622e8d 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,8 +4,8 @@ "hash": "sha256:1rsglb7zwbn4f6wv4g95jl8ra1wbs03k7xyfdlmwzl3vgzx3bnzv" }, "6.1": { - "version": "6.1.117", - "hash": "sha256:12vqj3iqf6kg6lc34lf4zjhw4r0sszxfwd0xlbv3njlpj7kgzyx8" + "version": "6.1.118", + "hash": "sha256:0k12d4l03ziiba1b4f6jfxv5ir0lrd6kshlasr62rhv1f6yq81q1" }, "5.15": { "version": "5.15.172", From 17c934c9aa8143d75e3548a71393696331e87335 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 18 Nov 2024 09:12:33 +0300 Subject: [PATCH 5/8] linux_5_15: 5.15.172 -> 5.15.173 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 8da763622e8d..05f1057ff23c 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -8,8 +8,8 @@ "hash": "sha256:0k12d4l03ziiba1b4f6jfxv5ir0lrd6kshlasr62rhv1f6yq81q1" }, "5.15": { - "version": "5.15.172", - "hash": "sha256:0kc46gniifn2jbj4w58bh2kvpja4vl7q0yxn538cic6115c298pg" + "version": "5.15.173", + "hash": "sha256:1a3x3ld6g7ny0hdfqfvj5j2i5sx5l5p236pdnsr0icn9ri3jljwa" }, "5.10": { "version": "5.10.229", From d5b803b0675af4a84b2c90cd1addc1540f7c91ab Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 18 Nov 2024 09:12:35 +0300 Subject: [PATCH 6/8] linux_5_10: 5.10.229 -> 5.10.230 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 05f1057ff23c..7537e9c3188b 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -12,8 +12,8 @@ "hash": "sha256:1a3x3ld6g7ny0hdfqfvj5j2i5sx5l5p236pdnsr0icn9ri3jljwa" }, "5.10": { - "version": "5.10.229", - "hash": "sha256:1q6di05rk4bsy91r03zw6vz14zzcpvv25dv7gw0yz1gzpgkbb9h8" + "version": "5.10.230", + "hash": "sha256:0isbb0ixqg4yzlh3lmdvnax4m1ikf2q4wk0b9vgqc63p7gpm066d" }, "5.4": { "version": "5.4.285", From 1386871d141e254e4fbebd89fefcd4eb46ccf2d5 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 18 Nov 2024 09:12:44 +0300 Subject: [PATCH 7/8] linux_5_4: 5.4.285 -> 5.4.286 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 7537e9c3188b..4d6006943d5c 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -16,8 +16,8 @@ "hash": "sha256:0isbb0ixqg4yzlh3lmdvnax4m1ikf2q4wk0b9vgqc63p7gpm066d" }, "5.4": { - "version": "5.4.285", - "hash": "sha256:1722sc365ajxmqyr4r49yp73mzdckay3rx5c2gx29xzny9zc6cmy" + "version": "5.4.286", + "hash": "sha256:0z48n7vahg318bgkccy8xqgl87vfb8zmn995cqh7z38fvzrm81qq" }, "6.6": { "version": "6.6.62", From 9dd1da7475146cdc8937038b9341e8e19bcf5278 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 18 Nov 2024 11:29:08 +0300 Subject: [PATCH 8/8] linuxManualConfig: don't leak rust-lib-src paths into the final binary --- pkgs/os-specific/linux/kernel/manual-config.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index f69de86fd1a6..522eb4608764 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -164,6 +164,10 @@ let RUST_LIB_SRC = lib.optionalString withRust rustPlatform.rustLibSrc; + # avoid leaking Rust source file names into the final binary, which adds + # a false dependency on rust-lib-src on targets with uncompressed kernels + KRUSTFLAGS = lib.optionalString withRust "--remap-path-prefix ${rustPlatform.rustLibSrc}=/"; + patches = map (p: p.patch) kernelPatches # Required for deterministic builds along with some postPatch magic.