diff --git a/system/options.nix b/system/options.nix
index 7ad09b1deb3..2285f6f89ae 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1,4 +1,4 @@
-pkgs: config:
+{pkgs, config, ...}:
 
 let
   inherit (pkgs.lib) mkOption;
diff --git a/upstart-jobs/alsa.nix b/upstart-jobs/alsa.nix
index 08591d04fd7..406c63720f6 100644
--- a/upstart-jobs/alsa.nix
+++ b/upstart-jobs/alsa.nix
@@ -1,5 +1,5 @@
 # ALSA sound support.
-{pkgs, config}:
+{pkgs, config, ...}:
 
 ###### interface
 let
diff --git a/upstart-jobs/avahi-daemon.nix b/upstart-jobs/avahi-daemon.nix
index b3de2b52401..c9c027fefee 100644
--- a/upstart-jobs/avahi-daemon.nix
+++ b/upstart-jobs/avahi-daemon.nix
@@ -1,5 +1,5 @@
 # Avahi daemon.
-{pkgs, config}:
+{pkgs, config, ...}:
 
 ###### interface
 let
diff --git a/upstart-jobs/cron.nix b/upstart-jobs/cron.nix
index 0876f776f47..2806ee92b96 100644
--- a/upstart-jobs/cron.nix
+++ b/upstart-jobs/cron.nix
@@ -1,4 +1,4 @@
-{pkgs, config}:
+{pkgs, config, ...}:
 
 ###### interface
 let
diff --git a/upstart-jobs/cron/locate.nix b/upstart-jobs/cron/locate.nix
index 2b26a10e91e..eace9f5129b 100644
--- a/upstart-jobs/cron/locate.nix
+++ b/upstart-jobs/cron/locate.nix
@@ -1,4 +1,4 @@
-{pkgs, config}:
+{pkgs, config, ...}:
 
 ###### interface
 let
diff --git a/upstart-jobs/dbus.nix b/upstart-jobs/dbus.nix
index 1b2b0d344f7..f98922a5b6e 100644
--- a/upstart-jobs/dbus.nix
+++ b/upstart-jobs/dbus.nix
@@ -1,5 +1,5 @@
 # D-Bus system-wide daemon.
-{pkgs, config}:
+{pkgs, config, ...}:
 
 ###### interface
 let
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index fe1cad6195e..fee24e3b5ec 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -1,4 +1,4 @@
-{config, pkgs}:
+{config, pkgs, ...}:
 
 ###### interface
 let
diff --git a/upstart-jobs/dhclient.nix b/upstart-jobs/dhclient.nix
index 5be6c6c0e54..db1c948072c 100644
--- a/upstart-jobs/dhclient.nix
+++ b/upstart-jobs/dhclient.nix
@@ -1,5 +1,4 @@
-{pkgs, config #, ...
-}:
+{pkgs, config, ...}:
 
 ###### interface
 let
diff --git a/upstart-jobs/gpm.nix b/upstart-jobs/gpm.nix
index 74aa8b84c8f..1247f1548f8 100644
--- a/upstart-jobs/gpm.nix
+++ b/upstart-jobs/gpm.nix
@@ -1,4 +1,4 @@
-{pkgs, config}:
+{pkgs, config, ...}:
 
 ###### interface
 let
diff --git a/upstart-jobs/hal.nix b/upstart-jobs/hal.nix
index 56e82a7c05e..181341fdcf4 100644
--- a/upstart-jobs/hal.nix
+++ b/upstart-jobs/hal.nix
@@ -1,5 +1,5 @@
 # HAL daemon.
-{pkgs, config}:
+{pkgs, config, ...}:
 
 ###### interface
 let
diff --git a/upstart-jobs/nagios/default.nix b/upstart-jobs/nagios/default.nix
index bbd56a89442..1b26231cf95 100644
--- a/upstart-jobs/nagios/default.nix
+++ b/upstart-jobs/nagios/default.nix
@@ -1,5 +1,5 @@
 # Nagios system/network monitoring daemon.
-{config, pkgs}:
+{config, pkgs, ...}:
 
 ###### interface
 let
diff --git a/upstart-jobs/pcmcia.nix b/upstart-jobs/pcmcia.nix
index 5b2d7a43d97..dcf881470b9 100644
--- a/upstart-jobs/pcmcia.nix
+++ b/upstart-jobs/pcmcia.nix
@@ -1,4 +1,4 @@
-pkgs: config:
+{pkgs, config, ...}:
 
 ###### interface
 let