From d626c3f873e20e56f59bea88430f83328a355933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 5 May 2023 08:35:58 +0200 Subject: [PATCH 1/2] add missing nxp boards This was an overside in https://github.com/NixOS/nixos-hardware/pull/556 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7f68e2a..ab6c0e5 100644 --- a/README.md +++ b/README.md @@ -130,6 +130,7 @@ See code for all available configurations. | [GPD WIN 2](gpd/win-2) | `` | | [Google Pixelbook](google/pixelbook) | `` | | [HP Elitebook 2560p](hp/elitebook/2560p) | `` | +| [i.MX8QuadMax Multisensory Enablement Kit](nxp/imx8qm-mek/) | `` | | [Intel NUC 8i7BEH](intel/nuc/8i7beh/) | `` | | [Lenovo IdeaPad Gaming 3 15arh05](lenovo/ideapad/15arh05) | `` | | [Lenovo IdeaPad Z510](lenovo/ideapad/z510) | `` | From db08b1f13fe125d3dfeac89745ea3f362442eede Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 5 May 2023 08:45:09 +0200 Subject: [PATCH 2/2] tests: fix conflicts with profiles using grub --- tests/build-profile.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/build-profile.nix b/tests/build-profile.nix index 0d477b2..b28d952 100644 --- a/tests/build-profile.nix +++ b/tests/build-profile.nix @@ -3,6 +3,8 @@ let shim = { config, ... }: { boot.loader.systemd-boot.enable = !config.boot.loader.generic-extlinux-compatible.enable && !config.boot.loader.raspberryPi.enable; + # we forcefully disable grub here just for testing purposes, even though some profiles might still use grub in the end. + boot.loader.grub.enable = false; fileSystems."/" = { device = "/dev/disk/by-uuid/00000000-0000-0000-0000-000000000000";