nix-community/raspberry-pi-nix
1
0
Fork 0
mirror of https://github.com/nix-community/raspberry-pi-nix.git synced 2025-11-09 03:56:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

set linux and firmware to latest release tag

Browse source 
disable KUNIT in kernel config
This commit is contained in:
Travis Staton 2023-06-12 09:53:24 -04:00
parent 43258812a1
commit 7c6fa52715
5 changed files with 98 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

15
flake.lock generated
View file

@ -62,15 +62,16 @@
"rpi-firmware-src": { "rpi-firmware-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1686136390, "lastModified": 1680694337,
"narHash": "sha256-Uq1yIp8zgexz2hwgAxEtmo9paytel4VPof5VMys01UM=", "narHash": "sha256-UtUd1MbsrDFxd/1C3eOAMDKPZMx+kSMFYOJP+Kc6IU8=",
"owner": "raspberrypi", "owner": "raspberrypi",
"repo": "firmware", "repo": "firmware",
"rev": "13fbbc4f5ea698353486915986de8b48f18018f6", "rev": "055e044d5359ded1aacc5a17a8e35365373d0b8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "raspberrypi", "owner": "raspberrypi",
"ref": "stable",
"repo": "firmware", "repo": "firmware",
"type": "github" "type": "github"
} }
@ -78,16 +79,16 @@
"rpi-linux-6_1-src": { "rpi-linux-6_1-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1686133523, "lastModified": 1680464256,
"narHash": "sha256-r5L3hqk0wlefqkgO8jH4mupeUkbx9cSjHskLOxQQdZw=", "narHash": "sha256-ILwecHZ1BN6GhZAUB6/UwiN/rZ8gHndKON6DUhidtxI=",
"owner": "raspberrypi", "owner": "raspberrypi",
"repo": "linux", "repo": "linux",
"rev": "bb63dc31e48948bc2649357758c7a152210109c4", "rev": "0afb5e98488aed7017b9bf321b575d0177feb7ed",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "raspberrypi", "owner": "raspberrypi",
"ref": "rpi-6.1.y", "ref": "1.20230405",
"repo": "linux", "repo": "linux",
"type": "github" "type": "github"
} }

4
flake.nix
View file

@ -8,11 +8,11 @@
}; };
rpi-linux-6_1-src = { rpi-linux-6_1-src = {
flake = false; flake = false;
url = "github:raspberrypi/linux/rpi-6.1.y"; url = "github:raspberrypi/linux/1.20230405";
}; };
rpi-firmware-src = { rpi-firmware-src = {
flake = false; flake = false;
url = "github:raspberrypi/firmware"; url = "github:raspberrypi/firmware/1.20230405";
}; };
rpi-firmware-nonfree-src = { rpi-firmware-nonfree-src = {
flake = false; flake = false;

13
overlay/default.nix
View file

@ -8,7 +8,7 @@
final: prev: final: prev:
let let
# The version to stick at `pkgs.rpi-kernels.latest' # The version to stick at `pkgs.rpi-kernels.latest'
latest = "v6_1_32"; latest = "v6_1_21";
# Helpers for building the `pkgs.rpi-kernels' map. # Helpers for building the `pkgs.rpi-kernels' map.
rpi-kernel = { kernel, version, fw, wireless-fw, argsOverride ? null }: rpi-kernel = { kernel, version, fw, wireless-fw, argsOverride ? null }:
@ -35,10 +35,6 @@ let
in in
{ {
# disable firmware compression so that brcm firmware can be found at
# the path expected by raspberry pi firmware/device tree
compressFirmwareXz = x: x;
# A recent known working version of libcamera-apps # A recent known working version of libcamera-apps
libcamera-apps = libcamera-apps =
final.callPackage ./libcamera-apps.nix { inherit libcamera-apps-src; }; final.callPackage ./libcamera-apps.nix { inherit libcamera-apps-src; };
@ -76,13 +72,18 @@ in
# #
# For example: `pkgs.rpi-kernels.v5_15_87.kernel' # For example: `pkgs.rpi-kernels.v5_15_87.kernel'
rpi-kernels = rpi-kernels [{ rpi-kernels = rpi-kernels [{
version = "6.1.32"; version = "6.1.21";
kernel = rpi-linux-6_1-src; kernel = rpi-linux-6_1-src;
fw = rpi-firmware-src; fw = rpi-firmware-src;
wireless-fw = import ./raspberrypi-wireless-firmware.nix { wireless-fw = import ./raspberrypi-wireless-firmware.nix {
bluez-firmware = rpi-bluez-firmware-src; bluez-firmware = rpi-bluez-firmware-src;
firmware-nonfree = rpi-firmware-nonfree-src; firmware-nonfree = rpi-firmware-nonfree-src;
}; };
argsOverride = {
structuredExtraConfig = with prev.lib.kernel; {
KUNIT = no;
};
};
}] // { }] // {
latest = final.rpi-kernels."${latest}"; latest = final.rpi-kernels."${latest}";
}; };

2
overlay/libcamera-apps.nix
View file

@ -3,7 +3,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libcamera-apps"; pname = "libcamera-apps";
version = "v1.1.0"; version = "v1.1.2";
src = libcamera-apps-src; src = libcamera-apps-src;

3
rpi/default.nix
View file

@ -8,7 +8,8 @@
"raspberry-pi-firmware-migrate" = { "raspberry-pi-firmware-migrate" = {
description = "update the firmware partition"; description = "update the firmware partition";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
serviceConfig = let firmware-path = "/boot/firmware"; serviceConfig =
let firmware-path = "/boot/firmware";
in { in {
Type = "oneshot"; Type = "oneshot";
MountImages = MountImages =