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

chore: remove error silencing

Browse source
This commit is contained in:
adminy 2024-06-25 00:12:11 +01:00
parent 4001188615
commit caed11b1f6
2 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rpi/default.nix
View file

@ -3,8 +3,8 @@
let let
cfg = config.raspberry-pi-nix; cfg = config.raspberry-pi-nix;
board = cfg.board;
version = cfg.kernel-version; version = cfg.kernel-version;
board = cfg.board;
kernel = pkgs.rpi-kernels."${version}"."${board}"; kernel = pkgs.rpi-kernels."${version}"."${board}";
in in
{ {
@ -15,9 +15,7 @@ in
kernel-version = mkOption { kernel-version = mkOption {
default = "v6_6_31"; default = "v6_6_31";
type = types.str; type = types.str;
description = '' description = "Kernel version to build.";
Kernel version to build.
'';
}; };
board = mkOption { board = mkOption {
default = "bcm2712"; default = "bcm2712";
@ -322,11 +320,7 @@ in
# This pin is not necessary, it would be fine to replace it with # This pin is not necessary, it would be fine to replace it with
# `kernel`. It is helpful to ensure # `kernel`. It is helpful to ensure
# cache hits for kernel builds though. # cache hits for kernel builds though.
kernelPackages = pkgs.linuxPackagesFor (kernel.override { kernelPackages = pkgs.linuxPackagesFor kernel;
# Some patches cannot be applied because they are already upstream.
ignoreConfigErrors = true;
});
loader = { loader = {
grub.enable = lib.mkDefault false; grub.enable = lib.mkDefault false;
initScript.enable = !cfg.uboot.enable; initScript.enable = !cfg.uboot.enable;

2
sd-image/default.nix
View file

@ -20,8 +20,8 @@
''; '';
}; };
cfg = config.raspberry-pi-nix; cfg = config.raspberry-pi-nix;
board = cfg.board;
version = cfg.kernel-version; version = cfg.kernel-version;
board = cfg.board;
kernel = pkgs.rpi-kernels."${version}"."${board}"; kernel = pkgs.rpi-kernels."${version}"."${board}";
populate-kernel = populate-kernel =
if cfg.uboot.enable if cfg.uboot.enable