From 25b46a0be002fbc4f4b5b36ba7d2ce9652d23c53 Mon Sep 17 00:00:00 2001 From: Travis Staton Date: Wed, 8 Jan 2025 11:54:30 -0500 Subject: [PATCH 1/3] add stable kernel --- flake.lock | 18 ++++++++++++++++++ flake.nix | 4 ++++ overlays/default.nix | 2 ++ 3 files changed, 24 insertions(+) diff --git a/flake.lock b/flake.lock index d6df713..4f68be4 100644 --- a/flake.lock +++ b/flake.lock @@ -60,6 +60,7 @@ "rpi-firmware-src": "rpi-firmware-src", "rpi-linux-6_10_12-src": "rpi-linux-6_10_12-src", "rpi-linux-6_6_67-src": "rpi-linux-6_6_67-src", + "rpi-linux-stable-src": "rpi-linux-stable-src", "rpicam-apps-src": "rpicam-apps-src", "u-boot-src": "u-boot-src" } @@ -149,6 +150,23 @@ "type": "github" } }, + "rpi-linux-stable-src": { + "flake": false, + "locked": { + "lastModified": 1728403745, + "narHash": "sha256-phCxkuO+jUGZkfzSrBq6yErQeO2Td+inIGHxctXbD5U=", + "owner": "raspberrypi", + "repo": "linux", + "rev": "5aeecea9f4a45248bcf564dec924965e066a7bfd", + "type": "github" + }, + "original": { + "owner": "raspberrypi", + "ref": "stable_20241008", + "repo": "linux", + "type": "github" + } + }, "rpicam-apps-src": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 652ae10..390d550 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,10 @@ flake = false; url = "https://ftp.denx.de/pub/u-boot/u-boot-2024.07.tar.bz2"; }; + rpi-linux-stable-src = { + flake = false; + url = "github:raspberrypi/linux/stable_20241008"; + }; rpi-linux-6_6_67-src = { flake = false; url = "github:raspberrypi/linux/rpi-6.6.y"; diff --git a/overlays/default.nix b/overlays/default.nix index 3d5c6d9..325e9b2 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,4 +1,5 @@ { u-boot-src +, rpi-linux-stable-src , rpi-linux-6_6_67-src , rpi-linux-6_10_12-src , rpi-firmware-src @@ -9,6 +10,7 @@ final: prev: let versions = { + v6_6_51.src = rpi-linux-stable-src; v6_6_67.src = rpi-linux-6_6_67-src; v6_10_12 = { src = rpi-linux-6_10_12-src; From 340fc9e3806bd789418a815f2181d7d6be9045d7 Mon Sep 17 00:00:00 2001 From: Travis Staton Date: Wed, 8 Jan 2025 11:55:38 -0500 Subject: [PATCH 2/3] default to stable kernel --- rpi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpi/default.nix b/rpi/default.nix index b6be690..dc207eb 100644 --- a/rpi/default.nix +++ b/rpi/default.nix @@ -14,7 +14,7 @@ in options = with lib; { raspberry-pi-nix = { kernel-version = mkOption { - default = "v6_6_67"; + default = "v6_6_51"; type = types.str; description = "Kernel version to build."; }; From 85faa0f775e3590ff4223c80786862c6f26018c5 Mon Sep 17 00:00:00 2001 From: Travis Staton Date: Wed, 8 Jan 2025 11:59:48 -0500 Subject: [PATCH 3/3] matching firmware --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 4f68be4..5ef88a3 100644 --- a/flake.lock +++ b/flake.lock @@ -102,16 +102,16 @@ "rpi-firmware-src": { "flake": false, "locked": { - "lastModified": 1727798811, - "narHash": "sha256-eavbshXGYmkYR33y9FLcQMJoAYdYTESVEy0g/RRXnb0=", + "lastModified": 1728405098, + "narHash": "sha256-4gnK0KbqFnjBmWia9Jt2gveVWftmHrprpwBqYVqE/k0=", "owner": "raspberrypi", "repo": "firmware", - "rev": "287e6a6c2d3b50eee3e2c5b2eacdd907e5cbe09a", + "rev": "7bbb5f80d20a2335066a8781459c9f33e5eebc64", "type": "github" }, "original": { "owner": "raspberrypi", - "ref": "1.20241001", + "ref": "1.20241008", "repo": "firmware", "type": "github" } diff --git a/flake.nix b/flake.nix index 390d550..c13eab2 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,7 @@ }; rpi-firmware-src = { flake = false; - url = "github:raspberrypi/firmware/1.20241001"; + url = "github:raspberrypi/firmware/1.20241008"; }; rpi-firmware-nonfree-src = { flake = false;