diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 47b5ccb68cc..e4a8e06df1e 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -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 diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c1cb0cfe72e..d53a05d9109 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -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", diff --git a/pkgs/os-specific/linux/kernel/linux-6.3.nix b/pkgs/os-specific/linux/kernel/linux-6.3.nix deleted file mode 100644 index 0f1a8f9866d..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-6.3.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, fetchurl, buildLinux, ... } @ args: - -with lib; - -buildLinux (args // rec { - version = "6.3.13"; - - # 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 = "1ywijjhf19bciip75ppzjjh7bkadd449jr64yg2j5049w9h0aipa"; - }; -} // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/zfs/stable.nix b/pkgs/os-specific/linux/zfs/stable.nix index e208bcba9c7..5680f93e21a 100644 --- a/pkgs/os-specific/linux/zfs/stable.nix +++ b/pkgs/os-specific/linux/zfs/stable.nix @@ -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"; diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index f262f77970b..832eb66c02e 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -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; + 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c48b73f18c..f7f0aea8766 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27888,8 +27888,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; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 8a87f955480..9adf0f20ab0 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -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 @@ -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 { @@ -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"; @@ -578,7 +571,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_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 @@ -586,6 +578,7 @@ in { 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 = { @@ -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);