public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Remove the obsolete "jobs" option.

Browse Source 
svn path=/nixos/trunk/; revision=17765
This commit is contained in:
Eelco Dolstra 2009-10-12 17:32:30 +00:00
parent d982f23f20
commit 40c9057a49
1 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
modules/system/upstart/upstart.nix
View File

@ -75,18 +75,8 @@ let
jobs = jobs =
let
deprecatedJobDefs = config.jobs;
jobList = concatStringsSep ", " (map (j: j.name) deprecatedJobDefs);
jobs =
if deprecatedJobDefs != [] then
builtins.trace "Make the following jobs use jobAttrs please. Using jobs is depreceated: ${jobList}" deprecatedJobDefs
else
deprecatedJobDefs;
in
[pkgs.upstart] # for the built-in logd job [pkgs.upstart] # for the built-in logd job
++ map (job: job.upstartPkg) (attrValues config.jobAttrs) ++ map (job: job.upstartPkg) (attrValues config.jobAttrs);
++ map (job: job.upstartPkg) jobs;
# Create an etc/event.d directory containing symlinks to the # Create an etc/event.d directory containing symlinks to the
# specified list of Upstart job files. # specified list of Upstart job files.
@ -264,29 +254,11 @@ in
description = '' description = ''
This option defines the system jobs started and managed by the This option defines the system jobs started and managed by the
Upstart daemon. Upstart daemon.
It's filled by config.jobs by now. A warning is print.
You can overwrite settings easily. Example:
config.jobAttrs.sshd.startOn = "never";
''; '';
type = types.attrsOf types.optionSet; type = types.attrsOf types.optionSet;
options = [ jobOptions upstartJob ]; options = [ jobOptions upstartJob ];
}; };
jobs = mkOption {
default = [];
description = ''
See jobAttrs
'';
type = types.list types.optionSet;
options = [ jobOptions upstartJob ];
};
tests.upstartJobs = mkOption { tests.upstartJobs = mkOption {
internal = true; internal = true;
default = {}; default = {};