From 323395569093589ed5445defa906b28606c8e24b Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Fri, 26 Dec 2025 14:53:27 -0600
Subject: [PATCH] kernel test

---
 modules/nixos/nix/default.nix              | 6 ++++++
 packages/raspberrypi/linux-rpi/default.nix | 8 ++++++--
 systems/aarch64-linux/pi5/boot.nix         | 2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix
index fa18a8b..c45c416 100644
--- a/modules/nixos/nix/default.nix
+++ b/modules/nixos/nix/default.nix
@@ -1,6 +1,7 @@
 {
   config,
   lib,
+  pkgs,
   namespace,
   ...
 }:
@@ -64,6 +65,11 @@
   };
 
   nixpkgs.overlays = [
+    (_self: super: {
+        ${namespace} = super.${namespace} // {
+          linux-rpi = super.${namespace}.linux-rpi.override { stdenv = super.ccacheStdenv; };
+        };
+    })
     (_self: super: {
       "mesa" = super."mesa".override { buildPackages.stdenv = super.ccacheStdenv; };
     })
diff --git a/packages/raspberrypi/linux-rpi/default.nix b/packages/raspberrypi/linux-rpi/default.nix
index 9b195f7..f6ebd46 100644
--- a/packages/raspberrypi/linux-rpi/default.nix
+++ b/packages/raspberrypi/linux-rpi/default.nix
@@ -8,10 +8,13 @@
 }@args:
 
 let
-  # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this
   modDirVersion = "6.12.47";
   tag = "stable_20250916";
   hash = "sha256-HG8Oc04V2t54l0SOn4gKmNJWQUrZfjWusgKcWvx74H0==";
+  # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this
+#  modDirVersion = "6.18.1";
+#  tag = "unstable_20251226";
+#  hash = "sha256-VYrXqwK9P2nWkm3DhOU8qaXzWv5L0DUoJ2MBRF6PoEE=";
 in
 lib.overrideDerivation
   (buildLinux (
@@ -24,6 +27,7 @@ lib.overrideDerivation
       src = fetchFromGitHub {
         owner = "raspberrypi";
         repo = "linux";
+        #rev = "0176325914cab516b73a5f1456fcd5f98c4764ab";
         inherit tag hash;
       };
 
@@ -110,4 +114,4 @@ lib.overrideDerivation
           copyDTB bcm2711-rpi-4-b.dtb bcm2838-rpi-4-b.dtb
           copyDTB bcm2712-rpi-5-b.dtb bcm2839-rpi-5-b.dtb
         '';
-  })
\ No newline at end of file
+  })
diff --git a/systems/aarch64-linux/pi5/boot.nix b/systems/aarch64-linux/pi5/boot.nix
index 5a8476d..992abcc 100755
--- a/systems/aarch64-linux/pi5/boot.nix
+++ b/systems/aarch64-linux/pi5/boot.nix
@@ -8,7 +8,7 @@ in
       bootloader = "kernel";
       firmwarePackage = pkgs.raspberrypifw;
     };
-    kernelPackages = pkgs.${namespace}.linux-rpi;
+    kernelPackages = pkgs.linuxPackagesFor pkgs.${namespace}.linux-rpi;
     supportedFilesystems = lib.mkForce [ ];
   };