auxolotl/buildbot-nix
26
1
Fork 0
Code Issues Pull requests 1 Actions 1 Packages Projects Releases Wiki Activity

fix cachix usage

Browse source
This commit is contained in:
Jörg Thalheim 2024-07-26 19:35:33 +02:00 committed by mergify[bot]
parent eb746d95a4
commit f5fd4bf2a8
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nix/master.nix
View file

@ -8,6 +8,8 @@ let
cfg = config.services.buildbot-nix.master; cfg = config.services.buildbot-nix.master;
inherit (lib) mkRemovedOptionModule mkRenamedOptionModule; inherit (lib) mkRemovedOptionModule mkRenamedOptionModule;
optionsCachix = options.services.buildbot-nix.master.cachix;
interpolateType = interpolateType =
lib.mkOptionType { lib.mkOptionType {
name = "interpolate"; name = "interpolate";
@ -367,7 +369,6 @@ in
{ {
assertion = assertion =
let let
optionsCachix = options.services.buildbot-nix.master.cachix;
allIsNull = lib.all (x: x == null); allIsNull = lib.all (x: x == null);
in in
optionsCachix.enable.value || lib.foldr (a: b: a && b) true [ optionsCachix.enable.value || lib.foldr (a: b: a && b) true [
@ -449,8 +450,8 @@ in
else else
{ {
name = cfg.cachix.name; name = cfg.cachix.name;
signing_key_file = cfg.cachix.signingKeyFile; signing_key_file = if optionsCachix.signingKeyFile.isDefined then cfg.cachix.signingKeyFile else null;
auth_token_file = cfg.cachix.authTokenFile; auth_token_file = if optionsCachix.signingKeyFile.isDefined then cfg.cachix.authTokenFile else null;
}; };
gitea = if !cfg.gitea.enable then gitea = if !cfg.gitea.enable then
null null