Unverified Commit 75a27e29 authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #205732 from K900/linux-6.1 

linux: add 6.1
parents a6288509 609ef3f7

pkgs/os-specific/linux/kernel/linux-6.1.nix

0 → 100644
+18 −0
Original line number Diff line number Diff line 
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:



with lib;



buildLinux (args // rec {

  version = "6.1";



  # modDirVersion needs to be x.y.z, will automatically add .0 if needed

  modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;



  # branchVersion needs to be x.y

  extraMeta.branch = versions.majorMinor version;



  src = fetchurl {

    url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";

    sha256 = "sha256-LKHxcFGkMPb+0RluSVJxdQcXGs/ZfZZXchJQJwOyXes=";

  };

} // (args.argsOverride or { }))

pkgs/top-level/aliases.nix

+2 −0
Original line number Diff line number Diff line
@@ -836,6 +836,7 @@ mapAliases ({ 
  linuxPackages_5_19 = linuxKernel.packages.linux_5_19;

  linuxPackages_5_4 = linuxKernel.packages.linux_5_4;

  linuxPackages_6_0 = linuxKernel.packages.linux_6_0;

  linuxPackages_6_1 = linuxKernel.packages.linux_6_1;

  linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14;

  linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;

  linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3;
@@ -855,6 +856,7 @@ mapAliases ({ 
  linux_5_19 = linuxKernel.kernels.linux_5_19;

  linux_5_4 = linuxKernel.kernels.linux_5_4;

  linux_6_0 = linuxKernel.kernels.linux_6_0;

  linux_6_1 = linuxKernel.kernels.linux_6_1;

  linuxPackages_mptcp = throw "'linuxPackages_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04

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

  linux_mptcp_95 = throw "'linux_mptcp_95' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04

pkgs/top-level/linux-kernels.nix

+9 −1
Original line number Diff line number Diff line
@@ -164,6 +164,13 @@ in { 
      ];

    };



    linux_6_1 = callPackage ../os-specific/linux/kernel/linux-6.1.nix {

      kernelPatches = [

        kernelPatches.bridge_stp_helper

        kernelPatches.request_key_helper

      ];

    };



    linux_testing = let

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

        kernelPatches = [
@@ -520,6 +527,7 @@ in { 
    linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17

    linux_5_19 = throw "linux 5.19 was removed because it reached its end of life upstream"; # Added 2022-11-01

    linux_6_0 = recurseIntoAttrs (packagesFor kernels.linux_6_0);

    linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1);

  };



  rtPackages = {
@@ -578,7 +586,7 @@ in { 
  packageAliases = {

    linux_default = packages.linux_5_15;

    # Update this when adding the newest kernel major version!

    linux_latest = packages.linux_6_0;

    linux_latest = packages.linux_6_1;

    linux_mptcp = packages.linux_mptcp_95;

    linux_rt_default = packages.linux_rt_5_4;

    linux_rt_latest = packages.linux_rt_5_10;