From e621b5aea75810e7228a9ebc93f82b8b41008e7e Mon Sep 17 00:00:00 2001 From: Alexis Destrez Date: Wed, 18 Oct 2023 17:47:27 +0200 Subject: [PATCH] Provide 'supportedFeatures' option to the linux builder module --- modules/nix/linux-builder.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/nix/linux-builder.nix b/modules/nix/linux-builder.nix index 0d473d3..0111aae 100644 --- a/modules/nix/linux-builder.nix +++ b/modules/nix/linux-builder.nix @@ -53,6 +53,16 @@ in This sets the corresponding `nix.buildMachines.*.maxJobs` option. ''; }; + + supportedFeatures = mkOption { + type = types.listOf types.str; + default = [ "kvm" "benchmark" "big-parallel" ]; + description = lib.mdDoc '' + This option specifies the list of features supported by the Linux builder. + + This sets the corresponding `nix.buildMachines.*.supportedFeatures` option. + ''; + }; }; config = mkIf cfg.enable { @@ -97,9 +107,8 @@ in sshUser = "builder"; sshKey = "/etc/nix/builder_ed25519"; system = "${stdenv.hostPlatform.uname.processor}-linux"; - supportedFeatures = [ "kvm" "benchmark" "big-parallel" ]; publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUpCV2N4Yi9CbGFxdDFhdU90RStGOFFVV3JVb3RpQzVxQkorVXVFV2RWQ2Igcm9vdEBuaXhvcwo="; - inherit (cfg) maxJobs; + inherit (cfg) maxJobs supportedFeatures; }]; nix.settings.builders-use-substitutes = true;