git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #144079 from xaverdh/linux-5.15

Linux 5.15

commitf8232491252438cd70b93554e31fe8238a573636 authorMaximilian Bosch <maximilian@mbosch.me> dateMon 1 Nov 2021, 11:29 (5 years ago) parent6d7a521256a798
3 files changed+35−17
compare with master
unifiedsplit
nixos/tests/kernel-generic.nix+8−16 pkgs/os-specific/linux/kernel/linux-5.15.nix+18 pkgs/top-level/linux-kernels.nix+9−1
nixos/tests/kernel-generic.nix+8−16
@@ -23,22 +23,14 @@ let
2323 assert "${linuxPackages.kernel.modDirVersion}" in machine.succeed("uname -a")
2424 '';
2525 }) args);
26− kernels = {
27− inherit (pkgs)
28− linuxPackages_4_4
29− linuxPackages_4_9
30− linuxPackages_4_14
31− linuxPackages_4_19
32− linuxPackages_5_4
33− linuxPackages_5_10
34− linuxPackages_5_14
35−
36− linuxPackages_4_14_hardened
37− linuxPackages_4_19_hardened
38− linuxPackages_5_4_hardened
39− linuxPackages_5_10_hardened
40−
41− linuxPackages_testing;
26+ kernels = pkgs.linuxKernel.vanillaPackages // {
27+ inherit (pkgs.linuxKernel.packages)
28+ linux_4_14_hardened
29+ linux_4_19_hardened
30+ linux_5_4_hardened
31+ linux_5_10_hardened
32+
33+ linux_testing;
4234 };
4335
4436in mapAttrs (_: lP: testsForLinuxPackages lP) kernels // {
pkgs/os-specific/linux/kernel/linux-5.15.nixnew file+18
@@ -0,0 +1,18 @@
1+{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
2+
3+with lib;
4+
5+buildLinux (args // rec {
6+ version = "5.15";
7+
8+ # modDirVersion needs to be x.y.z, will automatically add .0 if needed
9+ modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
10+
11+ # branchVersion needs to be x.y
12+ extraMeta.branch = versions.majorMinor version;
13+
14+ src = fetchurl {
15+ url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
16+ sha256 = "sha256-V7LPaZGRDjtnobNJACLooGdLaWXHTBLaHpnRONGZHug=";
17+ };
18+} // (args.argsOverride or { }))
pkgs/top-level/linux-kernels.nix+9−1
@@ -174,6 +174,13 @@ in {
174174 ];
175175 };
176176
177+ linux_5_15 = callPackage ../os-specific/linux/kernel/linux-5.15.nix {
178+ kernelPatches = [
179+ kernelPatches.bridge_stp_helper
180+ kernelPatches.request_key_helper
181+ ];
182+ };
183+
177184 linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
178185 kernelPatches = [
179186 kernelPatches.bridge_stp_helper
@@ -468,6 +475,7 @@ in {
468475 linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4);
469476 linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10);
470477 linux_5_14 = recurseIntoAttrs (packagesFor kernels.linux_5_14);
478+ linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);
471479 };
472480
473481 rtPackages = {
@@ -513,7 +521,7 @@ in {
513521 packageAliases = {
514522 linux_default = packages.linux_5_10;
515523 # Update this when adding the newest kernel major version!
516− linux_latest = packages.linux_5_14;
524+ linux_latest = packages.linux_5_15;
517525 linux_mptcp = packages.linux_mptcp_95;
518526 linux_rt_default = packages.linux_rt_5_4;
519527 linux_rt_latest = packages.linux_rt_5_11;