mirror of
https://github.com/nix-community/raspberry-pi-nix.git
synced 2025-11-08 19:46:03 +01:00
chore: remove error silencing
This commit is contained in:
parent
4001188615
commit
caed11b1f6
2 changed files with 4 additions and 10 deletions
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue