* Define the Upstart package to use in one place.

svn path=/nixos/branches/upstart-0.6/; revision=18187

modules/services/networking/dhclient.nix

@@ -26,13 +26,13 @@ let
           # hostnames in its config file, then it will never do
           # anything ever again ("couldn't resolve ..., giving up on
           # it"), so we silently lose time synchronisation.
-          ${pkgs.upstart}/sbin/initctl stop ntpd
+          ${config.system.build.upstart}/sbin/initctl stop ntpd
           
-          ${pkgs.upstart}/sbin/initctl emit ip-up
+          ${config.system.build.upstart}/sbin/initctl emit ip-up
       fi
 
       if test "$reason" = EXPIRE -o "$reason" = RELEASE; then
-          ${pkgs.upstart}/sbin/initctl emit ip-down
+          ${config.system.build.upstart}/sbin/initctl emit ip-down
       fi
     '';
   

modules/services/networking/gw6c.nix

@@ -6,10 +6,12 @@ let
 
   cfg = config.services.gw6c;
 
+  # !!! Move this from the services tree to the nixos tree.
   gw6cService = import (servicesPath + /gw6c) {
     inherit (pkgs) stdenv gw6c coreutils 
-      procps upstart iputils gnused 
+      procps iputils gnused 
       gnugrep seccure writeScript;
+    upstart = config.system.build.upstart;
     username = cfg.username;
     password = cfg.password;
     server = cfg.server;