From 6e1214d9da3d7551d3723593417c66ad8f41c657 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Tue, 17 Aug 2021 18:45:38 -0700
Subject: [PATCH 1/3] aliases: fix eval

Due to master->staging semantic merge conflict

Linux 5.12 was removed in master in e55554491df6e7b789d7f3d6a3b354df3575e1c6
but not from the staging aliases in c62f911507977ac67fd5e8547af2d1071c5e0891
---
 pkgs/top-level/aliases.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index bb50e4d42e85..4c68ee69fac6 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -451,7 +451,6 @@ mapAliases ({
   linuxPackages_4_19 = linuxKernel.packages.linux_4_19;
   linuxPackages_5_4 = linuxKernel.packages.linux_5_4;
   linuxPackages_5_10 = linuxKernel.packages.linux_5_10;
-  linuxPackages_5_12 = linuxKernel.packages.linux_5_12;
   linuxPackages_5_13 = linuxKernel.packages.linux_5_13;
 
   linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95;
@@ -467,7 +466,6 @@ mapAliases ({
   linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4;
   linux_5_10 = linuxKernel.kernels.linux_5_10;
   linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10;
-  linux_5_12 = linuxKernel.kernels.linux_5_12;
   linux-rt_5_11 = linuxKernel.kernels.linux_rt_5_11;
 
   # added 2020-04-04

From 3af43aa8792e654f77f3e63749a6d0f5b948fb70 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Tue, 17 Aug 2021 23:42:23 -0700
Subject: [PATCH 2/3] linux-kernels: fix missing linux-hardened kernels

due to merge conflict
---
 pkgs/top-level/linux-kernels.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 85929255b186..2bae5140b14e 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -189,6 +189,13 @@ let
 
     linux_latest_libre = deblobKernel packageAliases.linux_latest.kernel;
 
+    linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { };
+
+    linux_4_14_hardened = hardenedKernelFor kernels.linux_4_14 { };
+    linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 { };
+    linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { };
+    linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };
+
   });
   /*  Linux kernel modules are inherently tied to a specific kernel.  So
     rather than provide specific instances of those packages for a
@@ -417,9 +424,9 @@ let
   });
 
   # Hardened Linux
-  hardenedPackagesFor = kernel': overrides:
+  hardenedKernelFor = kernel': overrides:
     let kernel = kernel'.override overrides;
-    in packagesFor (kernel.override {
+    in kernel.override {
       structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix {
         inherit lib;
         inherit (kernel) version;
@@ -429,7 +436,8 @@ let
       ];
       modDirVersionArg = kernel.modDirVersion + (kernelPatches.hardened.${kernel.meta.branch}).extra;
       isHardened = true;
-  });
+  };
+  hardenedPackagesFor = kernel: overrides: packagesFor (hardenedKernelFor kernel overrides);
 
   vanillaPackages = {
     # recurse to build modules for the kernels

From 8097f2e121262f03a8188feeef0e96d68d977f97 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Tue, 17 Aug 2021 23:43:21 -0700
Subject: [PATCH 3/3] all-packages: fix eval

due to aliased hardened kernels
---
 pkgs/top-level/all-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4161e8ee25c3..36aa12b7eb69 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21141,10 +21141,10 @@ with pkgs;
   linux_4_14_hardened = linuxPackages_4_14_hardened.kernel;
   linuxPackages_4_19_hardened = linuxKernel.packages.linux_4_19_hardened;
   linux_4_19_hardened = linuxPackages_4_19_hardened.kernel;
-  linuxPackages_5_4_hardened = linuxKernel.linux_5_4_hardened.linux_latest_hardened;
-  linux_5_4_hardened = linuxPackages_5_4_hardened.kernel;
+  linuxPackages_5_4_hardened = linuxKernel.packages.linux_5_4_hardened;
+  linux_5_4_hardened = linuxKernel.kernels.linux_5_4_hardened;
   linuxPackages_5_10_hardened = linuxKernel.packages.linux_5_10_hardened;
-  linux_5_10_hardened = linuxPackages_5_10_hardened.kernel;
+  linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened;
 
   # Hardkernel (Odroid) kernels.
   linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest;