Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

linux_6_3: drop as EOL #244883

Merged
merged 1 commit into from
Jul 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion nixos/tests/kernel-generic.nix
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ let
linux_5_10_hardened
linux_5_15_hardened
linux_6_1_hardened
linux_6_3_hardened
linux_6_4_hardened
linux_rt_5_4
linux_rt_5_10
Expand Down
10 changes: 0 additions & 10 deletions pkgs/os-specific/linux/kernel/hardened/patches.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,6 @@
"sha256": "1f45j3ch1ljbacjlg8q45iva9lvwys938rdg0s516mznzlifxpac",
"version": "6.1.39"
},
"6.3": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-6.3.13-hardened1.patch",
"sha256": "1iy95awbkrdk5529w9s07axb21l2snab4kifbzjghhz9vwzx22rp",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.3.13-hardened1/linux-hardened-6.3.13-hardened1.patch"
},
"sha256": "1ywijjhf19bciip75ppzjjh7bkadd449jr64yg2j5049w9h0aipa",
"version": "6.3.13"
},
"6.4": {
"patch": {
"extra": "-hardened1",
Expand Down
18 changes: 0 additions & 18 deletions pkgs/os-specific/linux/kernel/linux-6.3.nix

This file was deleted.

5 changes: 1 addition & 4 deletions pkgs/os-specific/linux/zfs/stable.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@ callPackage ./generic.nix args {
if stdenv'.isx86_64 || removeLinuxDRM
then kernel.kernelOlder "6.4"
else kernel.kernelOlder "6.2";
latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM then
linuxKernel.packages.linux_6_3
else
linuxKernel.packages.linux_6_1;
latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_1;

# this package should point to the latest release.
version = "2.1.12";
Expand Down
8 changes: 1 addition & 7 deletions pkgs/os-specific/linux/zfs/unstable.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,11 @@ let
in
callPackage ./generic.nix args {
# check the release notes for compatible kernels
# NOTE:
# zfs-2.1.9<=x<=2.1.10 is broken with aarch64-linux-6.2
# for future releases, please delete this condition.
kernelCompatible = if stdenv'.isx86_64 || removeLinuxDRM
then kernel.kernelOlder "6.4"
else kernel.kernelOlder "6.2";

latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM then
linuxKernel.packages.linux_6_3
else
linuxKernel.packages.linux_6_1;
RaitoBezarius marked this conversation as resolved.
Show resolved Hide resolved
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
Expand Down
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27762,8 +27762,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_3_hardened = linuxKernel.packages.linux_6_3_hardened;
linux_6_3_hardened = linuxKernel.kernels.linux_6_3_hardened;
linuxPackages_6_4_hardened = linuxKernel.packages.linux_6_4_hardened;
linux_6_4_hardened = linuxKernel.kernels.linux_6_4_hardened;

Expand Down
12 changes: 2 additions & 10 deletions pkgs/top-level/linux-kernels.nix
Original file line number Diff line number Diff line change
Expand Up @@ -175,13 +175,6 @@ in {
];
};

linux_6_3 = callPackage ../os-specific/linux/kernel/linux-6.3.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
};

linux_6_4 = callPackage ../os-specific/linux/kernel/linux-6.4.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
Expand Down Expand Up @@ -266,7 +259,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_3_hardened = hardenedKernelFor kernels.linux_6_3 { };
linux_6_4_hardened = hardenedKernelFor kernels.linux_6_4 { };

} // lib.optionalAttrs config.allowAliases {
Expand All @@ -275,6 +267,7 @@ in {
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_6_3 = throw "linux 6.3 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";

Expand Down Expand Up @@ -578,14 +571,14 @@ 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_3 = recurseIntoAttrs (packagesFor kernels.linux_6_3);
linux_6_4 = recurseIntoAttrs (packagesFor kernels.linux_6_4);
} // 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
linux_6_3 = throw "linux 6.3 was removed because it reached its end of life upstream"; # Added 2023-07-22
};

rtPackages = {
Expand Down Expand Up @@ -617,7 +610,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_3_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_3_hardened);
linux_6_4_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_4_hardened);

linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
Expand Down