Skip to content

Commit 4325881

Browse files
committed
update flake inputs
1 parent 561355c commit 4325881

File tree

3 files changed

+38
-50
lines changed

3 files changed

+38
-50
lines changed

flake.lock

Lines changed: 18 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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
flake = false;
77
url = "https://ftp.denx.de/pub/u-boot/u-boot-2023.01.tar.bz2";
88
};
9-
rpi-linux-5_15-src = {
9+
rpi-linux-6_1-src = {
1010
flake = false;
11-
url = "github:raspberrypi/linux/rpi-5.15.y";
11+
url = "github:raspberrypi/linux/rpi-6.1.y";
1212
};
13-
rpi-firmware-stable-src = {
13+
rpi-firmware-src = {
1414
flake = false;
15-
url = "github:raspberrypi/firmware/stable";
15+
url = "github:raspberrypi/firmware";
1616
};
1717
rpi-firmware-nonfree-src = {
1818
flake = false;
@@ -24,7 +24,7 @@
2424
};
2525
libcamera-apps-src = {
2626
flake = false;
27-
url = "github:raspberrypi/libcamera-apps/v1.1.1";
27+
url = "github:raspberrypi/libcamera-apps/v1.1.2";
2828
};
2929
};
3030

overlay/default.nix

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1-
{ u-boot-src, rpi-linux-5_15-src, rpi-firmware-stable-src
2-
, rpi-firmware-nonfree-src, rpi-bluez-firmware-src, libcamera-apps-src }:
1+
{ u-boot-src
2+
, rpi-linux-6_1-src
3+
, rpi-firmware-src
4+
, rpi-firmware-nonfree-src
5+
, rpi-bluez-firmware-src
6+
, libcamera-apps-src
7+
}:
38
final: prev:
49
let
510
# The version to stick at `pkgs.rpi-kernels.latest'
6-
latest = "v5_15_92";
11+
latest = "v6_1_32";
712

813
# Helpers for building the `pkgs.rpi-kernels' map.
914
rpi-kernel = { kernel, version, fw, wireless-fw, argsOverride ? null }:
@@ -18,15 +23,17 @@ let
1823
new-fw = prev.raspberrypifw.overrideAttrs (oldfw: { src = fw; });
1924
new-wireless-fw = final.callPackage wireless-fw { };
2025
version-slug = builtins.replaceStrings [ "." ] [ "_" ] version;
21-
in {
26+
in
27+
{
2228
"v${version-slug}" = {
2329
kernel = new-kernel;
2430
firmware = new-fw;
2531
wireless-firmware = new-wireless-fw;
2632
};
2733
};
2834
rpi-kernels = builtins.foldl' (b: a: b // rpi-kernel a) { };
29-
in {
35+
in
36+
{
3037

3138
# disable firmware compression so that brcm firmware can be found at
3239
# the path expected by raspberry pi firmware/device tree
@@ -69,9 +76,9 @@ in {
6976
#
7077
# For example: `pkgs.rpi-kernels.v5_15_87.kernel'
7178
rpi-kernels = rpi-kernels [{
72-
version = "5.15.92";
73-
kernel = rpi-linux-5_15-src;
74-
fw = rpi-firmware-stable-src;
79+
version = "6.1.32";
80+
kernel = rpi-linux-6_1-src;
81+
fw = rpi-firmware-src;
7582
wireless-fw = import ./raspberrypi-wireless-firmware.nix {
7683
bluez-firmware = rpi-bluez-firmware-src;
7784
firmware-nonfree = rpi-firmware-nonfree-src;

0 commit comments

Comments
 (0)