Compare commits

...

2 Commits

Author SHA1 Message Date
Daniel Barlow 2cd7f932eb alignment may be null 2024-02-27 19:47:46 +00:00
Daniel Barlow 3ca0d87c27 ci.nix: alphabetise systems 2024-02-21 19:49:14 +00:00
2 changed files with 7 additions and 3 deletions

8
ci.nix
View File

@ -9,8 +9,12 @@ let
borderVmConf = ./bordervm.conf-example.nix; borderVmConf = ./bordervm.conf-example.nix;
inherit (pkgs.lib.attrsets) genAttrs; inherit (pkgs.lib.attrsets) genAttrs;
devices = [ devices = [
"gl-ar750" "gl-mt300n-v2" "gl-mt300a" "gl-ar750"
"qemu" "qemu-aarch64" "qemu-armv7l" "gl-mt300a"
"gl-mt300n-v2"
"qemu"
"qemu-aarch64"
"qemu-armv7l"
"tp-archer-ax23" "tp-archer-ax23"
"zyxel-nwa50ax" "zyxel-nwa50ax"
]; ];

View File

@ -67,7 +67,7 @@ in {
}; };
loadAddress = mkOption { type = types.ints.unsigned; default = null; }; loadAddress = mkOption { type = types.ints.unsigned; default = null; };
entryPoint = mkOption { type = types.ints.unsigned; }; entryPoint = mkOption { type = types.ints.unsigned; };
alignment = mkOption { type = types.ints.unsigned; default = null; description = "Alignment passed to `mkimage` for FIT"; }; alignment = mkOption { type = types.nullOr types.ints.unsigned; default = null; description = "Alignment passed to `mkimage` for FIT"; };
radios = mkOption { radios = mkOption {
description = '' description = ''
Kernel modules (from mac80211 package) required for the Kernel modules (from mac80211 package) required for the