Merge pull request #59 from Mic92/fixes

Mic92 · web-flow · commit 707a1cdf7e77 · 2023-12-21T12:35:37.000+01:00
buildbot-nix: fix evalWorkerCount == null
diff --git a/nix/master.nix b/nix/master.nix
@@ -134,7 +134,7 @@ in
               ),
               url=${builtins.toJSON config.services.buildbot-master.buildbotUrl},
               nix_eval_max_memory_size=${builtins.toJSON cfg.evalMaxMemorySize},
-              nix_eval_worker_count=${builtins.toJSON cfg.evalWorkerCount},
+              nix_eval_worker_count=${if cfg.evalWorkerCount == null then "None" else builtins.toJSON cfg.evalWorkerCount},
               nix_supported_systems=${builtins.toJSON cfg.buildSystems},
               outputs_path=${if cfg.outputsPath == null then "None" else builtins.toJSON cfg.outputsPath},
           )

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ in`
`134`	`134`	`),`
`135`	`135`	`url=${builtins.toJSON config.services.buildbot-master.buildbotUrl},`
`136`	`136`	`nix_eval_max_memory_size=${builtins.toJSON cfg.evalMaxMemorySize},`
`137`		`- nix_eval_worker_count=${builtins.toJSON cfg.evalWorkerCount},`
	`137`	`+ nix_eval_worker_count=${if cfg.evalWorkerCount == null then "None" else builtins.toJSON cfg.evalWorkerCount},`
`138`	`138`	`nix_supported_systems=${builtins.toJSON cfg.buildSystems},`
`139`	`139`	`outputs_path=${if cfg.outputsPath == null then "None" else builtins.toJSON cfg.outputsPath},`
`140`	`140`	`)`