diff options
author | pennae <github@quasiparticle.net> | 2021-12-05 21:28:49 +0100 |
---|---|---|
committer | pennae <github@quasiparticle.net> | 2021-12-09 01:13:48 +0100 |
commit | fb0e5be84331188a69b3edd31679ca6576edb75a (patch) | |
tree | 80d713f568ae02e4a3aed70114bafe46e9fe753f /nixos/modules/services/continuous-integration/buildbot | |
parent | f6d0b014fe1db9e6edec5485f41a1162136c8a70 (diff) | |
download | nixlib-fb0e5be84331188a69b3edd31679ca6576edb75a.tar nixlib-fb0e5be84331188a69b3edd31679ca6576edb75a.tar.gz nixlib-fb0e5be84331188a69b3edd31679ca6576edb75a.tar.bz2 nixlib-fb0e5be84331188a69b3edd31679ca6576edb75a.tar.lz nixlib-fb0e5be84331188a69b3edd31679ca6576edb75a.tar.xz nixlib-fb0e5be84331188a69b3edd31679ca6576edb75a.tar.zst nixlib-fb0e5be84331188a69b3edd31679ca6576edb75a.zip |
treewide: add defaultText for options with simple interpolation defaults
adds defaultText for all options that use `cfg.*` values in their defaults, but only for interpolations with no extra processing (other than toString where necessary)
Diffstat (limited to 'nixos/modules/services/continuous-integration/buildbot')
-rw-r--r-- | nixos/modules/services/continuous-integration/buildbot/master.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/continuous-integration/buildbot/worker.nix | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index 2dc61c21ac71..aaa159d3cb18 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -1,11 +1,12 @@ # NixOS module for Buildbot continous integration server. -{ config, lib, pkgs, ... }: +{ config, lib, options, pkgs, ... }: with lib; let cfg = config.services.buildbot-master; + opt = options.services.buildbot-master; python = cfg.package.pythonModule; @@ -152,6 +153,7 @@ in { buildbotDir = mkOption { default = "${cfg.home}/master"; + defaultText = literalExpression ''"''${config.${opt.home}}/master"''; type = types.path; description = "Specifies the Buildbot directory."; }; diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix index dd4f4a4a74a9..1d7f53bb6559 100644 --- a/nixos/modules/services/continuous-integration/buildbot/worker.nix +++ b/nixos/modules/services/continuous-integration/buildbot/worker.nix @@ -1,11 +1,12 @@ # NixOS module for Buildbot Worker. -{ config, lib, pkgs, ... }: +{ config, lib, options, pkgs, ... }: with lib; let cfg = config.services.buildbot-worker; + opt = options.services.buildbot-worker; python = cfg.package.pythonModule; @@ -77,6 +78,7 @@ in { buildbotDir = mkOption { default = "${cfg.home}/worker"; + defaultText = literalExpression ''"''${config.${opt.home}}/worker"''; type = types.path; description = "Specifies the Buildbot directory."; }; |