Commit 101d8b7b authored by Alyssa Ross's avatar Alyssa Ross
Browse files

linux_6_2: drop 

EOL
parent b1dae64b

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

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



with lib;



buildLinux (args // rec {

  version = "6.2.16";



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

  modDirVersion = versions.pad 3 version;



  # 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 = "04w76lfkfiq7z4dl3cnq6yiqmiwjayhw3n7n81hv8d3919w0vzq6";

  };

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

pkgs/os-specific/linux/zfs/stable.nix

+1 −4
Original line number Diff line number Diff line
@@ -14,10 +14,7 @@ callPackage ./generic.nix args { 
    if stdenv'.isx86_64

    then kernel.kernelOlder "6.3"

    else kernel.kernelOlder "6.2";

  latestCompatibleLinuxPackages =

    if stdenv'.isx86_64

    then linuxKernel.packages.linux_6_2

    else linuxKernel.packages.linux_6_1;

  latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_1;



  # this package should point to the latest release.

  version = "2.1.11";

pkgs/os-specific/linux/zfs/unstable.nix

+1 −4
Original line number Diff line number Diff line
@@ -16,10 +16,7 @@ callPackage ./generic.nix args { 
  kernelCompatible = if stdenv'.isx86_64

    then kernel.kernelOlder "6.3"

    else kernel.kernelOlder "6.2";

  latestCompatibleLinuxPackages =

    if stdenv'.isx86_64

    then linuxKernel.packages.linux_6_2

    else linuxKernel.packages.linux_6_1;

  latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_1;



  # this package should point to a version / git revision compatible with the latest kernel release

  # IMPORTANT: Always use a tagged release candidate or commits from the

pkgs/top-level/linux-kernels.nix

+2 −10
Original line number Diff line number Diff line
@@ -183,15 +183,6 @@ in { 
      ];

    };



    linux_6_2 = callPackage ../os-specific/linux/kernel/linux-6.2.nix {

      kernelPatches = [

        kernelPatches.bridge_stp_helper

        kernelPatches.request_key_helper

        kernelPatches.make-maple-state-reusable-after-mas_empty_area

        kernelPatches.fix-em-ice-bonding

      ];

    };



    linux_6_3 = callPackage ../os-specific/linux/kernel/linux-6.3.nix {

      kernelPatches = [

        kernelPatches.bridge_stp_helper
@@ -282,6 +273,7 @@ in { 
    linux_5_18 = throw "linux 5.18 was removed because it has reached its end of life upstream";

    linux_5_19 = throw "linux 5.19 was removed because it has reached its end of life upstream";

    linux_6_0 = throw "linux 6.0 was removed because it has reached its end of life upstream";

    linux_6_2 = throw "linux 6.2 was removed because it has reached its end of life upstream";



    linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option";
@@ -581,13 +573,13 @@ in { 
    linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10);

    linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);

    linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1);

    linux_6_2 = recurseIntoAttrs (packagesFor kernels.linux_6_2);

    linux_6_3 = recurseIntoAttrs (packagesFor kernels.linux_6_3);

  } // 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

    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 = throw "linux 6.0 was removed because it reached its end of life upstream"; # Added 2023-01-20

    linux_6_2 = throw "linux 6.2 was removed because it reached its end of life upstream"; # Added 2023-05-26

  };



  rtPackages = {