From 953aca9361ca8b29ccc5bc897fd569f3f28069dd Mon Sep 17 00:00:00 2001 From: Travis Staton Date: Fri, 26 Jul 2024 20:51:21 -0400 Subject: [PATCH] add flake checks flatten kernel attrset in order to adhere to flake spec --- flake.nix | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index d127311..033984a 100644 --- a/flake.nix +++ b/flake.nix @@ -58,11 +58,23 @@ core-overlay = self.overlays.core; libcamera-overlay = self.overlays.libcamera; }; - packages.aarch64-linux = { - kernels = pinned.rpi-kernels; - firmware = pinned.raspberrypifw; - wireless-firmware = pinned.raspberrypiWirelessFirmware; - uboot-rpi-arm64 = pinned.uboot-rpi-arm64; - }; + checks.aarch64-linux = self.packages.aarch64-linux; + packages.aarch64-linux = with pinned.lib; + let + kernels = + foldlAttrs f { } pinned.rpi-kernels; + f = acc: kernel-version: board-attr-set: + foldlAttrs + (acc: board-version: drv: acc // { + "linux-${kernel-version}-${board-version}" = drv; + }) + acc + board-attr-set; + in + { + firmware = pinned.raspberrypifw; + wireless-firmware = pinned.raspberrypiWirelessFirmware; + uboot-rpi-arm64 = pinned.uboot-rpi-arm64; + } // kernels; }; }