From 97c51868c6a820951439162507b80e1b026d8ad4 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Thu, 26 Dec 2024 11:07:45 -0800 Subject: [PATCH 1/6] Update kernel from 6.6.54 to 6.6.67 --- flake.lock | 10 +++++----- flake.nix | 2 +- overlays/default.nix | 6 +++--- rpi/default.nix | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index abb934b..e06aee3 100644 --- a/flake.lock +++ b/flake.lock @@ -59,7 +59,7 @@ "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src", "rpi-firmware-src": "rpi-firmware-src", "rpi-linux-6_10_12-src": "rpi-linux-6_10_12-src", - "rpi-linux-6_6_54-src": "rpi-linux-6_6_54-src", + "rpi-linux-6_6_67-src": "rpi-linux-6_6_67-src", "rpicam-apps-src": "rpicam-apps-src", "u-boot-src": "u-boot-src" } @@ -132,14 +132,14 @@ "type": "github" } }, - "rpi-linux-6_6_54-src": { + "rpi-linux-6_6_67-src": { "flake": false, "locked": { - "lastModified": 1728155174, - "narHash": "sha256-/8RjW35XQMnshjAE4Ey8j3oWzE2GOntnBYY6PlvZGhs=", + "lastModified": 1734790986, + "narHash": "sha256-q9swM2TmmuzbUuQnbLZk5PseKWD7/SNPwtth6bpGIqE=", "owner": "raspberrypi", "repo": "linux", - "rev": "12f0f28db3afe451a81a34c5a444f6841c10067c", + "rev": "811ff707533bcd67cdcd368bbd46223082009b12", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c0acdc3..d48a39c 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ flake = false; url = "https://ftp.denx.de/pub/u-boot/u-boot-2024.07.tar.bz2"; }; - rpi-linux-6_6_54-src = { + 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 162330c..3d5c6d9 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,5 +1,5 @@ { u-boot-src -, rpi-linux-6_6_54-src +, rpi-linux-6_6_67-src , rpi-linux-6_10_12-src , rpi-firmware-src , rpi-firmware-nonfree-src @@ -9,7 +9,7 @@ final: prev: let versions = { - v6_6_54.src = rpi-linux-6_6_54-src; + v6_6_67.src = rpi-linux-6_6_67-src; v6_10_12 = { src = rpi-linux-6_10_12-src; patches = [ @@ -116,7 +116,7 @@ in # rpi kernels and firmware are available at # `pkgs.rpi-kernels..'. # - # For example: `pkgs.rpi-kernels.v6_6_54.bcm2712' + # For example: `pkgs.rpi-kernels.v6_6_67.bcm2712' rpi-kernels = rpi-kernels ( final.lib.cartesianProduct { board = boards; version = (builtins.attrNames versions); } diff --git a/rpi/default.nix b/rpi/default.nix index 5900692..b6be690 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_54"; + default = "v6_6_67"; type = types.str; description = "Kernel version to build."; }; From f85fbd621f353db2654173300c75e8c00fc8b6b5 Mon Sep 17 00:00:00 2001 From: Travis Staton Date: Mon, 6 Jan 2025 10:19:04 -0500 Subject: [PATCH 2/6] bump nixpkgs to 24.11 --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index e06aee3..d6df713 100644 --- a/flake.lock +++ b/flake.lock @@ -36,16 +36,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728193676, - "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=", + "lastModified": 1736061677, + "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6", + "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index d48a39c..652ae10 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "raspberry-pi nixos configuration"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; u-boot-src = { flake = false; url = "https://ftp.denx.de/pub/u-boot/u-boot-2024.07.tar.bz2"; From 25b46a0be002fbc4f4b5b36ba7d2ce9652d23c53 Mon Sep 17 00:00:00 2001 From: Travis Staton Date: Wed, 8 Jan 2025 11:54:30 -0500 Subject: [PATCH 3/6] 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 4/6] 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 5/6] 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; From e94b747760d09619786a64b84fad30fd6839dd4f Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Thu, 26 Dec 2024 11:23:52 -0800 Subject: [PATCH 6/6] Drop kernel 6.10.12 in favour of 6.12.11 --- flake.lock | 12 ++++++------ flake.nix | 4 ++-- overlays/default.nix | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 5ef88a3..71d9a0d 100644 --- a/flake.lock +++ b/flake.lock @@ -58,7 +58,7 @@ "rpi-bluez-firmware-src": "rpi-bluez-firmware-src", "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src", "rpi-firmware-src": "rpi-firmware-src", - "rpi-linux-6_10_12-src": "rpi-linux-6_10_12-src", + "rpi-linux-6_12_11-src": "rpi-linux-6_12_11-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", @@ -116,19 +116,19 @@ "type": "github" } }, - "rpi-linux-6_10_12-src": { + "rpi-linux-6_12_11-src": { "flake": false, "locked": { - "lastModified": 1728305462, - "narHash": "sha256-LtvNmGD1D5YYv+C9xxxddAeHw69o3OX/H9M7F663L74=", + "lastModified": 1738149451, + "narHash": "sha256-NGmZcaC2vlewTEV/p0z2+6PWnHB229dkGui45kI8HOE=", "owner": "raspberrypi", "repo": "linux", - "rev": "26ee50d56618c2d98100b1bc672fd201aed4d00f", + "rev": "fab655ee33e6d647da5996c5548cfd7d43447a53", "type": "github" }, "original": { "owner": "raspberrypi", - "ref": "rpi-6.10.y", + "ref": "rpi-6.12.y", "repo": "linux", "type": "github" } diff --git a/flake.nix b/flake.nix index c13eab2..1668198 100644 --- a/flake.nix +++ b/flake.nix @@ -15,9 +15,9 @@ flake = false; url = "github:raspberrypi/linux/rpi-6.6.y"; }; - rpi-linux-6_10_12-src = { + rpi-linux-6_12_11-src = { flake = false; - url = "github:raspberrypi/linux/rpi-6.10.y"; + url = "github:raspberrypi/linux/rpi-6.12.y"; }; rpi-firmware-src = { flake = false; diff --git a/overlays/default.nix b/overlays/default.nix index 325e9b2..1ad69a6 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,7 +1,7 @@ { u-boot-src , rpi-linux-stable-src , rpi-linux-6_6_67-src -, rpi-linux-6_10_12-src +, rpi-linux-6_12_11-src , rpi-firmware-src , rpi-firmware-nonfree-src , rpi-bluez-firmware-src @@ -12,8 +12,8 @@ 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; + v6_12_11 = { + src = rpi-linux-6_12_11-src; patches = [ { name = "remove-readme-target.patch";