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

dynamic versioning, update latest, fix libcamera. #109

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

dynamic versioning, update latest, fix libcamera. #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c635f54
feat: bump all software & kernel, fix libcamera issues, load versions…
adminy Mar 22, 2025
e1f3274
chore: flake bump
adminy Mar 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 55 additions & 55 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 17 additions & 15 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
rpi-linux-stable-src = {
rpi-linux-6_6_y-src = {
flake = false;
url = "github:raspberrypi/linux/stable_20241008";
url = "github:raspberrypi/linux/rpi-6.6.y";
};
rpi-linux-6_6_78-src = {
rpi-linux-6_14_y-src = {
flake = false;
url = "github:raspberrypi/linux/rpi-6.6.y";
url = "github:raspberrypi/linux/rpi-6.14.y";
};
rpi-linux-6_12_17-src = {
rpi-firmware-6_6_y-src = {
flake = false;
url = "github:raspberrypi/linux/rpi-6.12.y";
url = "github:raspberrypi/firmware/stable";
};
rpi-firmware-src = {
rpi-firmware-6_14_y-src = {
flake = false;
url = "github:raspberrypi/firmware/1.20241008";
url = "github:raspberrypi/firmware/master";
};
rpi-firmware-nonfree-src = {
flake = false;
Expand All @@ -29,15 +29,15 @@
};
rpicam-apps-src = {
flake = false;
url = "github:raspberrypi/rpicam-apps/v1.5.2";
url = "github:raspberrypi/rpicam-apps/v1.6.0";
};
libcamera-src = {
flake = false;
url = "github:raspberrypi/libcamera/69a894c4adad524d3063dd027f5c4774485cf9db"; # v0.3.1+rpt20240906
url = "github:raspberrypi/libcamera/v0.4.0+rpt20250213";
};
libpisp-src = {
flake = false;
url = "github:raspberrypi/libpisp/v1.0.7";
url = "github:raspberrypi/libpisp/v1.2.0";
};
};

Expand All @@ -47,15 +47,18 @@
system = "aarch64-linux";
overlays = with self.overlays; [ core libcamera ];
};
lock = builtins.fromJSON (builtins.readFile ./flake.lock);
lib = srcs.nixpkgs.lib;
inputs = lib.recursiveUpdate (builtins.removeAttrs srcs [ "self" ]) { inherit lock; };
in
{
overlays = {
core = import ./overlays (builtins.removeAttrs srcs [ "self" ]);
libcamera = import ./overlays/libcamera.nix (builtins.removeAttrs srcs [ "self" ]);
core = import ./overlays inputs;
libcamera = import ./overlays/libcamera.nix inputs;
};
nixosModules = {
raspberry-pi = import ./rpi {
inherit pinned;
inherit pinned inputs;
core-overlay = self.overlays.core;
libcamera-overlay = self.overlays.libcamera;
};
Expand All @@ -82,7 +85,6 @@
in
{
example-sd-image = self.nixosConfigurations.rpi-example.config.system.build.sdImage;
firmware = pinned.raspberrypifw;
libcamera = pinned.libcamera;
wireless-firmware = pinned.raspberrypiWirelessFirmware;
uboot-rpi-arm64 = pinned.uboot-rpi-arm64;
Expand Down
Loading