alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #80526 from serokell/yorickvp/fix-bk-agent-hooks

Browse source 
nixos/buildkite-agents: fix hooksDir assertion
This commit is contained in:
Silvan Mosberger 2020-02-21 12:00:05 +01:00 committed by GitHub
parent 74ace1f0eb 1b351f81f4
commit 368d84aafa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/continuous-integration/buildkite-agents.nix
View file

@ -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.