From 72dd60bfc98c128149d84213b17d1b8a68863055 Mon Sep 17 00:00:00 2001 From: Ethan Turkeltaub Date: Wed, 22 Nov 2023 20:40:03 -0500 Subject: [PATCH] Add default system to `systems` option --- modules/nix/linux-builder.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/nix/linux-builder.nix b/modules/nix/linux-builder.nix index d09a1cde..2fdcb4a4 100644 --- a/modules/nix/linux-builder.nix +++ b/modules/nix/linux-builder.nix @@ -59,14 +59,14 @@ in systems = mkOption { type = types.listOf types.str; - default = [ ]; + default = [ "${stdenv.hostPlatform.uname.processor}-linux" ]; example = literalExpression '' [ "x86_64-linux" "aarch64-linux" ] ''; - description = '' + description = lib.mdDoc '' This option specifies system types the build machine can execute derivations on. This sets the corresponding `nix.buildMachines.*.systems` option. @@ -136,9 +136,8 @@ in hostName = "linux-builder"; sshUser = "builder"; sshKey = "/etc/nix/builder_ed25519"; - systems = [ "${stdenv.hostPlatform.uname.processor}-linux" ] ++ cfg.systems; publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUpCV2N4Yi9CbGFxdDFhdU90RStGOFFVV3JVb3RpQzVxQkorVXVFV2RWQ2Igcm9vdEBuaXhvcwo="; - inherit (cfg) maxJobs supportedFeatures; + inherit (cfg) maxJobs supportedFeatures systems; }]; nix.settings.builders-use-substitutes = true;