diff --git a/flake.lock b/flake.lock index d248256..06af588 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,16 @@ "libcamera-apps-src": { "flake": false, "locked": { - "lastModified": 1674645888, - "narHash": "sha256-UBTDHN0lMj02enB8im4Q+f/MCm/G2mFPP3pLImrZc5A=", + "lastModified": 1677660281, + "narHash": "sha256-A6UriYk8bHRL6wp6ehXOnUnbJH2/mNDkxwGemD/UYpw=", "owner": "raspberrypi", "repo": "libcamera-apps", - "rev": "9f08463997b82c4bf60e12c4ea43577959a8ae15", + "rev": "54a781dffdd101954dcfa6acd0bd80006f67da83", "type": "github" }, "original": { "owner": "raspberrypi", - "ref": "v1.1.1", + "ref": "v1.1.2", "repo": "libcamera-apps", "type": "github" } @@ -22,9 +22,8 @@ "libcamera-apps-src": "libcamera-apps-src", "rpi-bluez-firmware-src": "rpi-bluez-firmware-src", "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src", - "rpi-firmware-stable-src": "rpi-firmware-stable-src", - "rpi-linux-5_15-src": "rpi-linux-5_15-src", - "rpi-linux-5_15_87-src": "rpi-linux-5_15_87-src", + "rpi-firmware-src": "rpi-firmware-src", + "rpi-linux-6_1-src": "rpi-linux-6_1-src", "u-boot-src": "u-boot-src" } }, @@ -47,11 +46,11 @@ "rpi-firmware-nonfree-src": { "flake": false, "locked": { - "lastModified": 1674638139, - "narHash": "sha256-54JKmwypD7PRQdd7k6IcF7wL8ifMavEM0UwZwmA24O4=", + "lastModified": 1683107406, + "narHash": "sha256-9UgB8f2AaxG7S5Px46jOP9wUeO1VXKB0uJiPWh32oDI=", "owner": "RPi-Distro", "repo": "firmware-nonfree", - "rev": "7f29411baead874b859eda53efdc2472345ea454", + "rev": "2b465a10b04555b7f45b3acb85959c594922a3ce", "type": "github" }, "original": { @@ -60,57 +59,39 @@ "type": "github" } }, - "rpi-firmware-stable-src": { + "rpi-firmware-src": { "flake": false, "locked": { - "lastModified": 1673003776, - "narHash": "sha256-tdaH+zZwmILNFBge2gMqtzj/1Hydj9cxhPvhw+7jTrU=", + "lastModified": 1686136390, + "narHash": "sha256-Uq1yIp8zgexz2hwgAxEtmo9paytel4VPof5VMys01UM=", "owner": "raspberrypi", "repo": "firmware", - "rev": "78852e166b4cf3ebb31d051e996d54792f0994b0", + "rev": "13fbbc4f5ea698353486915986de8b48f18018f6", "type": "github" }, "original": { "owner": "raspberrypi", - "ref": "stable", "repo": "firmware", "type": "github" } }, - "rpi-linux-5_15-src": { + "rpi-linux-6_1-src": { "flake": false, "locked": { - "lastModified": 1675874870, - "narHash": "sha256-oy+VgoB4IdFZjGwkx88dDSpwWZj2D5t3PyXPIwDsY1Q=", + "lastModified": 1686133523, + "narHash": "sha256-r5L3hqk0wlefqkgO8jH4mupeUkbx9cSjHskLOxQQdZw=", "owner": "raspberrypi", "repo": "linux", - "rev": "14b35093ca68bf2c81bbc90aace5007142b40b40", + "rev": "bb63dc31e48948bc2649357758c7a152210109c4", "type": "github" }, "original": { "owner": "raspberrypi", - "ref": "rpi-5.15.y", + "ref": "rpi-6.1.y", "repo": "linux", "type": "github" } }, - "rpi-linux-5_15_87-src": { - "flake": false, - "locked": { - "lastModified": 1673628667, - "narHash": "sha256-hNLVfhalmRhhRfvu2mR/qDmmGl//Ic1eqR7N1HFj2CY=", - "owner": "raspberrypi", - "repo": "linux", - "rev": "da4c8e0ffe7a868b989211045657d600be3046a1", - "type": "github" - }, - "original": { - "owner": "raspberrypi", - "repo": "linux", - "rev": "da4c8e0ffe7a868b989211045657d600be3046a1", - "type": "github" - } - }, "u-boot-src": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index c91be2c..5aad7fe 100644 --- a/flake.nix +++ b/flake.nix @@ -6,13 +6,13 @@ flake = false; url = "https://ftp.denx.de/pub/u-boot/u-boot-2023.01.tar.bz2"; }; - rpi-linux-5_15-src = { + rpi-linux-6_1-src = { flake = false; - url = "github:raspberrypi/linux/rpi-5.15.y"; + url = "github:raspberrypi/linux/rpi-6.1.y"; }; - rpi-firmware-stable-src = { + rpi-firmware-src = { flake = false; - url = "github:raspberrypi/firmware/stable"; + url = "github:raspberrypi/firmware"; }; rpi-firmware-nonfree-src = { flake = false; @@ -24,7 +24,7 @@ }; libcamera-apps-src = { flake = false; - url = "github:raspberrypi/libcamera-apps/v1.1.1"; + url = "github:raspberrypi/libcamera-apps/v1.1.2"; }; }; diff --git a/overlay/default.nix b/overlay/default.nix index a72eae3..8a7d1f3 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -1,9 +1,14 @@ -{ u-boot-src, rpi-linux-5_15-src, rpi-firmware-stable-src -, rpi-firmware-nonfree-src, rpi-bluez-firmware-src, libcamera-apps-src }: +{ u-boot-src +, rpi-linux-6_1-src +, rpi-firmware-src +, rpi-firmware-nonfree-src +, rpi-bluez-firmware-src +, libcamera-apps-src +}: final: prev: let # The version to stick at `pkgs.rpi-kernels.latest' - latest = "v5_15_92"; + latest = "v6_1_32"; # Helpers for building the `pkgs.rpi-kernels' map. rpi-kernel = { kernel, version, fw, wireless-fw, argsOverride ? null }: @@ -18,7 +23,8 @@ let new-fw = prev.raspberrypifw.overrideAttrs (oldfw: { src = fw; }); new-wireless-fw = final.callPackage wireless-fw { }; version-slug = builtins.replaceStrings [ "." ] [ "_" ] version; - in { + in + { "v${version-slug}" = { kernel = new-kernel; firmware = new-fw; @@ -26,7 +32,8 @@ let }; }; rpi-kernels = builtins.foldl' (b: a: b // rpi-kernel a) { }; -in { +in +{ # disable firmware compression so that brcm firmware can be found at # the path expected by raspberry pi firmware/device tree @@ -69,9 +76,9 @@ in { # # For example: `pkgs.rpi-kernels.v5_15_87.kernel' rpi-kernels = rpi-kernels [{ - version = "5.15.92"; - kernel = rpi-linux-5_15-src; - fw = rpi-firmware-stable-src; + version = "6.1.32"; + kernel = rpi-linux-6_1-src; + fw = rpi-firmware-src; wireless-fw = import ./raspberrypi-wireless-firmware.nix { bluez-firmware = rpi-bluez-firmware-src; firmware-nonfree = rpi-firmware-nonfree-src;