From def1e23be848848400d1d097d4f044e3c401f9dd Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 14 Apr 2024 23:02:32 +0200 Subject: treewide: remove lib.mdDoc --- modules/launchd/default.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'modules/launchd/default.nix') diff --git a/modules/launchd/default.nix b/modules/launchd/default.nix index 5b24a9f..ccb6cc6 100644 --- a/modules/launchd/default.nix +++ b/modules/launchd/default.nix @@ -30,14 +30,14 @@ let type = types.attrsOf (types.either types.str (types.listOf types.str)); default = {}; example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; }; - description = lib.mdDoc "Environment variables passed to the service's processes."; + description = "Environment variables passed to the service's processes."; apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v); }; path = mkOption { type = types.listOf (types.either types.path types.str); default = []; - description = lib.mdDoc '' + description = '' Packages added to the service's {env}`PATH` environment variable. Only the {file}`bin` and subdirectories of each package is added. @@ -48,13 +48,13 @@ let command = mkOption { type = types.either types.str types.path; default = ""; - description = lib.mdDoc "Command executed as the service's main process."; + description = "Command executed as the service's main process."; }; script = mkOption { type = types.lines; default = ""; - description = lib.mdDoc "Shell commands executed as the service's main process."; + description = "Shell commands executed as the service's main process."; }; # preStart = mkOption { @@ -73,7 +73,7 @@ let KeepAlive = true; }; default = {}; - description = lib.mdDoc '' + description = '' Each attribute in this set specifies an option for a key in the plist. ''; @@ -99,7 +99,7 @@ in launchd.labelPrefix = mkOption { type = types.str; default = "org.nixos"; - description = lib.mdDoc '' + description = '' The default prefix of the service label. Individual services can override this by setting the Label attribute. ''; @@ -109,7 +109,7 @@ in type = types.attrsOf (types.either types.str (types.listOf types.str)); default = {}; example = { LANG = "nl_NL.UTF-8"; }; - description = lib.mdDoc '' + description = '' A set of environment variables to be set on all future processes launched by launchd in the caller's context. The value of each variable can be either a string or a list of @@ -123,7 +123,7 @@ in type = types.attrsOf (types.either types.str (types.listOf types.str)); default = {}; example = { LANG = "nl_NL.UTF-8"; }; - description = lib.mdDoc '' + description = '' A set of environment variables to be set on all future processes launched by launchd in the caller's context. The value of each variable can be either a string or a list of @@ -136,7 +136,7 @@ in launchd.agents = mkOption { default = {}; type = types.attrsOf (types.submodule serviceOptions); - description = lib.mdDoc '' + description = '' Definition of per-user launchd agents. When a user logs in, a per-user launchd is started. @@ -152,7 +152,7 @@ in launchd.daemons = mkOption { default = {}; type = types.attrsOf (types.submodule serviceOptions); - description = lib.mdDoc '' + description = '' Definition of launchd daemons. After the system is booted and the kernel is running, launchd is run to finish the system initialization. @@ -168,7 +168,7 @@ in launchd.user.agents = mkOption { default = {}; type = types.attrsOf (types.submodule serviceOptions); - description = lib.mdDoc '' + description = '' Definition of per-user launchd agents. When a user logs in, a per-user launchd is started. -- cgit v1.2.3 From 034c45dd0cac806b527e64c143020676e1070769 Mon Sep 17 00:00:00 2001 From: will Date: Sat, 31 Aug 2024 18:27:10 +1000 Subject: feat: use wait4path with script launchd option addresses https://github.com/LnL7/nix-darwin/issues/1043 fix: use exec in launchd daemon config fix: dont use a script thats in the nix store fix: remove manual wait4path in linux-builder fix: remove manual wait4path in karabiner elements fix: remove manual wait4path in nix-daemon fix: remove manual wait4path in nix-optimise fix: remove manual wait4path in tailscaled fix: autossh test Revert "fix: remove manual wait4path in nix-daemon" This reverts commit 6aec084fa5d095666e81676e78f7054c83703faa. fix: remove bad exec Reapply "fix: remove manual wait4path in nix-daemon" This reverts commit c8f136ecc555f803124af471324bc6ed1163d6dd. fix: update autossh test to reflect changes in f86e6133d957becb1958da638516b0860fbd7491 fix: services-activate-system-changed-label-prefix test fix: services-buildkite-agent test fix: services-activate-system test fix: escape ampersand fix: services-lorri test fix: services-nix-optimise test fix: services-nix-gc test refactor: use script rather than command in daemon fix: use config.command for clarity style: fix indentation fix: use lib.getExe rather than directly pointing to file revert: a87fc7bbbbdb7c25c5ad6721c93990ea035affdd - mistaken refactor meant that service waited for nix store and not the relevant path --- modules/launchd/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'modules/launchd/default.nix') diff --git a/modules/launchd/default.nix b/modules/launchd/default.nix index ccb6cc6..64b6af7 100644 --- a/modules/launchd/default.nix +++ b/modules/launchd/default.nix @@ -20,7 +20,6 @@ let { config, name, ... }: let - cmd = config.command; env = config.environment // optionalAttrs (config.path != "") { PATH = config.path; }; in @@ -88,7 +87,11 @@ let ''); serviceConfig.Label = mkDefault "${cfg.labelPrefix}.${name}"; - serviceConfig.ProgramArguments = mkIf (cmd != "") [ "/bin/sh" "-c" "exec ${cmd}" ]; + serviceConfig.ProgramArguments = mkIf (config.command != "") [ + "/bin/sh" + "-c" + "/bin/wait4path /nix/store && exec ${config.command}" + ]; serviceConfig.EnvironmentVariables = mkIf (env != {}) env; }; }; -- cgit v1.2.3