Unverified Commit 8db3d39e authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #311275 from K900/kernel-6.9 

linux_6_9: init at 6.9
parents 1c54d6b0 6d249cae

pkgs/os-specific/linux/kernel/kernels-org.json

+4 −0
Original line number Diff line number Diff line
@@ -30,5 +30,9 @@ 
    "6.8": {

        "version": "6.8.9",

        "hash": "sha256:1dn9bgmf03bdfbmgq98d043702g808rjikxs2i9yia57iqiz21gr"

    },

    "6.9": {

        "version": "6.9",

        "hash": "sha256:0jc14s7z2581qgd82lww25p7c4w72scpf49z8ll3wylwk3xh3yi4"

    }

}

pkgs/top-level/aliases.nix

+2 −0
Original line number Diff line number Diff line
@@ -685,6 +685,7 @@ mapAliases ({ 
  linuxPackages_6_6 = linuxKernel.packages.linux_6_6;

  linuxPackages_6_7 = linuxKernel.packages.linux_6_7;

  linuxPackages_6_8 = linuxKernel.packages.linux_6_8;

  linuxPackages_6_9 = linuxKernel.packages.linux_6_9;

  linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;

  linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3;

  linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1;
@@ -712,6 +713,7 @@ mapAliases ({ 
  linux_6_6 = linuxKernel.kernels.linux_6_6;

  linux_6_7 = linuxKernel.kernels.linux_6_7;

  linux_6_8 = linuxKernel.kernels.linux_6_8;

  linux_6_9 = linuxKernel.kernels.linux_6_9;

  linux_rpi0 = linuxKernel.kernels.linux_rpi1;

  linux_rpi02w = linuxKernel.kernels.linux_rpi3;

  linux_rpi1 = linuxKernel.kernels.linux_rpi1;

pkgs/top-level/linux-kernels.nix

+11 −1
Original line number Diff line number Diff line
@@ -196,6 +196,15 @@ in { 
      ];

    };



    linux_6_9 = callPackage ../os-specific/linux/kernel/mainline.nix {

      branch = "6.9";

      kernelPatches = [

        kernelPatches.bridge_stp_helper

        kernelPatches.request_key_helper

        kernelPatches.rust_1_77-6_9

      ];

    };



    linux_testing = let

      testing = callPackage ../os-specific/linux/kernel/mainline.nix {

        # A special branch that tracks the kernel under the release process
@@ -602,6 +611,7 @@ in { 
    linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1);

    linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);

    linux_6_8 = recurseIntoAttrs (packagesFor kernels.linux_6_8);

    linux_6_9 = recurseIntoAttrs (packagesFor kernels.linux_6_9);

    __attrsFailEvaluation = true;

  } // lib.optionalAttrs config.allowAliases {

    linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08
@@ -669,7 +679,7 @@ in { 
  packageAliases = {

    linux_default = packages.linux_6_6;

    # Update this when adding the newest kernel major version!

    linux_latest = packages.linux_6_8;

    linux_latest = packages.linux_6_9;

    linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake";

    linux_rt_default = packages.linux_rt_5_4;

    linux_rt_latest = packages.linux_rt_6_6;