Unverified Commit 882ac2eb authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #294916 from K900/linux-6.8 

Linux 6.8
parents 945e7192 a512cf46

pkgs/os-specific/linux/kernel/common-config.nix

+2 −0
Original line number Diff line number Diff line
@@ -371,6 +371,8 @@ let 
      DRM_AMD_DC_FP = whenAtLeast "6.4" yes;

      DRM_AMD_DC_HDCP = whenBetween "5.5" "6.4" yes;

      DRM_AMD_DC_SI = whenAtLeast "5.10" yes;

      # Enable new firmware (and by extension NVK) for compatible hardware on Nouveau

      DRM_NOUVEAU_GSP_DEFAULT = whenAtLeast "6.8" yes;

    } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") {

      # Intel GVT-g graphics virtualization supports 64-bit only

      DRM_I915_GVT = yes;

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

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

        "version": "6.7.9",

        "hash": "sha256:0inkvyrvq60j9lxgivkivq3qh94lsfc1dpv6vwgxmy3q0zy37mqg"

    },

    "6.8": {

        "version": "6.8",

        "hash": "sha256:1wv5x7qhcd05m8m0myyqm2il6mha1sx11h7ppf8yjsxvx2jdwsf9"

    }

}

pkgs/top-level/aliases.nix

+2 −0
Original line number Diff line number Diff line
@@ -608,6 +608,7 @@ mapAliases ({ 
  linuxPackages_6_5 = linuxKernel.packages.linux_6_5;

  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_rpi0 = linuxKernel.packages.linux_rpi1;

  linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3;

  linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1;
@@ -634,6 +635,7 @@ mapAliases ({ 
  linux_6_5 = linuxKernel.kernels.linux_6_5;

  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_rpi0 = linuxKernel.kernels.linux_rpi1;

  linux_rpi02w = linuxKernel.kernels.linux_rpi3;

  linux_rpi1 = linuxKernel.kernels.linux_rpi1;

pkgs/top-level/linux-kernels.nix

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

    };



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

      branch = "6.8";

      kernelPatches = [

        kernelPatches.bridge_stp_helper

        kernelPatches.request_key_helper

        kernelPatches.rust_1_75

        kernelPatches.rust_1_76

      ];

    };



    linux_testing = let

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

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

    linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);

    linux_6_7 = recurseIntoAttrs (packagesFor kernels.linux_6_7);

    linux_6_8 = recurseIntoAttrs (packagesFor kernels.linux_6_8);

    __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
@@ -662,7 +673,7 @@ in { 
  packageAliases = {

    linux_default = packages.linux_6_6;

    # Update this when adding the newest kernel major version!

    linux_latest = packages.linux_6_7;

    linux_latest = packages.linux_6_8;

    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;