Commit dc6eafa6 authored by Alyssa Ross's avatar Alyssa Ross
Browse files

linux_6_5: remove

parent b84d9f02

nixos/tests/kernel-generic.nix

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ let 
      linux_5_10_hardened

      linux_5_15_hardened

      linux_6_1_hardened

      linux_6_5_hardened

      linux_6_6_hardened

      linux_6_7_hardened

      linux_rt_5_4

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

+0 −4
Original line number Diff line number Diff line
@@ -3,10 +3,6 @@ 
        "version": "6.8-rc6",

        "hash": "sha256:03ci53snbv917ccyjdm3xzl2fwijq5da7nkg05dpwb99wrzp8fkd"

    },

    "6.5": {

        "version": "6.5.13",

        "hash": "sha256:1dfbbydmayfj9npx3z0g38p574pmcx3qgs49dv0npigl48wd9yvq"

    },

    "6.1": {

        "version": "6.1.79",

        "hash": "sha256:16xkd0hcslqlcf55d4ivzhf1fkhfs5yy0m9arbax8pmm5yi9r97s"

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -27884,8 +27884,6 @@ with pkgs; 
  linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened;

  linuxPackages_6_1_hardened = linuxKernel.packages.linux_6_1_hardened;

  linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened;

  linuxPackages_6_5_hardened = linuxKernel.packages.linux_6_5_hardened;

  linux_6_5_hardened = linuxKernel.kernels.linux_6_5_hardened;

  linuxPackages_6_6_hardened = linuxKernel.packages.linux_6_6_hardened;

  linux_6_6_hardened = linuxKernel.kernels.linux_6_6_hardened;

  linuxPackages_6_7_hardened = linuxKernel.packages.linux_6_7_hardened;

pkgs/top-level/linux-kernels.nix

+2 −11
Original line number Diff line number Diff line
@@ -169,14 +169,6 @@ in { 
      ];

    };



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

      branch = "6.5";

      kernelPatches = [

        kernelPatches.bridge_stp_helper

        kernelPatches.request_key_helper

      ];

    };



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

      branch = "6.6";

      kernelPatches = [
@@ -266,7 +258,6 @@ in { 
    linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };

    linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };

    linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { };

    linux_6_5_hardened = hardenedKernelFor kernels.linux_6_5 { };

    linux_6_6_hardened = hardenedKernelFor kernels.linux_6_6 { };

    linux_6_7_hardened = hardenedKernelFor kernels.linux_6_7 { };
@@ -279,6 +270,7 @@ in { 
    linux_6_2 = throw "linux 6.2 was removed because it has reached its end of life upstream";

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

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

    linux_6_5 = throw "linux 6.5 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";
@@ -600,7 +592,6 @@ 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_5 = recurseIntoAttrs (packagesFor kernels.linux_6_5);

    linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);

    linux_6_7 = recurseIntoAttrs (packagesFor kernels.linux_6_7);

    __attrsFailEvaluation = true;
@@ -613,6 +604,7 @@ in { 
    linux_6_2 = throw "linux 6.2 was removed because it reached its end of life upstream"; # Added 2023-05-26

    linux_6_3 = throw "linux 6.3 was removed because it reached its end of life upstream"; # Added 2023-07-22

    linux_6_4 = throw "linux 6.4 was removed because it reached its end of life upstream"; # Added 2023-10-02

    linux_6_5 = throw "linux 6.5 was removed because it reached its end of life upstream"; # Added 2024-02-28

  };



  rtPackages = {
@@ -645,7 +637,6 @@ in { 
    linux_5_10_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_10_hardened);

    linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened);

    linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened);

    linux_6_5_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_5_hardened);

    linux_6_6_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_6_hardened);

    linux_6_7_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_7_hardened);