From 4501cff5298c20c75cb3a4f0815bd9b265d372ce Mon Sep 17 00:00:00 2001 From: Travis Staton Date: Mon, 7 Oct 2024 17:11:55 -0400 Subject: [PATCH] bump deps --- flake.lock | 42 +++++++++++++++++++++--------------------- flake.nix | 8 ++++---- overlays/default.nix | 12 ++++++------ overlays/libcamera.nix | 16 +++++++++++----- rpi/default.nix | 4 ++-- 5 files changed, 44 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index ecfd034..abb934b 100644 --- a/flake.lock +++ b/flake.lock @@ -36,11 +36,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725826545, - "narHash": "sha256-L64N1rpLlXdc94H+F6scnrbuEu+utC03cDDVvvJGOME=", + "lastModified": 1728193676, + "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f4c846aee8e1e29062aa8514d5e0ab270f4ec2f9", + "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6", "type": "github" }, "original": { @@ -58,8 +58,8 @@ "rpi-bluez-firmware-src": "rpi-bluez-firmware-src", "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src", "rpi-firmware-src": "rpi-firmware-src", - "rpi-linux-6_10_8-src": "rpi-linux-6_10_8-src", - "rpi-linux-6_6_47-src": "rpi-linux-6_6_47-src", + "rpi-linux-6_10_12-src": "rpi-linux-6_10_12-src", + "rpi-linux-6_6_54-src": "rpi-linux-6_6_54-src", "rpicam-apps-src": "rpicam-apps-src", "u-boot-src": "u-boot-src" } @@ -101,28 +101,28 @@ "rpi-firmware-src": { "flake": false, "locked": { - "lastModified": 1725277507, - "narHash": "sha256-DN+NlesZ8YfuVwLKQSHckvpNZxqsbKRflOcS3ShO3Ss=", + "lastModified": 1727798811, + "narHash": "sha256-eavbshXGYmkYR33y9FLcQMJoAYdYTESVEy0g/RRXnb0=", "owner": "raspberrypi", "repo": "firmware", - "rev": "b5eb52b343e9bc1391a8059a38e12e470c109f5c", + "rev": "287e6a6c2d3b50eee3e2c5b2eacdd907e5cbe09a", "type": "github" }, "original": { "owner": "raspberrypi", - "ref": "1.20240902", + "ref": "1.20241001", "repo": "firmware", "type": "github" } }, - "rpi-linux-6_10_8-src": { + "rpi-linux-6_10_12-src": { "flake": false, "locked": { - "lastModified": 1725639824, - "narHash": "sha256-ogItkH2cBiNGmenJUPAhAH591qufrWh1zeqAJCNAExw=", + "lastModified": 1728305462, + "narHash": "sha256-LtvNmGD1D5YYv+C9xxxddAeHw69o3OX/H9M7F663L74=", "owner": "raspberrypi", "repo": "linux", - "rev": "0c0217e02da43439fb08b2f6b09530723331ed15", + "rev": "26ee50d56618c2d98100b1bc672fd201aed4d00f", "type": "github" }, "original": { @@ -132,14 +132,14 @@ "type": "github" } }, - "rpi-linux-6_6_47-src": { + "rpi-linux-6_6_54-src": { "flake": false, "locked": { - "lastModified": 1725956269, - "narHash": "sha256-zn1Totn8NU8MCJmWRGsdarNeSo8rzscrBnhdRVMBuT0=", + "lastModified": 1728155174, + "narHash": "sha256-/8RjW35XQMnshjAE4Ey8j3oWzE2GOntnBYY6PlvZGhs=", "owner": "raspberrypi", "repo": "linux", - "rev": "cc50cdbcf3e8f065bd7798a92689f54578b4169f", + "rev": "12f0f28db3afe451a81a34c5a444f6841c10067c", "type": "github" }, "original": { @@ -152,16 +152,16 @@ "rpicam-apps-src": { "flake": false, "locked": { - "lastModified": 1725543038, - "narHash": "sha256-rl5GVigiZWXkpfIteRWUMjtCaPweXRWrBrZOjQ1hiU8=", + "lastModified": 1727515047, + "narHash": "sha256-qCYGrcibOeGztxf+sd44lD6VAOGoUNwRqZDdAmcTa/U=", "owner": "raspberrypi", "repo": "rpicam-apps", - "rev": "d7a1a13b041ef2842cd56d7e395b8c9a0ffc3bf5", + "rev": "a8ccf9f3cd9df49875dfb834a2b490d41d226031", "type": "github" }, "original": { "owner": "raspberrypi", - "ref": "v1.5.1", + "ref": "v1.5.2", "repo": "rpicam-apps", "type": "github" } diff --git a/flake.nix b/flake.nix index 7359791..ed8be8e 100644 --- a/flake.nix +++ b/flake.nix @@ -7,17 +7,17 @@ flake = false; url = "https://ftp.denx.de/pub/u-boot/u-boot-2024.07.tar.bz2"; }; - rpi-linux-6_6_47-src = { + rpi-linux-6_6_54-src = { flake = false; url = "github:raspberrypi/linux/rpi-6.6.y"; }; - rpi-linux-6_10_8-src = { + rpi-linux-6_10_12-src = { flake = false; url = "github:raspberrypi/linux/rpi-6.10.y"; }; rpi-firmware-src = { flake = false; - url = "github:raspberrypi/firmware/1.20240902"; + url = "github:raspberrypi/firmware/1.20241001"; }; rpi-firmware-nonfree-src = { flake = false; @@ -29,7 +29,7 @@ }; rpicam-apps-src = { flake = false; - url = "github:raspberrypi/rpicam-apps/v1.5.1"; + url = "github:raspberrypi/rpicam-apps/v1.5.2"; }; libcamera-src = { flake = false; diff --git a/overlays/default.nix b/overlays/default.nix index fa7c343..162330c 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,6 +1,6 @@ { u-boot-src -, rpi-linux-6_6_47-src -, rpi-linux-6_10_8-src +, rpi-linux-6_6_54-src +, rpi-linux-6_10_12-src , rpi-firmware-src , rpi-firmware-nonfree-src , rpi-bluez-firmware-src @@ -9,9 +9,9 @@ final: prev: let versions = { - v6_6_47.src = rpi-linux-6_6_47-src; - v6_10_8 = { - src = rpi-linux-6_10_8-src; + v6_6_54.src = rpi-linux-6_6_54-src; + v6_10_12 = { + src = rpi-linux-6_10_12-src; patches = [ { name = "remove-readme-target.patch"; @@ -116,7 +116,7 @@ in # rpi kernels and firmware are available at # `pkgs.rpi-kernels..'. # - # For example: `pkgs.rpi-kernels.v6_6_47.bcm2712' + # For example: `pkgs.rpi-kernels.v6_6_54.bcm2712' rpi-kernels = rpi-kernels ( final.lib.cartesianProduct { board = boards; version = (builtins.attrNames versions); } diff --git a/overlays/libcamera.nix b/overlays/libcamera.nix index 57363d0..878fb28 100644 --- a/overlays/libcamera.nix +++ b/overlays/libcamera.nix @@ -10,7 +10,7 @@ final: prev: { libpisp = final.stdenv.mkDerivation { name = "libpisp"; - version = "1.0.6"; + version = "1.0.7"; src = libpisp-src; nativeBuildInputs = with final; [ pkg-config meson ninja ]; buildInputs = with final; [ nlohmann_json boost ]; @@ -21,14 +21,20 @@ final: prev: { }; libcamera = prev.libcamera.overrideAttrs (old: { - version = "0.3.0"; + version = "0.3.1"; src = libcamera-src; buildInputs = old.buildInputs ++ (with final; [ - libpisp openssl libtiff + libpisp + openssl + libtiff (python3.withPackages (ps: with ps; [ - python3-gnutls pybind11 pyyaml ply + python3-gnutls + pybind11 + pyyaml + ply ])) - libglibutil gst_all_1.gst-plugins-base + libglibutil + gst_all_1.gst-plugins-base ]); patches = [ ]; postPatch = '' diff --git a/rpi/default.nix b/rpi/default.nix index a96d937..02b582a 100644 --- a/rpi/default.nix +++ b/rpi/default.nix @@ -13,7 +13,7 @@ in options = with lib; { raspberry-pi-nix = { kernel-version = mkOption { - default = "v6_6_47"; + default = "v6_6_54"; type = types.str; description = "Kernel version to build."; }; @@ -69,7 +69,7 @@ in ''; }; - package = mkPackageOption pkgs "uboot-rpi-arm64" {}; + package = mkPackageOption pkgs "uboot-rpi-arm64" { }; }; }; };