nix-community/raspberry-pi-nix
1
0
Fork 0
mirror of https://github.com/nix-community/raspberry-pi-nix.git synced 2025-11-08 19:46:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #73 from nix-community/bump-deps

Browse source 
bump deps
This commit is contained in:
Travis Staton 2024-10-07 19:15:50 -04:00 • committed by GitHub
commit 9126fc5c04
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 44 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

42
flake.lock generated
View file

@ -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"
}

8
flake.nix
View file

@ -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;

12
overlays/default.nix
View file

@ -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.<VERSION>.<BOARD>'.
#
# 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); }

16
overlays/libcamera.nix
View file

@ -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 = ''

2
rpi/default.nix
View file

@ -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.";
};