diff options
| author | Yorick van Pelt <yorick@yorickvanpelt.nl> | 2020-02-19 12:22:35 +0100 |
|---|---|---|
| committer | Yorick van Pelt <yorick@yorickvanpelt.nl> | 2020-02-19 12:22:35 +0100 |
| commit | 1b351f81f4e0e350b26154509023035f852d0c00 (patch) | |
| tree | fe91b81e88696fa2f2eebd09526d7d73de25aa53 | |
| parent | d4c0e72071d9f792e1f4c463a2b3e223894ada31 (diff) | |
| download | nixpkgs-1b351f81f4e0e350b26154509023035f852d0c00.tar nixpkgs-1b351f81f4e0e350b26154509023035f852d0c00.tar.gz nixpkgs-1b351f81f4e0e350b26154509023035f852d0c00.tar.bz2 nixpkgs-1b351f81f4e0e350b26154509023035f852d0c00.tar.lz nixpkgs-1b351f81f4e0e350b26154509023035f852d0c00.tar.xz nixpkgs-1b351f81f4e0e350b26154509023035f852d0c00.tar.zst nixpkgs-1b351f81f4e0e350b26154509023035f852d0c00.zip | |
nixos/buildkite-agents: fix hooksDir assertion
| -rw-r--r-- | nixos/modules/services/continuous-integration/buildkite-agents.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/continuous-integration/buildkite-agents.nix b/nixos/modules/services/continuous-integration/buildkite-agents.nix index fbda2731bbf..c17d89c387a 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.<name>' are mutually exclusive. |