summary refs log tree commit diff
diff options
context:
space:
mode:
authorK900 <me@0upti.me>2023-01-15 15:21:06 +0300
committerK900 <me@0upti.me>2023-01-15 15:23:24 +0300
commit33b60cca172932a8ac120b9994d00e6d91802aac (patch)
tree28330b30f65b74fa112fb13581d664d7b2d97d2d
parent6f0d5ff07cedc9820c78974f242010053fe1fa68 (diff)
downloadnixpkgs-33b60cca172932a8ac120b9994d00e6d91802aac.tar
nixpkgs-33b60cca172932a8ac120b9994d00e6d91802aac.tar.gz
nixpkgs-33b60cca172932a8ac120b9994d00e6d91802aac.tar.bz2
nixpkgs-33b60cca172932a8ac120b9994d00e6d91802aac.tar.lz
nixpkgs-33b60cca172932a8ac120b9994d00e6d91802aac.tar.xz
nixpkgs-33b60cca172932a8ac120b9994d00e6d91802aac.tar.zst
nixpkgs-33b60cca172932a8ac120b9994d00e6d91802aac.zip
linux/hardened/patches/6.1: init at 6.1.6-hardened1
-rw-r--r--nixos/tests/kernel-generic.nix1
-rw-r--r--pkgs/os-specific/linux/kernel/hardened/patches.json10
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/linux-kernels.nix2
4 files changed, 15 insertions, 0 deletions
diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix
index 7ee734a1eff..ae3d47a49bd 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_0_hardened
+      linux_6_1_hardened
 
       linux_testing;
   };
diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 12727efc8a7..a6217e812d7 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -58,5 +58,15 @@
         },
         "sha256": "01q2sciv3l9brnsfcv9knx1ps3hq9rk1a08iqk3vscg3waq7xqxb",
         "version": "6.0.19"
+    },
+    "6.1": {
+        "patch": {
+            "extra": "-hardened1",
+            "name": "linux-hardened-6.1.6-hardened1.patch",
+            "sha256": "1qj7fwz3mhw1qj5q6aqalrq0nsbfqs33jqg51w9pa1zv4z35n79m",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.6-hardened1/linux-hardened-6.1.6-hardened1.patch"
+        },
+        "sha256": "1qsygnsn67j843ywpswy5724zin5sszb5mz8b8h3lw553mb8wk9y",
+        "version": "6.1.6"
     }
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 61a8fa4bc02..b29d1dee284 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25776,6 +25776,8 @@ with pkgs;
   linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened;
   linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened;
   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;
 
   # 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 a9e381adc88..5de691a3b1d 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -249,6 +249,7 @@ in {
     linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream";
     linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream";
     linux_6_0_hardened = hardenedKernelFor kernels.linux_6_0 { };
+    linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { };
 
   }));
   /*  Linux kernel modules are inherently tied to a specific kernel.  So
@@ -577,6 +578,7 @@ in {
     linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream";
     linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream";
     linux_6_0_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_0 { });
+    linux_6_1_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_1 { });
 
     linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
     linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx);