Merge pull request #258569 from alyssais/linux-6.4-drop (ae7d5d59) · Commits · nix / nixpkgs

nixos/tests/kernel-generic.nix

+0 −1

Original line number	Diff line number	Diff line
		@@ -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

pkgs/os-specific/linux/kernel/hardened/patches.json

+0 −10

Original line number	Diff line number	Diff line
		@@ -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",

pkgs/os-specific/linux/zfs/unstable.nix

+1 −3

Original line number	Diff line number	Diff line
		@@ -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

pkgs/top-level/all-packages.nix

+0 −2

Original line number	Diff line number	Diff line
		@@ -28332,8 +28332,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;

pkgs/top-level/linux-kernels.nix

+11 −15

Original line number	Diff line number	Diff line
		@@ -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,8 +209,14 @@ 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 {
		@@ -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);