feat: bump all software & kernel, fix libcamera issues, load versions dynamically

Author: adminy

flake.lock

@@ -5,23 +5,23 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
     u-boot-src = {
       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-2025.01.tar.bz2";
     };
     rpi-linux-stable-src = {
       flake = false;
       url = "github:raspberrypi/linux/stable_20241008";
     };
-    rpi-linux-6_6_67-src = {
+    rpi-linux-6_6_y-src = {
       flake = false;
       url = "github:raspberrypi/linux/rpi-6.6.y";
     };
-    rpi-linux-6_10_12-src = {
+    rpi-linux-6_12_y-src = {
       flake = false;
-      url = "github:raspberrypi/linux/rpi-6.10.y";
+      url = "github:raspberrypi/linux/rpi-6.12.y";
     };
     rpi-firmware-src = {
       flake = false;
-      url = "github:raspberrypi/firmware/1.20241008";
+      url = "github:raspberrypi/firmware/1.20241126";
     };
     rpi-firmware-nonfree-src = {
       flake = false;
@@ -33,11 +33,11 @@
     };
     rpicam-apps-src = {
       flake = false;
-      url = "github:raspberrypi/rpicam-apps/v1.5.2";
+      url = "github:raspberrypi/rpicam-apps/v1.5.3";
     };
     libcamera-src = {
       flake = false;
-      url = "github:raspberrypi/libcamera/69a894c4adad524d3063dd027f5c4774485cf9db"; # v0.3.1+rpt20240906
+      url = "github:raspberrypi/libcamera/v0.3.2+rpt20241119";
     };
     libpisp-src = {
       flake = false;
@@ -51,15 +51,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;
         };

flake.nix

@@ -1,19 +1,20 @@
 { u-boot-src
 , rpi-linux-stable-src
-, rpi-linux-6_6_67-src
-, rpi-linux-6_10_12-src
+, rpi-linux-6_6_y-src
+, rpi-linux-6_12_y-src
 , rpi-firmware-src
 , rpi-firmware-nonfree-src
 , rpi-bluez-firmware-src
+, lock
 , ...
 }:
 final: prev:
 let
   versions = {
     v6_6_51.src = rpi-linux-stable-src;
-    v6_6_67.src = rpi-linux-6_6_67-src;
-    v6_10_12 = {
-      src = rpi-linux-6_10_12-src;
+    v6_6_70.src = rpi-linux-6_6_y-src;
+    v6_12_9 = {
+      src = rpi-linux-6_12_y-src;
       patches = [
         {
           name = "remove-readme-target.patch";
@@ -87,7 +88,7 @@ in
     defconfig = "rpi_arm64_defconfig";
     extraMeta.platforms = [ "aarch64-linux" ];
     filesToInstall = [ "u-boot.bin" ];
-    version = "2024.04";
+    version = builtins.head (builtins.match ".*-(.*?).tar.*" lock.nodes.u-boot-src.original.url);
     patches = [ ];
     makeFlags = [ ];
     src = u-boot-src;
@@ -118,7 +119,7 @@ in
   # rpi kernels and firmware are available at
   # `pkgs.rpi-kernels.<VERSION>.<BOARD>'. 
   #
-  # For example: `pkgs.rpi-kernels.v6_6_67.bcm2712'
+  # Check all available versions/boards with: nix flake show --all-systems
   rpi-kernels = rpi-kernels (
     final.lib.cartesianProduct
       { board = boards; version = (builtins.attrNames versions); }

overlays/default.nix

@@ -1,6 +1,7 @@
 { rpicam-apps-src
 , libcamera-src
 , libpisp-src
+, lock
 , ...
 }:
 final: prev: {
@@ -10,18 +11,23 @@ final: prev: {
 
   libpisp = final.stdenv.mkDerivation {
     name = "libpisp";
-    version = "1.0.7";
+    version = lock.nodes.libpisp-src.original.ref;
     src = libpisp-src;
     nativeBuildInputs = with final; [ pkg-config meson ninja ];
     buildInputs = with final; [ nlohmann_json boost ];
     # Meson is no longer able to pick up Boost automatically.
     # https://github.com/NixOS/nixpkgs/issues/86131
     BOOST_INCLUDEDIR = "${prev.lib.getDev final.boost}/include";
     BOOST_LIBRARYDIR = "${prev.lib.getLib final.boost}/lib";
+    # Copy image filters into lib
+    postInstall = ''
+      mkdir -p $out/lib/libpisp/backend
+      cp src/libpisp/backend/*.json $out/lib/libpisp/backend
+    '';
   };
 
   libcamera = prev.libcamera.overrideAttrs (old: {
-    version = "0.3.1";
+    version = lock.nodes.libcamera-src.original.ref;
     src = libcamera-src;
     buildInputs = old.buildInputs ++ (with final; [
       libpisp
@@ -50,8 +56,12 @@ final: prev: {
       "-Dlc-compliance=disabled"
       "-Dcam=disabled"
       "-Dqcam=disabled"
-      "-Ddocumentation=enabled"
+      "-Ddocumentation=disabled"
       "-Dpycamera=enabled"
     ];
+
+    # Issue introduced recently
+    # https://github.com/raspberrypi/libcamera/issues/226
+    CXXFLAGS = "-Wno-sign-compare -Wno-stringop-truncation";
   });
 }

overlays/libcamera.nix

@@ -6,7 +6,7 @@ stdenv.mkDerivation {
 
   src = rpicam-apps-src;
 
-  nativeBuildInputs = with pkgs; [ meson pkg-config ];
+  nativeBuildInputs = with pkgs; [ meson pkg-config makeWrapper ];
   buildInputs = with pkgs; [ libjpeg libtiff libcamera libepoxy boost libexif libpng ffmpeg libdrm ninja ];
   mesonFlags = [
     "-Denable_qt=disabled"
@@ -21,6 +21,17 @@ stdenv.mkDerivation {
   BOOST_INCLUDEDIR = "${lib.getDev pkgs.boost}/include";
   BOOST_LIBRARYDIR = "${lib.getLib pkgs.boost}/lib";
 
+  postFixup = let
+    wrap = "wrapProgram $out/bin/rpicam";
+    ipa-var = "--set LIBCAMERA_IPA_PROXY_PATH ${pkgs.libcamera}/libexec/libcamera";
+  in ''
+    ${wrap}-hello ${ipa-var}
+    ${wrap}-raw ${ipa-var}
+    ${wrap}-vid ${ipa-var}
+    ${wrap}-jpeg ${ipa-var}
+    ${wrap}-still ${ipa-var}
+  '';
+
   meta = with lib; {
     description = "Userland tools interfacing with Raspberry Pi cameras";
     homepage = "https://github.com/raspberrypi/libcamera-apps";

overlays/rpicam-apps.nix

@@ -1,4 +1,4 @@
-{ pinned, core-overlay, libcamera-overlay }:
+{ pinned, core-overlay, libcamera-overlay, ... }:
 { lib, pkgs, config, ... }:
 
 let