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

* Inline make-job.nix.

Browse Source 
svn path=/nixos/branches/modular-nixos/; revision=16372
This commit is contained in:
Eelco Dolstra 2009-07-15 11:38:17 +00:00
parent 9d1e31117f
commit 96fe3ba1b7
2 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/system/upstart/make-job.nix
View File

@ -1,15 +0,0 @@
{runCommand}: job:
(
if job ? jobDrv then
job.jobDrv
else
(
runCommand ("upstart-" + job.name)
{ inherit (job) job;
jobName = job.name;
buildHook = if job ? buildHook then job.buildHook else "true";
}
"eval \"$buildHook\"; ensureDir $out/etc/event.d; echo \"$job\" > $out/etc/event.d/$jobName"
)
)

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

@ -2,17 +2,28 @@
let let
makeJob = import ./make-job.nix {
inherit (pkgs) runCommand;
};
inherit (pkgs.lib) mkOption mergeListOption; inherit (pkgs.lib) mkOption mergeListOption;
makeJob = job:
if job ? jobDrv then
job.jobDrv
else
pkgs.runCommand ("upstart-" + job.name)
{ inherit (job) job;
jobName = job.name;
buildHook = if job ? buildHook then job.buildHook else "true";
}
''
eval "$buildHook"
ensureDir $out/etc/event.d
echo "$job" > $out/etc/event.d/$jobName
'';
jobs = map makeJob (config.jobs ++ config.services.extraJobs); jobs = map makeJob (config.jobs ++ config.services.extraJobs);
# 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.
command = pkgs.runCommand "upstart-jobs" {inherit jobs;} jobsDir = pkgs.runCommand "upstart-jobs" {inherit jobs;}
'' ''
ensureDir $out/etc/event.d ensureDir $out/etc/event.d
for i in $jobs; do for i in $jobs; do
@ -82,7 +93,7 @@ in
environment.etc = environment.etc =
[ { # The Upstart events defined above. [ { # The Upstart events defined above.
source = command + "/etc/event.d"; source = "${jobsDir}/etc/event.d";
target = "event.d"; target = "event.d";
} }
]; ];