- Move some system configuration to options:

  * system.nssModules
  * system.modulesTree
  * system.sbin.modprobe
  * system.sbin.mount
  * nix.envVars

- Remove Arguments that can be accessed either by "config" or "pkgs".

- Use the new scheme for upstart-jobs/default.nix.
This is now a configuration file which is imported by system/options.nix.

- Jobs can now include upstart-job/default.nix:
  * upstrat-jobs/cron.nix
  * upstart-jobs/dhclient.nix

=> No Nixos file refers to upstart-jobs/default.nix except if one of its options is require to define an extra job. (e.g.: cron, dhclient)

svn path=/nixos/branches/fix-style/; revision=13327

1 files changed, 1 insertions, 9 deletions

diff --git a/default.nix b/default.nix
index 3923cb9592b..1a621c3457e 100644
--- a/default.nix
+++ b/default.nix
@@ -42,13 +42,5 @@ in
 
   manifests = system.config.installer.manifests; # exported here because nixos-rebuild uses it
 
-  upstartJobsCombined = system.upstartJobs;
-
-  # Make it easier to build individual Upstart jobs (e.g., "nix-build
-  # /etc/nixos/nixos -A upstartJobs.xserver").  
-  upstartJobs = { recurseForDerivations = true; } //
-    builtins.listToAttrs (map (job:
-      { name = if job ? jobName then job.jobName else job.name; value = job; }
-    ) system.upstartJobs.jobs);
-
+  tests = system.config.tests;
 }