From ae3682cb17b93d2d3bedf4be439c4a9688760881 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 2 Oct 2023 11:37:32 +0000 Subject: [PATCH] linux_6_4: drop (EOL) It's still in kernels-org.json, because even if I remove it the update script will keep putting it back, but nothing references it, and it'll be removed from that file when kernels are next updated after it's been delisted from kernel.org. linux_testing_bcachefs still needs to be updated for >6.4, so for now I've just inlined the Linux 6.4 definition in linux_testing_bcachefs's definition. --- nixos/tests/kernel-generic.nix | 1 - .../linux/kernel/hardened/patches.json | 10 ------- pkgs/os-specific/linux/zfs/unstable.nix | 4 +-- pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/linux-kernels.nix | 26 ++++++++----------- 5 files changed, 12 insertions(+), 31 deletions(-) diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 148f66c464d6..6d883df14c64 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_4_hardened linux_6_5_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 c7893abad213..7f824bcd7105 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -59,16 +59,6 @@ "sha256": "09sfrq2l8f777mx2n9mhb6bgz1064bl04921byqnmk87si31w653", "version": "6.1.54" }, - "6.4": { - "patch": { - "extra": "-hardened1", - "name": "linux-hardened-6.4.16-hardened1.patch", - "sha256": "10lydnnhhq9ynng1gfaqh1mncsb0dmr27zzcbygs1xigy2bl70n9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.4.16-hardened1/linux-hardened-6.4.16-hardened1.patch" - }, - "sha256": "0zgj1z97jyx7wf12zrnlcp0mj4cl43ais9qsy6dh1jwylf2fq9ln", - "version": "6.4.16" - }, "6.5": { "patch": { "extra": "-hardened1", diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index 592d94b0030a..45b7dd6c7478 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -15,9 +15,7 @@ callPackage ./generic.nix args { then kernel.kernelOlder "6.5" else kernel.kernelOlder "6.2"; - latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM - then linuxKernel.packages.linux_6_4 - 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 358d79cc695e..a86e5ddcd7f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28316,8 +28316,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_4_hardened = linuxKernel.packages.linux_6_4_hardened; - linux_6_4_hardened = linuxKernel.kernels.linux_6_4_hardened; linuxPackages_6_5_hardened = linuxKernel.packages.linux_6_5_hardened; linux_6_5_hardened = linuxKernel.kernels.linux_6_5_hardened; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 7b746286f055..ce2e18ae6626 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -183,15 +183,6 @@ in { ]; }; - linux_6_4 = callPackage ../os-specific/linux/kernel/mainline.nix { - branch = "6.4"; - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.dell_xps_regression - ]; - }; - linux_6_5 = callPackage ../os-specific/linux/kernel/mainline.nix { branch = "6.5"; kernelPatches = [ @@ -218,9 +209,15 @@ in { linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix { # Pinned on the last version which Kent's commits can be cleany rebased up. - kernel = linux_6_4; - kernelPatches = linux_6_4.kernelPatches; - }; + kernel = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "6.4"; + }; + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.dell_xps_regression + ]; + }; linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix { kernelPatches = [ @@ -281,7 +278,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_4_hardened = hardenedKernelFor kernels.linux_6_4 { }; linux_6_5_hardened = hardenedKernelFor kernels.linux_6_5 { }; } // lib.optionalAttrs config.allowAliases { @@ -291,6 +287,7 @@ in { 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_6_4 = throw "linux 6.4 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"; @@ -601,7 +598,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_4 = recurseIntoAttrs (packagesFor kernels.linux_6_4); linux_6_5 = recurseIntoAttrs (packagesFor kernels.linux_6_5); } // 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 @@ -610,6 +606,7 @@ in { 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 + linux_6_4 = throw "linux 6.4 was removed because it reached its end of life upstream"; # Added 2023-10-02 }; rtPackages = { @@ -641,7 +638,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_4_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_4_hardened); linux_6_5_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_5_hardened); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);