From c49e591ae59b5d01d3f5d8e59310244dd5da7446 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Fri, 19 Jul 2024 15:54:51 +0200 Subject: [PATCH] chore(nix-builders): remove legacy `system` field Signed-off-by: Raito Bezarius --- nix/coordinator.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nix/coordinator.nix b/nix/coordinator.nix index 24b7525..e615a17 100644 --- a/nix/coordinator.nix +++ b/nix/coordinator.nix @@ -5,6 +5,7 @@ , ... }: let + inherit (lib) filterAttrs; cfg = config.services.buildbot-nix.coordinator; in { @@ -223,7 +224,7 @@ in nix_eval_max_memory_size=${builtins.toJSON cfg.evalMaxMemorySize}, nix_eval_worker_count=${if cfg.evalWorkerCount == null then "None" else builtins.toString cfg.evalWorkerCount}, nix_supported_systems=${builtins.toJSON cfg.buildSystems}, - nix_builders=${builtins.toJSON cfg.buildMachines}, + nix_builders=${builtins.toJSON (map (b: filterAttrs (n: _: n != "system") b) cfg.buildMachines)}, # Signing key file must be available on the workers and readable. signing_keyfile=${if cfg.signingKeyFile == null then "None" else builtins.toJSON cfg.signingKeyFile}, binary_cache_config=${if (!cfg.binaryCache.enable) then "None" else builtins.toJSON {