run nixpkgs-fmt

This commit is contained in:
Travis Staton 2024-06-24 09:11:22 -04:00
parent b027897628
commit 9113306d60

View file

@ -35,11 +35,13 @@ let
boards = [ "bcmrpi" "bcm2709" "bcmrpi3" "bcm2711" "bcm2712" ]; boards = [ "bcmrpi" "bcm2709" "bcmrpi3" "bcm2711" "bcm2712" ];
# Helpers for building the `pkgs.rpi-kernels' map. # Helpers for building the `pkgs.rpi-kernels' map.
rpi-kernel = { version, board }: let rpi-kernel = { version, board }:
kernel = versions[version]; let
version-slug = builtins.replaceStrings [ "v" "_" ] [ "" "." ] version; kernel = versions [ version ];
in { version-slug = builtins.replaceStrings [ "v" "_" ] [ "" "." ] version;
"${version}"."${board}" = prev.lib.overrideDerivation (prev.buildLinux { in
{
"${version}"."${board}" = prev.lib.overrideDerivation (prev.buildLinux {
modDirVersion = version-slug; modDirVersion = version-slug;
version = version-slug; version = version-slug;
pname = "linux-rpi"; pname = "linux-rpi";
@ -76,9 +78,9 @@ let
sed -i $buildRoot/include/config/auto.conf -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/' sed -i $buildRoot/include/config/auto.conf -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/'
''; '';
postFixup = ""; postFixup = "";
kernelPatches = if kernel.patches != null then kernel.patches else []; kernelPatches = if kernel.patches != null then kernel.patches else [ ];
}); });
}; };
rpi-kernels = builtins.foldl' (b: a: b // rpi-kernel a) { }; rpi-kernels = builtins.foldl' (b: a: b // rpi-kernel a) { };
in in
{ {
@ -109,12 +111,14 @@ in
}; };
# default to latest firmware # default to latest firmware
raspberrypiWirelessFirmware = final.callPackage ( raspberrypiWirelessFirmware = final.callPackage
import ./raspberrypi-wireless-firmware.nix { (
bluez-firmware = rpi-bluez-firmware-src; import ./raspberrypi-wireless-firmware.nix {
firmware-nonfree = rpi-firmware-nonfree-src; bluez-firmware = rpi-bluez-firmware-src;
} firmware-nonfree = rpi-firmware-nonfree-src;
) { }; }
)
{ };
raspberrypifw = prev.raspberrypifw.overrideAttrs (oldfw: { src = rpi-firmware-src; }); raspberrypifw = prev.raspberrypifw.overrideAttrs (oldfw: { src = rpi-firmware-src; });
} // { } // {