Skip to content
This repository was archived by the owner on Mar 23, 2025. It is now read-only.

Commit d3c6ae3

Browse files
authored
Merge branch 'nix-community:master' into master
2 parents 4a74a02 + f317116 commit d3c6ae3

File tree

4 files changed

+55
-31
lines changed

4 files changed

+55
-31
lines changed

flake.lock

Lines changed: 37 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,26 @@
22
description = "raspberry-pi nixos configuration";
33

44
inputs = {
5-
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
5+
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
66
u-boot-src = {
77
flake = false;
88
url = "https://ftp.denx.de/pub/u-boot/u-boot-2024.07.tar.bz2";
99
};
10-
rpi-linux-6_6_54-src = {
10+
rpi-linux-stable-src = {
11+
flake = false;
12+
url = "github:raspberrypi/linux/stable_20241008";
13+
};
14+
rpi-linux-6_6_67-src = {
1115
flake = false;
1216
url = "github:raspberrypi/linux/rpi-6.6.y";
1317
};
14-
rpi-linux-6_10_12-src = {
18+
rpi-linux-6_12_11-src = {
1519
flake = false;
16-
url = "github:raspberrypi/linux/rpi-6.10.y";
20+
url = "github:raspberrypi/linux/rpi-6.12.y";
1721
};
1822
rpi-firmware-src = {
1923
flake = false;
20-
url = "github:raspberrypi/firmware/1.20241001";
24+
url = "github:raspberrypi/firmware/1.20241008";
2125
};
2226
rpi-firmware-nonfree-src = {
2327
flake = false;

overlays/default.nix

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{ u-boot-src
2-
, rpi-linux-6_6_54-src
3-
, rpi-linux-6_10_12-src
2+
, rpi-linux-stable-src
3+
, rpi-linux-6_6_67-src
4+
, rpi-linux-6_12_11-src
45
, rpi-firmware-src
56
, rpi-firmware-nonfree-src
67
, rpi-bluez-firmware-src
@@ -9,9 +10,10 @@
910
final: prev:
1011
let
1112
versions = {
12-
v6_6_54.src = rpi-linux-6_6_54-src;
13-
v6_10_12 = {
14-
src = rpi-linux-6_10_12-src;
13+
v6_6_51.src = rpi-linux-stable-src;
14+
v6_6_67.src = rpi-linux-6_6_67-src;
15+
v6_12_11 = {
16+
src = rpi-linux-6_12_11-src;
1517
patches = [
1618
{
1719
name = "remove-readme-target.patch";
@@ -116,7 +118,7 @@ in
116118
# rpi kernels and firmware are available at
117119
# `pkgs.rpi-kernels.<VERSION>.<BOARD>'.
118120
#
119-
# For example: `pkgs.rpi-kernels.v6_6_54.bcm2712'
121+
# For example: `pkgs.rpi-kernels.v6_6_67.bcm2712'
120122
rpi-kernels = rpi-kernels (
121123
final.lib.cartesianProduct
122124
{ board = boards; version = (builtins.attrNames versions); }

rpi/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ in
1414
options = with lib; {
1515
raspberry-pi-nix = {
1616
kernel-version = mkOption {
17-
default = "v6_6_54";
17+
default = "v6_6_51";
1818
type = types.str;
1919
description = "Kernel version to build.";
2020
};

0 commit comments

Comments
 (0)