Skip to content

Commit fe8407b

Browse files
committedMar 23, 2025
linux_6_11{,_hardened}: drop
1 parent ced9fe3 commit fe8407b

File tree

4 files changed

+4
-18
lines changed

4 files changed

+4
-18
lines changed
 

‎nixos/tests/kernel-generic.nix

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ let
4040
linux_5_15_hardened
4141
linux_6_1_hardened
4242
linux_6_6_hardened
43-
linux_6_11_hardened
4443
linux_6_12_hardened
4544
linux_6_13_hardened
4645
linux_rt_5_4

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

-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@
2323
"version": "6.6.84",
2424
"hash": "sha256:19vvq558vs2ivj4l6kmyha30a94fh42wmijsghsdnq8salhhglkz"
2525
},
26-
"6.11": {
27-
"version": "6.11.11",
28-
"hash": "sha256:1z2913y38clnlmhvwj49h7p4pic24s4d8np7nmd4lk7m2xz8w532"
29-
},
3026
"6.12": {
3127
"version": "6.12.20",
3228
"hash": "sha256:1ivakcj0gi191687zagl1qfsip0567p1pk3yy1s2xf0agfq8j3i3"

‎pkgs/top-level/all-packages.nix

-2
Original file line numberDiff line numberDiff line change
@@ -11988,8 +11988,6 @@ with pkgs;
1198811988
linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened;
1198911989
linuxPackages_6_6_hardened = linuxKernel.packages.linux_6_6_hardened;
1199011990
linux_6_6_hardened = linuxKernel.kernels.linux_6_6_hardened;
11991-
linuxPackages_6_11_hardened = linuxKernel.packages.linux_6_11_hardened;
11992-
linux_6_11_hardened = linuxKernel.kernels.linux_6_11_hardened;
1199311991
linuxPackages_6_12_hardened = linuxKernel.packages.linux_6_12_hardened;
1199411992
linux_6_12_hardened = linuxKernel.kernels.linux_6_12_hardened;
1199511993
linuxPackages_6_13_hardened = linuxKernel.packages.linux_6_13_hardened;

‎pkgs/top-level/linux-kernels.nix

+4-11
Original file line numberDiff line numberDiff line change
@@ -197,14 +197,6 @@ in {
197197
];
198198
};
199199

200-
linux_6_11 = callPackage ../os-specific/linux/kernel/mainline.nix {
201-
branch = "6.11";
202-
kernelPatches = [
203-
kernelPatches.bridge_stp_helper
204-
kernelPatches.request_key_helper
205-
];
206-
};
207-
208200
linux_6_12 = callPackage ../os-specific/linux/kernel/mainline.nix {
209201
branch = "6.12";
210202
kernelPatches = [
@@ -299,7 +291,6 @@ in {
299291
linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };
300292
linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { };
301293
linux_6_6_hardened = hardenedKernelFor kernels.linux_6_6 { };
302-
linux_6_11_hardened = hardenedKernelFor kernels.linux_6_11 { };
303294
linux_6_12_hardened = hardenedKernelFor kernels.linux_6_12 { };
304295
linux_6_13_hardened = hardenedKernelFor kernels.linux_6_13 { };
305296

@@ -312,6 +303,7 @@ in {
312303
linux_6_8 = throw "linux 6.8 was removed because it has reached its end of life upstream";
313304
linux_6_9 = throw "linux 6.9 was removed because it has reached its end of life upstream";
314305
linux_6_10 = throw "linux 6.10 was removed because it has reached its end of life upstream";
306+
linux_6_11 = throw "linux 6.11 was removed because it has reached its end of life upstream";
315307

316308
linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option";
317309

@@ -323,6 +315,7 @@ in {
323315
linux_6_8_hardened = throw "linux 6.8 was removed because it has reached its end of life upstream";
324316
linux_6_9_hardened = throw "linux 6.9 was removed because it has reached its end of life upstream";
325317
linux_6_10_hardened = throw "linux 6.10 was removed because it has reached its end of life upstream";
318+
linux_6_11_hardened = throw "linux 6.11 was removed because it has reached its end of life upstream";
326319
}));
327320
/* Linux kernel modules are inherently tied to a specific kernel. So
328321
rather than provide specific instances of those packages for a
@@ -677,7 +670,6 @@ in {
677670
linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);
678671
linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1);
679672
linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);
680-
linux_6_11 = recurseIntoAttrs (packagesFor kernels.linux_6_11);
681673
linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12);
682674
linux_6_13 = recurseIntoAttrs (packagesFor kernels.linux_6_13);
683675
} // lib.optionalAttrs config.allowAliases {
@@ -689,6 +681,7 @@ in {
689681
linux_6_8 = throw "linux 6.8 was removed because it reached its end of life upstream"; # Added 2024-08-02
690682
linux_6_9 = throw "linux 6.9 was removed because it reached its end of life upstream"; # Added 2024-08-02
691683
linux_6_10 = throw "linux 6.10 was removed because it reached its end of life upstream"; # Added 2024-10-23
684+
linux_6_11 = throw "linux 6.11 was removed because it reached its end of life upstream"; # Added 2025-03-23
692685
};
693686

694687
rtPackages = {
@@ -719,7 +712,6 @@ in {
719712
linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened);
720713
linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened);
721714
linux_6_6_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_6_hardened);
722-
linux_6_11_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_11_hardened);
723715
linux_6_12_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_12_hardened);
724716
linux_6_13_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_13_hardened);
725717

@@ -743,6 +735,7 @@ in {
743735
linux_6_7_hardened = throw "linux 6.7 was removed because it has reached its end of life upstream";
744736
linux_6_8_hardened = throw "linux 6.8 was removed because it has reached its end of life upstream";
745737
linux_6_9_hardened = throw "linux 6.9 was removed because it has reached its end of life upstream";
738+
linux_6_11_hardened = throw "linux 6.11 was removed because it has reached its end of life upstream";
746739
linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option";
747740
});
748741

0 commit comments

Comments
 (0)
Failed to load comments.