Commit 69767345 authored by K900's avatar K900
Browse files

linux_6_11{,_hardened}: drop

parent 7f74ec1d

nixos/tests/kernel-generic.nix

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ let 
      linux_5_15_hardened

      linux_6_1_hardened

      linux_6_6_hardened

      linux_6_11_hardened

      linux_6_12_hardened

      linux_6_13_hardened

      linux_rt_5_4

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

+0 −4
Original line number Diff line number Diff line
@@ -23,10 +23,6 @@ 
        "version": "6.6.84",

        "hash": "sha256:19vvq558vs2ivj4l6kmyha30a94fh42wmijsghsdnq8salhhglkz"

    },

    "6.11": {

        "version": "6.11.11",

        "hash": "sha256:1z2913y38clnlmhvwj49h7p4pic24s4d8np7nmd4lk7m2xz8w532"

    },

    "6.12": {

        "version": "6.12.20",

        "hash": "sha256:1ivakcj0gi191687zagl1qfsip0567p1pk3yy1s2xf0agfq8j3i3"

pkgs/top-level/all-packages.nix

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

  linuxPackages_6_6_hardened = linuxKernel.packages.linux_6_6_hardened;

  linux_6_6_hardened = linuxKernel.kernels.linux_6_6_hardened;

  linuxPackages_6_11_hardened = linuxKernel.packages.linux_6_11_hardened;

  linux_6_11_hardened = linuxKernel.kernels.linux_6_11_hardened;

  linuxPackages_6_12_hardened = linuxKernel.packages.linux_6_12_hardened;

  linux_6_12_hardened = linuxKernel.kernels.linux_6_12_hardened;

  linuxPackages_6_13_hardened = linuxKernel.packages.linux_6_13_hardened;

pkgs/top-level/linux-kernels.nix

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

    };



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

      branch = "6.11";

      kernelPatches = [

        kernelPatches.bridge_stp_helper

        kernelPatches.request_key_helper

      ];

    };



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

      branch = "6.12";

      kernelPatches = [
@@ -299,7 +291,6 @@ in { 
    linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };

    linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { };

    linux_6_6_hardened = hardenedKernelFor kernels.linux_6_6 { };

    linux_6_11_hardened = hardenedKernelFor kernels.linux_6_11 { };

    linux_6_12_hardened = hardenedKernelFor kernels.linux_6_12 { };

    linux_6_13_hardened = hardenedKernelFor kernels.linux_6_13 { };
@@ -312,6 +303,7 @@ in { 
    linux_6_8 = throw "linux 6.8 was removed because it has reached its end of life upstream";

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

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

    linux_6_11 = throw "linux 6.11 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";
@@ -323,6 +315,7 @@ in { 
    linux_6_8_hardened = throw "linux 6.8 was removed because it has reached its end of life upstream";

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

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

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

  }));

  /*  Linux kernel modules are inherently tied to a specific kernel.  So

    rather than provide specific instances of those packages for a
@@ -677,7 +670,6 @@ in { 
    linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);

    linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1);

    linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);

    linux_6_11 = recurseIntoAttrs (packagesFor kernels.linux_6_11);

    linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12);

    linux_6_13 = recurseIntoAttrs (packagesFor kernels.linux_6_13);

  } // lib.optionalAttrs config.allowAliases {
@@ -689,6 +681,7 @@ in { 
    linux_6_8 = throw "linux 6.8 was removed because it reached its end of life upstream"; # Added 2024-08-02

    linux_6_9 = throw "linux 6.9 was removed because it reached its end of life upstream"; # Added 2024-08-02

    linux_6_10 = throw "linux 6.10 was removed because it reached its end of life upstream"; # Added 2024-10-23

    linux_6_11 = throw "linux 6.11 was removed because it reached its end of life upstream"; # Added 2025-03-23

  };



  rtPackages = {
@@ -719,7 +712,6 @@ in { 
    linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened);

    linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened);

    linux_6_6_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_6_hardened);

    linux_6_11_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_11_hardened);

    linux_6_12_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_12_hardened);

    linux_6_13_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_13_hardened);
@@ -743,6 +735,7 @@ in { 
    linux_6_7_hardened = throw "linux 6.7 was removed because it has reached its end of life upstream";

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

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

    linux_6_11_hardened = throw "linux 6.11 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";

  });