linux_6_13: init (#375250)

NixOS · Jan 20, 2025 · e02ff39 · e02ff39
2 parents bcdfbb7 + 6a580ab
commit e02ff39
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 19 deletions.
diff --git a/nixos/release-small.nix b/nixos/release-small.nix
@@ -64,6 +64,11 @@ rec {
         proxy
         simple
         ;
+      latestKernel = {
+        inherit (nixos'.tests.latestKernel)
+          login
+          ;
+      };
       installer = {
         inherit (nixos'.tests.installer)
           lvm
@@ -137,6 +142,7 @@ rec {
           "nixos.tests.ipv6"
           "nixos.tests.installer.simpleUefiSystemdBoot"
           "nixos.tests.login"
+          "nixos.tests.latestKernel.login"
           "nixos.tests.misc"
           "nixos.tests.nat.firewall"
           "nixos.tests.nat.standalone"

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -30,5 +30,9 @@
     "6.12": {
         "version": "6.12.10",
         "hash": "sha256:15xjjn8ff7g9q0ljr2g8k098ppxnpvxlgv22rdrplls8sxg6wlaa"
+    },
+    "6.13": {
+        "version": "6.13",
+        "hash": "sha256:0vhdz1as27kxav81rkf6fm85sqrbj5hjhz5hpyxcd5b6p1pcr7g7"
     }
 }
diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix
@@ -61,24 +61,11 @@ stdenv.mkDerivation {
   inherit (kernel) version src;
 
   patches =
-    lib.optionals (lib.versionAtLeast kernel.version "5.10") [
-      # fix wrong path to dmesg
-      ./fix-dmesg-path.diff
-    ]
-    ++ lib.optionals (lib.versions.majorMinor kernel.version == "6.10") [
-      (fetchpatch {
-        url = "https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/patch/?id=0f0e1f44569061e3dc590cd0b8cb74d8fd53706b";
-        hash = "sha256-9u/zhbsDgwOr4T4k9td/WJYRuSHIfbtfS+oNx8nbOlM=";
-      })
-      (fetchpatch {
-        url = "https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/patch/?id=366e17409f1f17ad872259ce4a4f8a92beb4c4ee";
-        hash = "sha256-NZK1u40qvMwWcgkgJPGpEax2eMo9xHrCQxSYYOK0rbo=";
-      })
-      (fetchpatch {
-        url = "https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/patch/?id=1d302f626c2a23e4fd05bb810eff300e8f2174fd";
-        hash = "sha256-KhCmof8LkyTcBBpfMEtolL3m3kmC5rukKzQvufVKCdI=";
-      })
-    ];
+    lib.optionals (lib.versionAtLeast kernel.version "5.10" && lib.versionOlder kernel.version "6.13")
+      [
+        # fix wrong path to dmesg
+        ./fix-dmesg-path.diff
+      ];
 
   postPatch =
     ''

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
@@ -744,6 +744,7 @@ mapAliases {
   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_6_13 = linuxKernel.packages.linux_6_13;
   linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;
   linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3;
   linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1;
@@ -769,6 +770,7 @@ mapAliases {
   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_6_13 = linuxKernel.kernels.linux_6_13;
   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
@@ -197,6 +197,14 @@ in {
       ];
     };
 
+    linux_6_13 = callPackage ../os-specific/linux/kernel/mainline.nix {
+      branch = "6.13";
+      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
@@ -645,6 +653,7 @@ in {
     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);
+    linux_6_13 = recurseIntoAttrs (packagesFor kernels.linux_6_13);
   } // 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
@@ -711,7 +720,7 @@ in {
   packageAliases = {
     linux_default = packages.linux_6_12;
     # Update this when adding the newest kernel major version!
-    linux_latest = packages.linux_6_12;
+    linux_latest = packages.linux_6_13;
     linux_rt_default = packages.linux_rt_5_15;
     linux_rt_latest = packages.linux_rt_6_6;
   } // lib.optionalAttrs config.allowAliases {