pyrox.dev / nixpkgs
lol
fork atom

Merge: Kernel updates for 2024-11-18 (#356881)

authored by

Maximilian Bosch and committed by
GitHub f58d0771 e669d74f

+32 -13
+16 -12
pkgs/os-specific/linux/kernel/kernels-org.json
··· 4 4 "hash": "sha256:1rsglb7zwbn4f6wv4g95jl8ra1wbs03k7xyfdlmwzl3vgzx3bnzv" 5 5 }, 6 6 "6.1": { 7 - "version": "6.1.117", 8 - "hash": "sha256:12vqj3iqf6kg6lc34lf4zjhw4r0sszxfwd0xlbv3njlpj7kgzyx8" 7 + "version": "6.1.118", 8 + "hash": "sha256:0k12d4l03ziiba1b4f6jfxv5ir0lrd6kshlasr62rhv1f6yq81q1" 9 9 }, 10 10 "5.15": { 11 - "version": "5.15.172", 12 - "hash": "sha256:0kc46gniifn2jbj4w58bh2kvpja4vl7q0yxn538cic6115c298pg" 11 + "version": "5.15.173", 12 + "hash": "sha256:1a3x3ld6g7ny0hdfqfvj5j2i5sx5l5p236pdnsr0icn9ri3jljwa" 13 13 }, 14 14 "5.10": { 15 - "version": "5.10.229", 16 - "hash": "sha256:1q6di05rk4bsy91r03zw6vz14zzcpvv25dv7gw0yz1gzpgkbb9h8" 15 + "version": "5.10.230", 16 + "hash": "sha256:0isbb0ixqg4yzlh3lmdvnax4m1ikf2q4wk0b9vgqc63p7gpm066d" 17 17 }, 18 18 "5.4": { 19 - "version": "5.4.285", 20 - "hash": "sha256:1722sc365ajxmqyr4r49yp73mzdckay3rx5c2gx29xzny9zc6cmy" 19 + "version": "5.4.286", 20 + "hash": "sha256:0z48n7vahg318bgkccy8xqgl87vfb8zmn995cqh7z38fvzrm81qq" 21 21 }, 22 22 "6.6": { 23 - "version": "6.6.61", 24 - "hash": "sha256:02vw0jphzqj8cd5apf8wbjp2wahwcnvw6vchv4z1q3qrz56w53s1" 23 + "version": "6.6.62", 24 + "hash": "sha256:0dlkgph6chvqrask746wjijqp62vmvrp3n2dkldr8d2mfw8mdhz2" 25 25 }, 26 26 "6.11": { 27 - "version": "6.11.8", 28 - "hash": "sha256:0g9wz6dqbq9h5yiiz8sdma4k1cmr4n2sxzvhrsz2090mzr2ais5f" 27 + "version": "6.11.9", 28 + "hash": "sha256:1d44yfk105bsf9f853f2fpnzqd0xbqn8drg1dv4ri5dxldx8lrbm" 29 + }, 30 + "6.12": { 31 + "version": "6.12", 32 + "hash": "sha256:1sr58vsh39hdwk0z27lg14isqwn4g8m4r7a8z2rsyhkfwlmmd8mi" 29 33 } 30 34 }
+4
pkgs/os-specific/linux/kernel/manual-config.nix
··· 164 164 165 165 RUST_LIB_SRC = lib.optionalString withRust rustPlatform.rustLibSrc; 166 166 167 + # avoid leaking Rust source file names into the final binary, which adds 168 + # a false dependency on rust-lib-src on targets with uncompressed kernels 169 + KRUSTFLAGS = lib.optionalString withRust "--remap-path-prefix ${rustPlatform.rustLibSrc}=/"; 170 + 167 171 patches = 168 172 map (p: p.patch) kernelPatches 169 173 # Required for deterministic builds along with some postPatch magic.
+2
pkgs/top-level/aliases.nix
··· 665 665 linuxPackages_6_9 = linuxKernel.packages.linux_6_9; 666 666 linuxPackages_6_10 = linuxKernel.packages.linux_6_10; 667 667 linuxPackages_6_11 = linuxKernel.packages.linux_6_11; 668 + linuxPackages_6_12 = linuxKernel.packages.linux_6_12; 668 669 linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; 669 670 linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3; 670 671 linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1; ··· 689 690 linux_6_9 = linuxKernel.kernels.linux_6_9; 690 691 linux_6_10 = linuxKernel.kernels.linux_6_10; 691 692 linux_6_11 = linuxKernel.kernels.linux_6_11; 693 + linux_6_12 = linuxKernel.kernels.linux_6_12; 692 694 linux_rpi0 = linuxKernel.kernels.linux_rpi1; 693 695 linux_rpi02w = linuxKernel.kernels.linux_rpi3; 694 696 linux_rpi1 = linuxKernel.kernels.linux_rpi1;
+10 -1
pkgs/top-level/linux-kernels.nix
··· 189 189 ]; 190 190 }; 191 191 192 + linux_6_12 = callPackage ../os-specific/linux/kernel/mainline.nix { 193 + branch = "6.12"; 194 + kernelPatches = [ 195 + kernelPatches.bridge_stp_helper 196 + kernelPatches.request_key_helper 197 + ]; 198 + }; 199 + 192 200 linux_testing = let 193 201 testing = callPackage ../os-specific/linux/kernel/mainline.nix { 194 202 # A special branch that tracks the kernel under the release process ··· 626 634 linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); 627 635 linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6); 628 636 linux_6_11 = recurseIntoAttrs (packagesFor kernels.linux_6_11); 637 + linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12); 629 638 } // lib.optionalAttrs config.allowAliases { 630 639 linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; # Added 2023-10-11 631 640 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 700 packageAliases = { 692 701 linux_default = packages.linux_6_6; 693 702 # Update this when adding the newest kernel major version! 694 - linux_latest = packages.linux_6_11; 703 + linux_latest = packages.linux_6_12; 695 704 linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; 696 705 linux_rt_default = packages.linux_rt_5_15; 697 706 linux_rt_latest = packages.linux_rt_6_6;