nix-community/raspberry-pi-nix
1
0
Fork 0
mirror of https://github.com/nix-community/raspberry-pi-nix.git synced 2025-11-08 19:46:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'nix-community:master' into master

Browse source
This commit is contained in:
Merten Falk 2025-02-21 10:08:31 +01:00 • committed by GitHub
commit d3c6ae3d78
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 55 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

56
flake.lock generated
View file

@ -36,16 +36,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1728193676, "lastModified": 1736061677,
"narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=", "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6", "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.05", "ref": "nixos-24.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -58,8 +58,9 @@
"rpi-bluez-firmware-src": "rpi-bluez-firmware-src", "rpi-bluez-firmware-src": "rpi-bluez-firmware-src",
"rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src", "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src",
"rpi-firmware-src": "rpi-firmware-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_54-src": "rpi-linux-6_6_54-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", "rpicam-apps-src": "rpicam-apps-src",
"u-boot-src": "u-boot-src" "u-boot-src": "u-boot-src"
} }
@ -101,45 +102,45 @@
"rpi-firmware-src": { "rpi-firmware-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1727798811, "lastModified": 1728405098,
"narHash": "sha256-eavbshXGYmkYR33y9FLcQMJoAYdYTESVEy0g/RRXnb0=", "narHash": "sha256-4gnK0KbqFnjBmWia9Jt2gveVWftmHrprpwBqYVqE/k0=",
"owner": "raspberrypi", "owner": "raspberrypi",
"repo": "firmware", "repo": "firmware",
"rev": "287e6a6c2d3b50eee3e2c5b2eacdd907e5cbe09a", "rev": "7bbb5f80d20a2335066a8781459c9f33e5eebc64",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "raspberrypi", "owner": "raspberrypi",
"ref": "1.20241001", "ref": "1.20241008",
"repo": "firmware", "repo": "firmware",
"type": "github" "type": "github"
} }
}, },
"rpi-linux-6_10_12-src": { "rpi-linux-6_12_11-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1728305462, "lastModified": 1738149451,
"narHash": "sha256-LtvNmGD1D5YYv+C9xxxddAeHw69o3OX/H9M7F663L74=", "narHash": "sha256-NGmZcaC2vlewTEV/p0z2+6PWnHB229dkGui45kI8HOE=",
"owner": "raspberrypi", "owner": "raspberrypi",
"repo": "linux", "repo": "linux",
"rev": "26ee50d56618c2d98100b1bc672fd201aed4d00f", "rev": "fab655ee33e6d647da5996c5548cfd7d43447a53",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "raspberrypi", "owner": "raspberrypi",
"ref": "rpi-6.10.y", "ref": "rpi-6.12.y",
"repo": "linux", "repo": "linux",
"type": "github" "type": "github"
} }
}, },
"rpi-linux-6_6_54-src": { "rpi-linux-6_6_67-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1728155174, "lastModified": 1734790986,
"narHash": "sha256-/8RjW35XQMnshjAE4Ey8j3oWzE2GOntnBYY6PlvZGhs=", "narHash": "sha256-q9swM2TmmuzbUuQnbLZk5PseKWD7/SNPwtth6bpGIqE=",
"owner": "raspberrypi", "owner": "raspberrypi",
"repo": "linux", "repo": "linux",
"rev": "12f0f28db3afe451a81a34c5a444f6841c10067c", "rev": "811ff707533bcd67cdcd368bbd46223082009b12",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -149,6 +150,23 @@
"type": "github" "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": { "rpicam-apps-src": {
"flake": false, "flake": false,
"locked": { "locked": {

14
flake.nix
View file

@ -2,22 +2,26 @@
description = "raspberry-pi nixos configuration"; description = "raspberry-pi nixos configuration";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
u-boot-src = { u-boot-src = {
flake = false; flake = false;
url = "https://ftp.denx.de/pub/u-boot/u-boot-2024.07.tar.bz2"; url = "https://ftp.denx.de/pub/u-boot/u-boot-2024.07.tar.bz2";
}; };
rpi-linux-6_6_54-src = { rpi-linux-stable-src = {
flake = false;
url = "github:raspberrypi/linux/stable_20241008";
};
rpi-linux-6_6_67-src = {
flake = false; flake = false;
url = "github:raspberrypi/linux/rpi-6.6.y"; url = "github:raspberrypi/linux/rpi-6.6.y";
}; };
rpi-linux-6_10_12-src = { rpi-linux-6_12_11-src = {
flake = false; flake = false;
url = "github:raspberrypi/linux/rpi-6.10.y"; url = "github:raspberrypi/linux/rpi-6.12.y";
}; };
rpi-firmware-src = { rpi-firmware-src = {
flake = false; flake = false;
url = "github:raspberrypi/firmware/1.20241001"; url = "github:raspberrypi/firmware/1.20241008";
}; };
rpi-firmware-nonfree-src = { rpi-firmware-nonfree-src = {
flake = false; flake = false;

14
overlays/default.nix
View file

@ -1,6 +1,7 @@
{ u-boot-src { u-boot-src
, rpi-linux-6_6_54-src , rpi-linux-stable-src
, rpi-linux-6_10_12-src , rpi-linux-6_6_67-src
, rpi-linux-6_12_11-src
, rpi-firmware-src , rpi-firmware-src
, rpi-firmware-nonfree-src , rpi-firmware-nonfree-src
, rpi-bluez-firmware-src , rpi-bluez-firmware-src
@ -9,9 +10,10 @@
final: prev: final: prev:
let let
versions = { versions = {
v6_6_54.src = rpi-linux-6_6_54-src; v6_6_51.src = rpi-linux-stable-src;
v6_10_12 = { v6_6_67.src = rpi-linux-6_6_67-src;
src = rpi-linux-6_10_12-src; v6_12_11 = {
src = rpi-linux-6_12_11-src;
patches = [ patches = [
{ {
name = "remove-readme-target.patch"; name = "remove-readme-target.patch";
@ -116,7 +118,7 @@ in
# rpi kernels and firmware are available at # rpi kernels and firmware are available at
# `pkgs.rpi-kernels.<VERSION>.<BOARD>'. # `pkgs.rpi-kernels.<VERSION>.<BOARD>'.
# #
# For example: `pkgs.rpi-kernels.v6_6_54.bcm2712' # For example: `pkgs.rpi-kernels.v6_6_67.bcm2712'
rpi-kernels = rpi-kernels ( rpi-kernels = rpi-kernels (
final.lib.cartesianProduct final.lib.cartesianProduct
{ board = boards; version = (builtins.attrNames versions); } { board = boards; version = (builtins.attrNames versions); }

2
rpi/default.nix
View file

@ -14,7 +14,7 @@ in
options = with lib; { options = with lib; {
raspberry-pi-nix = { raspberry-pi-nix = {
kernel-version = mkOption { kernel-version = mkOption {
default = "v6_6_54"; default = "v6_6_51";
type = types.str; type = types.str;
description = "Kernel version to build."; description = "Kernel version to build.";
}; };