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

Commit c4f44a0

Browse files
committed
feat: bump all software & kernel, fix libcamera issues, load versions dynamically
1 parent f317116 commit c4f44a0

File tree

7 files changed

+161
-125
lines changed

7 files changed

+161
-125
lines changed

flake.lock

Lines changed: 52 additions & 52 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
@@ -5,23 +5,23 @@
55
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
66
u-boot-src = {
77
flake = false;
8-
url = "https://ftp.denx.de/pub/u-boot/u-boot-2024.07.tar.bz2";
8+
url = "https://ftp.denx.de/pub/u-boot/u-boot-2025.01.tar.bz2";
99
};
10-
rpi-linux-stable-src = {
11-
flake = false;
12-
url = "github:raspberrypi/linux/stable_20241008";
13-
};
14-
rpi-linux-6_6_67-src = {
10+
rpi-linux-6_6_y-src = {
1511
flake = false;
1612
url = "github:raspberrypi/linux/rpi-6.6.y";
1713
};
18-
rpi-linux-6_12_11-src = {
14+
rpi-linux-6_12_y-src = {
1915
flake = false;
2016
url = "github:raspberrypi/linux/rpi-6.12.y";
2117
};
22-
rpi-firmware-src = {
18+
rpi-firmware-6_6_y-src = {
19+
flake = false;
20+
url = "github:raspberrypi/firmware/master";
21+
};
22+
rpi-firmware-6_12_y-src = {
2323
flake = false;
24-
url = "github:raspberrypi/firmware/1.20241008";
24+
url = "github:raspberrypi/firmware/next";
2525
};
2626
rpi-firmware-nonfree-src = {
2727
flake = false;
@@ -33,11 +33,11 @@
3333
};
3434
rpicam-apps-src = {
3535
flake = false;
36-
url = "github:raspberrypi/rpicam-apps/v1.5.2";
36+
url = "github:raspberrypi/rpicam-apps/v1.5.3";
3737
};
3838
libcamera-src = {
3939
flake = false;
40-
url = "github:raspberrypi/libcamera/69a894c4adad524d3063dd027f5c4774485cf9db"; # v0.3.1+rpt20240906
40+
url = "github:raspberrypi/libcamera/v0.3.2+rpt20241119";
4141
};
4242
libpisp-src = {
4343
flake = false;
@@ -51,15 +51,18 @@
5151
system = "aarch64-linux";
5252
overlays = with self.overlays; [ core libcamera ];
5353
};
54+
lock = builtins.fromJSON (builtins.readFile ./flake.lock);
55+
lib = srcs.nixpkgs.lib;
56+
inputs = lib.recursiveUpdate (builtins.removeAttrs srcs [ "self" ]) { inherit lock; };
5457
in
5558
{
5659
overlays = {
57-
core = import ./overlays (builtins.removeAttrs srcs [ "self" ]);
58-
libcamera = import ./overlays/libcamera.nix (builtins.removeAttrs srcs [ "self" ]);
60+
core = import ./overlays inputs;
61+
libcamera = import ./overlays/libcamera.nix inputs;
5962
};
6063
nixosModules = {
6164
raspberry-pi = import ./rpi {
62-
inherit pinned;
65+
inherit pinned inputs;
6366
core-overlay = self.overlays.core;
6467
libcamera-overlay = self.overlays.libcamera;
6568
};
@@ -86,7 +89,6 @@
8689
in
8790
{
8891
example-sd-image = self.nixosConfigurations.rpi-example.config.system.build.sdImage;
89-
firmware = pinned.raspberrypifw;
9092
libcamera = pinned.libcamera;
9193
wireless-firmware = pinned.raspberrypiWirelessFirmware;
9294
uboot-rpi-arm64 = pinned.uboot-rpi-arm64;

0 commit comments

Comments
 (0)