From caed11b1f6273ddd10460a033cfaf5230d843cdd Mon Sep 17 00:00:00 2001 From: adminy Date: Tue, 25 Jun 2024 00:12:11 +0100 Subject: [PATCH] chore: remove error silencing --- rpi/default.nix | 12 +++--------- sd-image/default.nix | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/rpi/default.nix b/rpi/default.nix index 1dcf2eb..df52430 100644 --- a/rpi/default.nix +++ b/rpi/default.nix @@ -3,8 +3,8 @@ let cfg = config.raspberry-pi-nix; - board = cfg.board; version = cfg.kernel-version; + board = cfg.board; kernel = pkgs.rpi-kernels."${version}"."${board}"; in { @@ -15,9 +15,7 @@ in kernel-version = mkOption { default = "v6_6_31"; type = types.str; - description = '' - Kernel version to build. - ''; + description = "Kernel version to build."; }; board = mkOption { default = "bcm2712"; @@ -322,11 +320,7 @@ in # This pin is not necessary, it would be fine to replace it with # `kernel`. It is helpful to ensure # cache hits for kernel builds though. - kernelPackages = pkgs.linuxPackagesFor (kernel.override { - # Some patches cannot be applied because they are already upstream. - ignoreConfigErrors = true; - }); - + kernelPackages = pkgs.linuxPackagesFor kernel; loader = { grub.enable = lib.mkDefault false; initScript.enable = !cfg.uboot.enable; diff --git a/sd-image/default.nix b/sd-image/default.nix index 98aa3e1..d1dc124 100644 --- a/sd-image/default.nix +++ b/sd-image/default.nix @@ -20,8 +20,8 @@ ''; }; cfg = config.raspberry-pi-nix; - board = cfg.board; version = cfg.kernel-version; + board = cfg.board; kernel = pkgs.rpi-kernels."${version}"."${board}"; populate-kernel = if cfg.uboot.enable