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

Commit e858a13

Browse files
committed
bump rpi sources
1 parent 8fc9cbd commit e858a13

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

flake.nix

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
nixpkgs.url = "github:NixOS/nixpkgs/9a9960b98418f8c385f52de3b09a63f9c561427a";
66
u-boot-src = {
77
flake = false;
8-
url = "https://ftp.denx.de/pub/u-boot/u-boot-2024.01.tar.bz2";
8+
url = "https://ftp.denx.de/pub/u-boot/u-boot-2024.04.tar.bz2";
99
};
10-
rpi-linux-6_1-src = {
10+
rpi-linux-6_6-src = {
1111
flake = false;
12-
url = "github:raspberrypi/linux/stable_20231123";
12+
url = "github:raspberrypi/linux/stable_20240423";
1313
};
1414
rpi-firmware-src = {
1515
flake = false;
16-
url = "github:raspberrypi/firmware/7e6decce72fdff51923e9203db46716835ae889a";
16+
url = "github:raspberrypi/firmware/1.20240424";
1717
};
1818
rpi-firmware-nonfree-src = {
1919
flake = false;
@@ -25,21 +25,21 @@
2525
};
2626
libcamera-apps-src = {
2727
flake = false;
28-
url = "github:raspberrypi/libcamera-apps/v1.4.1";
28+
url = "github:raspberrypi/libcamera-apps/v1.4.4";
2929
};
3030
libcamera-src = {
3131
flake = false;
32-
url = "github:raspberrypi/libcamera/563cd78e1c9858769f7e4cc2628e2515836fd6e7"; # v0.1.0+rpt20231122
32+
url = "github:raspberrypi/libcamera/eb00c13d7c9f937732305d47af5b8ccf895e700f"; # v0.2.0+rpt20240418
3333
};
3434
libpisp-src = {
3535
flake = false;
36-
url = "github:raspberrypi/libpisp/v1.0.3";
36+
url = "github:raspberrypi/libpisp/v1.0.5";
3737
};
3838
};
3939

4040
outputs = srcs@{ self, ... }:
4141
let
42-
pinned = import nixpkgs {
42+
pinned = import srcs.nixpkgs {
4343
system = "aarch64-linux";
4444
overlays = with self.overlays; [ core libcamera ];
4545
};

overlays/default.nix

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{ u-boot-src
2-
, rpi-linux-6_1-src
2+
, rpi-linux-6_6-src
33
, rpi-firmware-src
44
, rpi-firmware-nonfree-src
55
, rpi-bluez-firmware-src
@@ -8,7 +8,7 @@
88
final: prev:
99
let
1010
# The version to stick at `pkgs.rpi-kernels.latest'
11-
latest = "v6_1_63";
11+
latest = "v6_6_28";
1212

1313
# Helpers for building the `pkgs.rpi-kernels' map.
1414
rpi-kernel = { kernel, version, fw, wireless-fw, argsOverride ? null }:
@@ -43,7 +43,7 @@ in
4343
defconfig = "rpi_arm64_defconfig";
4444
extraMeta.platforms = [ "aarch64-linux" ];
4545
filesToInstall = [ "u-boot.bin" ];
46-
version = "2024.01";
46+
version = "2024.04";
4747
patches = [ ];
4848
makeFlags = [ ];
4949
src = u-boot-src;
@@ -69,8 +69,8 @@ in
6969
#
7070
# For example: `pkgs.rpi-kernels.v5_15_87.kernel'
7171
rpi-kernels = rpi-kernels [{
72-
version = "6.1.63";
73-
kernel = rpi-linux-6_1-src;
72+
version = "6.6.28";
73+
kernel = rpi-linux-6_6-src;
7474
fw = rpi-firmware-src;
7575
wireless-fw = import ./raspberrypi-wireless-firmware.nix {
7676
bluez-firmware = rpi-bluez-firmware-src;
@@ -96,6 +96,7 @@ in
9696
# [2] https://github.com/raspberrypi/linux/blob/1.20230405/lib/kunit/Kconfig#L5-L14
9797
# [3] https://github.com/raspberrypi/linux/blob/bb63dc31e48948bc2649357758c7a152210109c4/drivers/gpu/drm/vc4/Kconfig#L38-L52
9898
KUNIT = no;
99+
GPIO_PWM = no;
99100
};
100101
};
101102
}] // {

0 commit comments

Comments
 (0)