From 40c9057a49ee36481c712787cfe41d5d632e0fbe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Oct 2009 17:32:30 +0000
Subject: [PATCH] * Remove the obsolete "jobs" option.

svn path=/nixos/trunk/; revision=17765
---
 modules/system/upstart/upstart.nix | 32 ++----------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index efa5d52ae7bc..7f0531090822 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -75,18 +75,8 @@ let
 
 
   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
-    ++ map (job: job.upstartPkg) (attrValues config.jobAttrs)
-    ++ map (job: job.upstartPkg) jobs;
+    [pkgs.upstart] # for the built-in logd job
+    ++ map (job: job.upstartPkg) (attrValues config.jobAttrs);
 
   # Create an etc/event.d directory containing symlinks to the
   # specified list of Upstart job files.
@@ -264,29 +254,11 @@ in
       description = ''
         This option defines the system jobs started and managed by the
         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;
       options = [ jobOptions upstartJob ];
     };
-   
   
-    jobs = mkOption {
-      default = [];
-      description = ''
-        See jobAttrs
-      '';
-
-      type = types.list types.optionSet;
-      options = [ jobOptions upstartJob ];
-    };
-
     tests.upstartJobs = mkOption {
       internal = true;
       default = {};