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

Commit 0ffba0a

Browse files
committed
chore: packages version bump
1 parent 97c8505 commit 0ffba0a

File tree

4 files changed

+52
-76
lines changed

4 files changed

+52
-76
lines changed

flake.lock

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

flake.nix

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
66
u-boot-src = {
77
flake = false;
8-
url = "https://ftp.denx.de/pub/u-boot/u-boot-2024.04.tar.bz2";
8+
url = "https://ftp.denx.de/pub/u-boot/u-boot-2024.07.tar.bz2";
99
};
10-
rpi-linux-6_6_31-src = {
10+
rpi-linux-6_6_47-src = {
1111
flake = false;
12-
url = "github:raspberrypi/linux/stable_20240529";
12+
url = "github:raspberrypi/linux/rpi-6.6.y";
1313
};
14-
rpi-linux-6_10_0-rc5-src = {
14+
rpi-linux-6_10_8-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.20240529";
20+
url = "github:raspberrypi/firmware/1.20240902";
2121
};
2222
rpi-firmware-nonfree-src = {
2323
flake = false;
@@ -29,15 +29,15 @@
2929
};
3030
rpicam-apps-src = {
3131
flake = false;
32-
url = "github:raspberrypi/rpicam-apps/v1.5.0";
32+
url = "github:raspberrypi/rpicam-apps/v1.5.1";
3333
};
3434
libcamera-src = {
3535
flake = false;
36-
url = "github:raspberrypi/libcamera/6ddd79b5bdbedc1f61007aed35391f1559f9e29a"; # v0.3.0+rpt20240617
36+
url = "github:raspberrypi/libcamera/v0.3.1+rpt20240906";
3737
};
3838
libpisp-src = {
3939
flake = false;
40-
url = "github:raspberrypi/libpisp/v1.0.6";
40+
url = "github:raspberrypi/libpisp/v1.0.7";
4141
};
4242
};
4343

overlays/default.nix

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{ u-boot-src
2-
, rpi-linux-6_6_31-src
3-
, rpi-linux-6_10_0-rc5-src
2+
, rpi-linux-6_6_47-src
3+
, rpi-linux-6_10_8-src
44
, rpi-firmware-src
55
, rpi-firmware-nonfree-src
66
, rpi-bluez-firmware-src
@@ -9,29 +9,9 @@
99
final: prev:
1010
let
1111
versions = {
12-
v6_6_31 = {
13-
src = rpi-linux-6_6_31-src;
14-
patches = [
15-
# Fix compilation errors due to incomplete patch backport.
16-
# https://github.com/raspberrypi/linux/pull/6223
17-
{
18-
name = "gpio-pwm_-_pwm_apply_might_sleep.patch";
19-
patch = final.fetchpatch {
20-
url = "https://github.com/peat-psuwit/rpi-linux/commit/879f34b88c60dd59765caa30576cb5bfb8e73c56.patch";
21-
hash = "sha256-HlOkM9EFmlzOebCGoj7lNV5hc0wMjhaBFFZvaRCI0lI=";
22-
};
23-
}
24-
{
25-
name = "ir-rx51_-_pwm_apply_might_sleep.patch";
26-
patch = final.fetchpatch {
27-
url = "https://github.com/peat-psuwit/rpi-linux/commit/23431052d2dce8084b72e399fce82b05d86b847f.patch";
28-
hash = "sha256-UDX/BJCJG0WVndP/6PbPK+AZsfU3vVxDCrpn1kb1kqE=";
29-
};
30-
}
31-
];
32-
};
33-
v6_10_0-rc5 = {
34-
src = rpi-linux-6_10_0-rc5-src;
12+
v6_6_47.src = rpi-linux-6_6_47-src;
13+
v6_10_8 = {
14+
src = rpi-linux-6_10_8-src;
3515
patches = [
3616
{
3717
name = "remove-readme-target.patch";
@@ -59,10 +39,6 @@ let
5939
src = kernel.src;
6040
defconfig = "${board}_defconfig";
6141
structuredExtraConfig = with final.lib.kernel; {
62-
# Workaround https://github.com/raspberrypi/linux/issues/6198
63-
# Needed because NixOS 24.05+ sets DRM_SIMPLEDRM=y which pulls in
64-
# DRM_KMS_HELPER=y.
65-
BACKLIGHT_CLASS_DEVICE = yes;
6642
# The perl script to generate kernel options sets unspecified
6743
# parameters to `m` if possible [1]. This results in the
6844
# unspecified config option KUNIT [2] getting set to `m` which
@@ -140,7 +116,7 @@ in
140116
# rpi kernels and firmware are available at
141117
# `pkgs.rpi-kernels.<VERSION>.<BOARD>'.
142118
#
143-
# For example: `pkgs.rpi-kernels.v6_6_31.bcm2712'
119+
# For example: `pkgs.rpi-kernels.v6_6_47.bcm2712'
144120
rpi-kernels = rpi-kernels (
145121
final.lib.cartesianProduct
146122
{ board = boards; version = (builtins.attrNames versions); }

rpi/default.nix

Lines changed: 1 addition & 1 deletion
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_31";
16+
default = "v6_6_47";
1717
type = types.str;
1818
description = "Kernel version to build.";
1919
};

0 commit comments

Comments
 (0)