From 041f0afeb9184abbe91f75624d8a121e7a15fc36 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 28 Jun 2023 21:23:00 +0200 Subject: [PATCH] linux_6_3_hardened: expose package (cherry picked from commit 0b4e493e58bf92b9784f5c0d562489364d0733e7) --- nixos/tests/kernel-generic.nix | 1 + pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/linux-kernels.nix | 2 ++ 3 files changed, 5 insertions(+) diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 3e74554de339..82d9118c6fb1 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -31,6 +31,7 @@ let linux_5_10_hardened linux_5_15_hardened linux_6_1_hardened + linux_6_3_hardened linux_testing; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 685f198628d9..3181b44455e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25382,6 +25382,8 @@ 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; # Hardkernel (Odroid) kernels. linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 1f0e5680cf18..9dfb1d27f0e1 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -251,6 +251,7 @@ in { linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream"; linux_6_0_hardened = throw "linux 6.0 was removed because it has reached its end of life upstream"; linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; + linux_6_3_hardened = hardenedKernelFor kernels.linux_6_3 { }; })); /* Linux kernel modules are inherently tied to a specific kernel. So @@ -579,6 +580,7 @@ in { linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream"; linux_6_0_hardened = throw "linux 6.0 was removed because it has reached its end of life upstream"; linux_6_1_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_1 { }); + linux_6_3_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_3 { }); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx);