Skip to content

Commit 9126fc5

Browse files
authored
Merge pull request nix-community#73 from nix-community/bump-deps
bump deps
2 parents d342e97 + 4501cff commit 9126fc5

File tree

5 files changed

+44
-38
lines changed

5 files changed

+44
-38
lines changed

flake.lock

Lines changed: 21 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
flake = false;
88
url = "https://ftp.denx.de/pub/u-boot/u-boot-2024.07.tar.bz2";
99
};
10-
rpi-linux-6_6_47-src = {
10+
rpi-linux-6_6_54-src = {
1111
flake = false;
1212
url = "github:raspberrypi/linux/rpi-6.6.y";
1313
};
14-
rpi-linux-6_10_8-src = {
14+
rpi-linux-6_10_12-src = {
1515
flake = false;
1616
url = "github:raspberrypi/linux/rpi-6.10.y";
1717
};
1818
rpi-firmware-src = {
1919
flake = false;
20-
url = "github:raspberrypi/firmware/1.20240902";
20+
url = "github:raspberrypi/firmware/1.20241001";
2121
};
2222
rpi-firmware-nonfree-src = {
2323
flake = false;
@@ -29,7 +29,7 @@
2929
};
3030
rpicam-apps-src = {
3131
flake = false;
32-
url = "github:raspberrypi/rpicam-apps/v1.5.1";
32+
url = "github:raspberrypi/rpicam-apps/v1.5.2";
3333
};
3434
libcamera-src = {
3535
flake = false;

overlays/default.nix

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{ u-boot-src
2-
, rpi-linux-6_6_47-src
3-
, rpi-linux-6_10_8-src
2+
, rpi-linux-6_6_54-src
3+
, rpi-linux-6_10_12-src
44
, rpi-firmware-src
55
, rpi-firmware-nonfree-src
66
, rpi-bluez-firmware-src
@@ -9,9 +9,9 @@
99
final: prev:
1010
let
1111
versions = {
12-
v6_6_47.src = rpi-linux-6_6_47-src;
13-
v6_10_8 = {
14-
src = rpi-linux-6_10_8-src;
12+
v6_6_54.src = rpi-linux-6_6_54-src;
13+
v6_10_12 = {
14+
src = rpi-linux-6_10_12-src;
1515
patches = [
1616
{
1717
name = "remove-readme-target.patch";
@@ -116,7 +116,7 @@ in
116116
# rpi kernels and firmware are available at
117117
# `pkgs.rpi-kernels.<VERSION>.<BOARD>'.
118118
#
119-
# For example: `pkgs.rpi-kernels.v6_6_47.bcm2712'
119+
# For example: `pkgs.rpi-kernels.v6_6_54.bcm2712'
120120
rpi-kernels = rpi-kernels (
121121
final.lib.cartesianProduct
122122
{ board = boards; version = (builtins.attrNames versions); }

overlays/libcamera.nix

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ final: prev: {
1010

1111
libpisp = final.stdenv.mkDerivation {
1212
name = "libpisp";
13-
version = "1.0.6";
13+
version = "1.0.7";
1414
src = libpisp-src;
1515
nativeBuildInputs = with final; [ pkg-config meson ninja ];
1616
buildInputs = with final; [ nlohmann_json boost ];
@@ -21,14 +21,20 @@ final: prev: {
2121
};
2222

2323
libcamera = prev.libcamera.overrideAttrs (old: {
24-
version = "0.3.0";
24+
version = "0.3.1";
2525
src = libcamera-src;
2626
buildInputs = old.buildInputs ++ (with final; [
27-
libpisp openssl libtiff
27+
libpisp
28+
openssl
29+
libtiff
2830
(python3.withPackages (ps: with ps; [
29-
python3-gnutls pybind11 pyyaml ply
31+
python3-gnutls
32+
pybind11
33+
pyyaml
34+
ply
3035
]))
31-
libglibutil gst_all_1.gst-plugins-base
36+
libglibutil
37+
gst_all_1.gst-plugins-base
3238
]);
3339
patches = [ ];
3440
postPatch = ''

rpi/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ in
1313
options = with lib; {
1414
raspberry-pi-nix = {
1515
kernel-version = mkOption {
16-
default = "v6_6_47";
16+
default = "v6_6_54";
1717
type = types.str;
1818
description = "Kernel version to build.";
1919
};
@@ -69,7 +69,7 @@ in
6969
'';
7070
};
7171

72-
package = mkPackageOption pkgs "uboot-rpi-arm64" {};
72+
package = mkPackageOption pkgs "uboot-rpi-arm64" { };
7373
};
7474
};
7575
};

0 commit comments

Comments
 (0)