From 1b351f81f4e0e350b26154509023035f852d0c00 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Wed, 19 Feb 2020 12:22:35 +0100 Subject: [PATCH] nixos/buildkite-agents: fix hooksDir assertion --- .../services/continuous-integration/buildkite-agents.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/buildkite-agents.nix b/nixos/modules/services/continuous-integration/buildkite-agents.nix index fbda2731bbf3..c17d89c387a1 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agents.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agents.nix @@ -258,7 +258,7 @@ in }); config.assertions = mapAgents (name: cfg: [ - { assertion = cfg.hooksPath == hooksDir || all (v: v == null) (attrValues cfg.hooks); + { assertion = cfg.hooksPath == (hooksDir cfg) || all (v: v == null) (attrValues cfg.hooks); message = '' Options `services.buildkite-agents.${name}.hooksPath' and `services.buildkite-agents.${name}.hooks.' are mutually exclusive.