liminix

commit cf115867ed52c0c73918e54e9aa55cb4b18e9d85
parent 8362f19d485bbce8c038825ee9525c3822f2300b
Author: Daniel Barlow <dan@telent.net>
Date:   Tue, 29 Sep 2026 22:22:17 +0100

upgrade Turris Omnia kerne; to latest LTS

Diffstat:
M
NEWS
 | 
2
++
M
devices/turris-omnia/default.nix
 | 
6
+++---
M
pkgs/kernel/default.nix
 | 
4
++--

3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/NEWS b/NEWS
@@ -181,6 +181,8 @@ which was a source of boot-time deadlocks
 
 2026-09-28
 
+* Turris Omnia gets an upgrade to the latest LTS kernel (6.18.54)
+
 * DCCP support has been removed from the firewall module, but it's
   unlikely anyone will notice
   (https://www.phoronix.com/news/Linux-6.16-Net-Next-Drops-DCCP)
diff --git a/devices/turris-omnia/default.nix b/devices/turris-omnia/default.nix
@@ -192,10 +192,10 @@
         kernel = {
           src = pkgs.pkgsBuildBuild.fetchurl {
             name = "linux.tar.gz";
-            url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.7.4.tar.gz";
-            hash = "sha256-wIrmL0BS63nRwWfm4nw+dRNVPUzGh9M4X7LaHzAn5tU=";
+            url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.18.54.tar.gz";
+            hash = "sha256-rHSOttt5N+piPpXCEP6aELvvOzXX+kmoBCkcoP1kOvk=";
           };
-          version = "6.7.4";
+          version = "6.18.54";
           config = {
             PCI = "y";
             OF = "y";
diff --git a/pkgs/kernel/default.nix b/pkgs/kernel/default.nix
@@ -74,8 +74,8 @@ stdenv.mkDerivation rec {
     ./phram-allow-cached-mappings.patch
   ++ lib.optional
     # this is inexact. kernels new enough to contain 2b0996c7646 but
-    # not new enough to contain 2fa490c0d759191
-    ((lib.versionAtLeast version "6.12.0") && (lib.versionOlder version "6.19.0"))
+    # not new enough to contain 2fa490c0d759191 (6.16.0-rc3)
+    ((lib.versionAtLeast version "6.12.0") && (lib.versionOlder version "6.16.0"))
     ./ath9k-ahb-replace-id_table-with-of.patch;
 
   # this is here to work around what I think is a bug in nixpkgs