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

Commit b48d452

Browse files
committed
feat: bump all software & kernel, fix libcamera issues, load versions dynamically, 6.14 support
1 parent 3bfda6a commit b48d452

File tree

7 files changed

+164
-138
lines changed

7 files changed

+164
-138
lines changed

flake.lock

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

flake.nix

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33

44
inputs = {
55
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
6-
rpi-linux-stable-src = {
6+
rpi-linux-6_6_y-src = {
77
flake = false;
8-
url = "github:raspberrypi/linux/stable_20241008";
8+
url = "github:raspberrypi/linux/rpi-6.6.y";
99
};
10-
rpi-linux-6_6_78-src = {
10+
rpi-linux-6_14_y-src = {
1111
flake = false;
12-
url = "github:raspberrypi/linux/rpi-6.6.y";
12+
url = "github:raspberrypi/linux/rpi-6.14.y";
1313
};
14-
rpi-linux-6_12_17-src = {
14+
rpi-firmware-6_6_y-src = {
1515
flake = false;
16-
url = "github:raspberrypi/linux/rpi-6.12.y";
16+
url = "github:raspberrypi/firmware/stable";
1717
};
18-
rpi-firmware-src = {
18+
rpi-firmware-6_14_y-src = {
1919
flake = false;
20-
url = "github:raspberrypi/firmware/1.20241008";
20+
url = "github:raspberrypi/firmware/next";
2121
};
2222
rpi-firmware-nonfree-src = {
2323
flake = false;
@@ -29,15 +29,15 @@
2929
};
3030
rpicam-apps-src = {
3131
flake = false;
32-
url = "github:raspberrypi/rpicam-apps/v1.5.2";
32+
url = "github:raspberrypi/rpicam-apps/v1.6.0";
3333
};
3434
libcamera-src = {
3535
flake = false;
36-
url = "github:raspberrypi/libcamera/69a894c4adad524d3063dd027f5c4774485cf9db"; # v0.3.1+rpt20240906
36+
url = "github:raspberrypi/libcamera/v0.4.0+rpt20250213";
3737
};
3838
libpisp-src = {
3939
flake = false;
40-
url = "github:raspberrypi/libpisp/v1.0.7";
40+
url = "github:raspberrypi/libpisp/v1.2.0";
4141
};
4242
};
4343

@@ -47,15 +47,18 @@
4747
system = "aarch64-linux";
4848
overlays = with self.overlays; [ core libcamera ];
4949
};
50+
lock = builtins.fromJSON (builtins.readFile ./flake.lock);
51+
lib = srcs.nixpkgs.lib;
52+
inputs = lib.recursiveUpdate (builtins.removeAttrs srcs [ "self" ]) { inherit lock; };
5053
in
5154
{
5255
overlays = {
53-
core = import ./overlays (builtins.removeAttrs srcs [ "self" ]);
54-
libcamera = import ./overlays/libcamera.nix (builtins.removeAttrs srcs [ "self" ]);
56+
core = import ./overlays inputs;
57+
libcamera = import ./overlays/libcamera.nix inputs;
5558
};
5659
nixosModules = {
5760
raspberry-pi = import ./rpi {
58-
inherit pinned;
61+
inherit pinned inputs;
5962
core-overlay = self.overlays.core;
6063
libcamera-overlay = self.overlays.libcamera;
6164
};
@@ -82,7 +85,6 @@
8285
in
8386
{
8487
example-sd-image = self.nixosConfigurations.rpi-example.config.system.build.sdImage;
85-
firmware = pinned.raspberrypifw;
8688
libcamera = pinned.libcamera;
8789
wireless-firmware = pinned.raspberrypiWirelessFirmware;
8890
uboot-rpi-arm64 = pinned.uboot-rpi-arm64;

0 commit comments

Comments
 (0)