movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-12 05:16:25 +03:00
Code Activity

* jobAttrs -> jobs.

Browse source 
svn path=/nixos/trunk/; revision=17769
This commit is contained in:
Eelco Dolstra 2009-10-12 18:09:34 +00:00
parent 40c9057a49
commit eba8f94069
71 changed files with 78 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/services/audio/alsa.nix
View file

@ -45,7 +45,7 @@ in
gid = config.ids.gids.audio; gid = config.ids.gids.audio;
}; };
jobAttrs.alsa = jobs.alsa =
{ startOn = "udev"; { startOn = "udev";
preStart = preStart =

2
modules/services/audio/pulseaudio.nix
View file

@ -62,7 +62,7 @@ in
inherit gid; inherit gid;
}; };
jobAttrs.pulseaudio = jobs.pulseaudio =
{ description = "PulseAudio system-wide server"; { description = "PulseAudio system-wide server";
startOn = "startup"; startOn = "startup";

2
modules/services/databases/mysql.nix
View file

@ -72,7 +72,7 @@ in
environment.systemPackages = [mysql]; environment.systemPackages = [mysql];
jobAttrs.mysql = jobs.mysql =
{ description = "MySQL server"; { description = "MySQL server";
startOn = "filesystems"; startOn = "filesystems";

2
modules/services/databases/postgresql.nix
View file

@ -113,7 +113,7 @@ in
environment.systemPackages = [postgresql]; environment.systemPackages = [postgresql];
jobAttrs.postgresql = jobs.postgresql =
{ description = "PostgreSQL server"; { description = "PostgreSQL server";
startOn = "${startDependency}/started"; startOn = "${startDependency}/started";

2
modules/services/hardware/acpid.nix
View file

@ -76,7 +76,7 @@ in
config = mkIf config.powerManagement.enable { config = mkIf config.powerManagement.enable {
jobAttrs.acpid = jobs.acpid =
{ description = "ACPI daemon"; { description = "ACPI daemon";
startOn = "udev"; startOn = "udev";

2
modules/services/hardware/hal.nix
View file

@ -64,7 +64,7 @@ in
gid = config.ids.gids.haldaemon; gid = config.ids.gids.haldaemon;
}; };
jobAttrs.hal = jobs.hal =
{ description = "HAL daemon"; { description = "HAL daemon";
# !!! TODO: make sure that HAL starts after acpid, # !!! TODO: make sure that HAL starts after acpid,

2
modules/services/hardware/udev.nix
View file

@ -152,7 +152,7 @@ in
services.udev.packages = [extraUdevRules]; services.udev.packages = [extraUdevRules];
jobAttrs.udev = jobs.udev =
{ startOn = "startup"; { startOn = "startup";
stopOn = "shutdown"; stopOn = "shutdown";

2
modules/services/logging/klogd.nix
View file

@ -10,7 +10,7 @@ in
{ {
jobAttrs.klogd = jobs.klogd =
{ description = "Kernel log daemon"; { description = "Kernel log daemon";
startOn = "syslogd"; startOn = "syslogd";

2
modules/services/logging/syslogd.nix
View file

@ -47,7 +47,7 @@ in
config = { config = {
jobAttrs.syslogd = jobs.syslogd =
{ description = "Syslog daemon"; { description = "Syslog daemon";
startOn = "udev"; startOn = "udev";

2
modules/services/mail/dovecot.nix
View file

@ -113,7 +113,7 @@ in
gid = config.ids.gids.dovecot; gid = config.ids.gids.dovecot;
}; };
jobAttrs.dovecot = jobs.dovecot =
{ description = "Dovecot IMAP/POP3 server"; { description = "Dovecot IMAP/POP3 server";
startOn = "${startingDependency}/started"; startOn = "${startingDependency}/started";

2
modules/services/mail/postfix.nix
View file

@ -275,7 +275,7 @@ in
} }
]; ];
jobAttrs.postfix = jobs.postfix =
# I copy _lots_ of shipped configuration filed # I copy _lots_ of shipped configuration filed
# that can be left as is. I am afraid the exact # that can be left as is. I am afraid the exact
# will list slightly change in next Postfix # will list slightly change in next Postfix

2
modules/services/misc/autofs.nix
View file

@ -72,7 +72,7 @@ in
source = pkgs.writeText "auto.master" cfg.autoMaster; source = pkgs.writeText "auto.master" cfg.autoMaster;
}; };
jobAttrs.autofs = jobs.autofs =
{ description = "Filesystem automounter"; { description = "Filesystem automounter";
startOn = "network-interfaces/started"; startOn = "network-interfaces/started";

2
modules/services/misc/disnix.nix
View file

@ -36,7 +36,7 @@ in
services.dbus.enable = true; services.dbus.enable = true;
services.dbus.packages = [ pkgs.disnix ]; services.dbus.packages = [ pkgs.disnix ];
jobAttrs.disnix = jobs.disnix =
{ description = "Disnix server"; { description = "Disnix server";
startOn = "dbus"; startOn = "dbus";

2
modules/services/misc/gpsd.nix
View file

@ -85,7 +85,7 @@ in
inherit gid; inherit gid;
}; };
jobAttrs.gpsd = jobs.gpsd =
{ description = "GPSD daemon"; { description = "GPSD daemon";
startOn = "network-interfaces/started"; startOn = "network-interfaces/started";

2
modules/services/misc/nix-daemon.nix
View file

@ -188,7 +188,7 @@ in
target = "nix.machines"; target = "nix.machines";
}; };
jobAttrs.nixDaemon = jobs.nixDaemon =
{ startOn = "startup"; { startOn = "startup";
script = script =

2
modules/services/misc/nixos-manual.nix
View file

@ -72,7 +72,7 @@ in
boot.extraTTYs = mkIf cfg.showManual [cfg.ttyNumber]; boot.extraTTYs = mkIf cfg.showManual [cfg.ttyNumber];
jobAttrs = mkIf cfg.showManual jobs = mkIf cfg.showManual
{ nixosManual = { nixosManual =
{ name = "nixos-manual"; { name = "nixos-manual";

2
modules/services/misc/rogue.nix
View file

@ -40,7 +40,7 @@ in
boot.extraTTYs = [ cfg.tty ]; boot.extraTTYs = [ cfg.tty ];
jobAttrs.rogue = jobs.rogue =
{ description = "Rogue dungeon crawling game"; { description = "Rogue dungeon crawling game";
startOn = "udev"; startOn = "udev";

2
modules/services/misc/synergy.nix
View file

@ -68,7 +68,7 @@ in
config = { config = {
jobAttrs = jobs =
optionalAttrs cfgC.enable optionalAttrs cfgC.enable
{ synergyClient = { synergyClient =

2
modules/services/monitoring/nagios/default.nix
View file

@ -158,7 +158,7 @@ in
environment.systemPackages = [ pkgs.nagios ]; environment.systemPackages = [ pkgs.nagios ];
jobAttrs.nagios = jobs.nagios =
{ # Run `nagios -v' to check the validity of the configuration file so { # Run `nagios -v' to check the validity of the configuration file so
# that a nixos-rebuild fails *before* we kill the running Nagios # that a nixos-rebuild fails *before* we kill the running Nagios
# daemon. # daemon.

2
modules/services/monitoring/zabbix-agent.nix
View file

@ -64,7 +64,7 @@ in
description = "Zabbix daemon user"; description = "Zabbix daemon user";
}; };
jobAttrs.zabbix_agent = jobs.zabbix_agent =
{ #name = "zabbix-agent"; !!! mkIf bug { #name = "zabbix-agent"; !!! mkIf bug
description = "Zabbix agent daemon"; description = "Zabbix agent daemon";

2
modules/services/monitoring/zabbix-server.nix
View file

@ -51,7 +51,7 @@ in
description = "Zabbix daemon user"; description = "Zabbix daemon user";
}; };
jobAttrs.zabbix_server = jobs.zabbix_server =
{ #name = "zabbix-server"; !!! mkIf bug { #name = "zabbix-server"; !!! mkIf bug
description = "Zabbix server daemon"; description = "Zabbix server daemon";

8
modules/services/network-filesystems/nfs-kernel.nix
View file

@ -76,7 +76,7 @@ in
target = "exports"; target = "exports";
}; };
jobAttrs.nfs_kernel_exports = jobs.nfs_kernel_exports =
{ name = "nfs-kernel-exports"; { name = "nfs-kernel-exports";
description = "Kernel NFS server"; description = "Kernel NFS server";
@ -106,7 +106,7 @@ in
''; '';
}; };
jobAttrs.nfs_kernel_nfsd = jobs.nfs_kernel_nfsd =
{ name = "nfs-kernel-nfsd"; { name = "nfs-kernel-nfsd";
description = "Kernel NFS server"; description = "Kernel NFS server";
@ -117,7 +117,7 @@ in
exec = "${pkgs.nfsUtils}/sbin/rpc.nfsd ${if cfg.hostName != null then "-H ${cfg.hostName}" else ""} ${builtins.toString cfg.nproc}"; exec = "${pkgs.nfsUtils}/sbin/rpc.nfsd ${if cfg.hostName != null then "-H ${cfg.hostName}" else ""} ${builtins.toString cfg.nproc}";
}; };
jobAttrs.nfs_kernel_mountd = jobs.nfs_kernel_mountd =
{ name = "nfs-kernel-mountd"; { name = "nfs-kernel-mountd";
description = "Kernel NFS server - mount daemon"; description = "Kernel NFS server - mount daemon";
@ -128,7 +128,7 @@ in
exec = "${pkgs.nfsUtils}/sbin/rpc.mountd -F -f ${exports}"; exec = "${pkgs.nfsUtils}/sbin/rpc.mountd -F -f ${exports}";
}; };
jobAttrs.nfs_kernel_statd = jobs.nfs_kernel_statd =
{ name = "nfs-kernel-statd"; { name = "nfs-kernel-statd";
description = "Kernel NFS server - Network Status Monitor"; description = "Kernel NFS server - Network Status Monitor";

8
modules/services/network-filesystems/samba.nix
View file

@ -164,7 +164,7 @@ in
}); });
# Dummy job to start the real Samba daemons (nmbd, smbd, winbindd). # Dummy job to start the real Samba daemons (nmbd, smbd, winbindd).
jobAttrs.sambaControl = jobs.sambaControl =
{ name = "samba"; { name = "samba";
description = "Samba server"; description = "Samba server";
@ -176,11 +176,11 @@ in
# nmbd says "standard input is not a socket, assuming -D option", # nmbd says "standard input is not a socket, assuming -D option",
# but using -i makes it stay in foreground (?) # but using -i makes it stay in foreground (?)
jobAttrs.nmbd = daemonJob "nmbd" " -i -F"; jobs.nmbd = daemonJob "nmbd" " -i -F";
jobAttrs.smbd = daemonJob "smbd" " -i -F"; jobs.smbd = daemonJob "smbd" " -i -F";
jobAttrs.winbindd = daemonJob "winbindd" " -F"; jobs.winbindd = daemonJob "winbindd" " -F";
}; };

2
modules/services/networking/avahi-daemon.nix
View file

@ -115,7 +115,7 @@ in
environment.systemPackages = [ avahi ]; environment.systemPackages = [ avahi ];
jobAttrs.avahi_daemon = jobs.avahi_daemon =
{ name = "avahi-daemon"; { name = "avahi-daemon";
startOn = "network-interfaces/started"; startOn = "network-interfaces/started";

2
modules/services/networking/bind.nix
View file

@ -105,7 +105,7 @@ in
config = mkIf config.services.bind.enable { config = mkIf config.services.bind.enable {
jobAttrs.bind = jobs.bind =
{ description = "BIND name server job"; { description = "BIND name server job";
preStart = preStart =

2
modules/services/networking/bitlbee.nix
View file

@ -64,7 +64,7 @@ in
gid = config.ids.gids.bitlbee; gid = config.ids.gids.bitlbee;
}; };
jobAttrs.bitlbee = jobs.bitlbee =
{ description = "BitlBee IRC to other chat networks gateway"; { description = "BitlBee IRC to other chat networks gateway";
startOn = "network-interfaces/started"; startOn = "network-interfaces/started";

2
modules/services/networking/ddclient.nix
View file

@ -110,7 +110,7 @@ in
home = stateDir; home = stateDir;
}; };
jobAttrs.ddclient = jobs.ddclient =
{ name = "ddclient"; { name = "ddclient";
startOn = "startup"; startOn = "startup";

2
modules/services/networking/dhclient.nix
View file

@ -61,7 +61,7 @@ in
config = mkIf config.networking.useDHCP { config = mkIf config.networking.useDHCP {
jobAttrs.dhclient = jobs.dhclient =
{ startOn = "network-interfaces/started"; { startOn = "network-interfaces/started";
stopOn = "network-interfaces/stop"; stopOn = "network-interfaces/stop";

2
modules/services/networking/dhcpd.nix
View file

@ -108,7 +108,7 @@ in
config = mkIf config.services.dhcpd.enable { config = mkIf config.services.dhcpd.enable {
jobAttrs.dhcpd = jobs.dhcpd =
{ description = "DHCP server"; { description = "DHCP server";
startOn = "network-interfaces/started"; startOn = "network-interfaces/started";

2
modules/services/networking/ejabberd.nix
View file

@ -50,7 +50,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
jobAttrs.ejabberd = jobs.ejabberd =
{ description = "EJabberd server"; { description = "EJabberd server";
startOn = "network-interface/started"; startOn = "network-interface/started";

2
modules/services/networking/firewall.nix
View file

@ -78,7 +78,7 @@ in
environment.systemPackages = [pkgs.iptables]; environment.systemPackages = [pkgs.iptables];
jobAttrs.firewall = jobs.firewall =
{ startOn = "network-interfaces/started"; { startOn = "network-interfaces/started";
preStart = preStart =

2
modules/services/networking/gnunet.nix
View file

@ -191,7 +191,7 @@ in
home = "/var/empty"; home = "/var/empty";
}; };
jobAttrs.gnunetd = jobs.gnunetd =
{ description = "The GNUnet Daemon"; { description = "The GNUnet Daemon";
startOn = "network-interfaces/started"; startOn = "network-interfaces/started";

2
modules/services/networking/gw6c.nix
View file

@ -129,7 +129,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
jobAttrs.gw6c = jobs.gw6c =
{ description = "Gateway6 client"; { description = "Gateway6 client";
startOn = if cfg.autorun then "network-interfaces/started" else ""; startOn = if cfg.autorun then "network-interfaces/started" else "";

2
modules/services/networking/ifplugd.nix
View file

@ -55,7 +55,7 @@ in
config = mkIf config.networking.interfaceMonitor.enable { config = mkIf config.networking.interfaceMonitor.enable {
jobAttrs.ifplugd = jobs.ifplugd =
{ description = "Network interface connectivity monitor"; { description = "Network interface connectivity monitor";
startOn = "network-interfaces/started"; startOn = "network-interfaces/started";

2
modules/services/networking/ircd-hybrid.nix
View file

@ -117,7 +117,7 @@ in
users.extraGroups = singleton users.extraGroups = singleton
{ name = "ircd"; }; { name = "ircd"; };
jobAttrs.ircd_hybrid = jobs.ircd_hybrid =
{ # name = "ircd-hybrid"; !!! mkIf bug { # name = "ircd-hybrid"; !!! mkIf bug
description = "IRCD Hybrid server"; description = "IRCD Hybrid server";

2
modules/services/networking/ntpd.nix
View file

@ -70,7 +70,7 @@ in
home = stateDir; home = stateDir;
}; };
jobAttrs.ntpd = jobs.ntpd =
{ description = "NTP daemon"; { description = "NTP daemon";
startOn = "ip-up"; startOn = "ip-up";

2
modules/services/networking/openfire.nix
View file

@ -49,7 +49,7 @@ in
message = "openfire assertion failed"; message = "openfire assertion failed";
}; };
jobAttrs.openfire = jobs.openfire =
{ description = "OpenFire XMPP server"; { description = "OpenFire XMPP server";
startOn = "${startDependency}/started"; startOn = "${startDependency}/started";

2
modules/services/networking/openvpn.nix
View file

@ -121,7 +121,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
jobAttrs = listToAttrs (map (c: nameValuePair "openvpn-${cfg.id}" (makeOpenVPNJob c)) cfg.servers); jobs = listToAttrs (map (c: nameValuePair "openvpn-${cfg.id}" (makeOpenVPNJob c)) cfg.servers);
}; };

2
modules/services/networking/portmap.nix
View file

@ -63,7 +63,7 @@ in
inherit gid; inherit gid;
}; };
jobAttrs.portmap = jobs.portmap =
{ description = "ONC RPC portmap"; { description = "ONC RPC portmap";
startOn = "network-interfaces/started"; startOn = "network-interfaces/started";

2
modules/services/networking/privoxy.nix
View file

@ -77,7 +77,7 @@ in
home = stateDir; home = stateDir;
}; };
jobAttrs.privoxy = jobs.privoxy =
{ name = "privoxy"; { name = "privoxy";
startOn = "startup"; startOn = "startup";

2
modules/services/networking/ssh/lshd.nix
View file

@ -116,7 +116,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
jobAttrs.lshd = jobs.lshd =
{ description = "GNU lshd SSH2 daemon"; { description = "GNU lshd SSH2 daemon";
startOn = "network-interfaces/started"; startOn = "network-interfaces/started";

2
modules/services/networking/ssh/sshd.nix
View file

@ -108,7 +108,7 @@ in
home = "/var/empty"; home = "/var/empty";
}; };
jobAttrs.sshd = { jobs.sshd = {
description = "OpenSSH server"; description = "OpenSSH server";

2
modules/services/networking/vsftpd.nix
View file

@ -99,7 +99,7 @@ in
gid = config.ids.gids.ftp; gid = config.ids.gids.ftp;
}; };
jobAttrs.vsftpd = jobs.vsftpd =
{ description = "vsftpd server"; { description = "vsftpd server";
startOn = "network-interfaces/started"; startOn = "network-interfaces/started";

2
modules/services/networking/wpa_supplicant.nix
View file

@ -37,7 +37,7 @@ in
environment.systemPackages = [pkgs.wpa_supplicant]; environment.systemPackages = [pkgs.wpa_supplicant];
jobAttrs.wpa_supplicant = jobs.wpa_supplicant =
{ startOn = "network-interfaces/started"; { startOn = "network-interfaces/started";
stopOn = "network-interfaces/stop"; stopOn = "network-interfaces/stop";

2
modules/services/networking/xinetd.nix
View file

@ -119,7 +119,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
jobAttrs.xinetd = jobs.xinetd =
{ description = "xinetd server"; { description = "xinetd server";
startOn = "network-interfaces/started"; startOn = "network-interfaces/started";

2
modules/services/printing/cupsd.nix
View file

@ -155,7 +155,7 @@ in
} }
]; ];
jobAttrs.cupsd = jobs.cupsd =
{ description = "CUPS printing daemon"; { description = "CUPS printing daemon";
startOn = "network-interfaces/started"; startOn = "network-interfaces/started";

2
modules/services/scheduling/atd.nix
View file

@ -63,7 +63,7 @@ in
gid = config.ids.gids.atd; gid = config.ids.gids.atd;
}; };
jobAttrs.atd = jobs.atd =
{ description = "at daemon (atd)"; { description = "at daemon (atd)";
startOn = "startup"; startOn = "startup";

2
modules/services/scheduling/cron.nix
View file

@ -66,7 +66,7 @@ in
environment.systemPackages = [pkgs.cron]; environment.systemPackages = [pkgs.cron];
jobAttrs.cron = jobs.cron =
{ description = "Cron daemon"; { description = "Cron daemon";
startOn = "startup"; startOn = "startup";

2
modules/services/scheduling/fcron.nix
View file

@ -97,7 +97,7 @@ in
environment.systemPackages = [ pkgs.fcron ]; environment.systemPackages = [ pkgs.fcron ];
jobAttrs.fcron = jobs.fcron =
{ description = "fcron daemon"; { description = "fcron daemon";
startOn = "startup"; startOn = "startup";

2
modules/services/system/dbus.nix
View file

@ -113,7 +113,7 @@ in
gid = config.ids.gids.messagebus; gid = config.ids.gids.messagebus;
}; };
jobAttrs.dbus = jobs.dbus =
{ startOn = "udev"; { startOn = "udev";
stopOn = "shutdown"; stopOn = "shutdown";

2
modules/services/system/nscd.nix
View file

@ -17,7 +17,7 @@ in
description = "Name service cache daemon user"; description = "Name service cache daemon user";
}; };
jobAttrs.nscd = jobs.nscd =
{ description = "Name Service Cache Daemon"; { description = "Name Service Cache Daemon";
startOn = "startup"; startOn = "startup";

2
modules/services/system/uptimed.nix
View file

@ -49,7 +49,7 @@ in
home = stateDir; home = stateDir;
}; };
jobAttrs.uptimed = jobs.uptimed =
{ description = "Uptimed daemon"; { description = "Uptimed daemon";
startOn = "startup"; startOn = "startup";

2
modules/services/ttys/gpm.nix
View file

@ -38,7 +38,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
jobAttrs.gpm = jobs.gpm =
{ description = "General purpose mouse"; { description = "General purpose mouse";
startOn = "udev"; startOn = "udev";

2
modules/services/ttys/mingetty.nix
View file

@ -53,7 +53,7 @@ with pkgs.lib;
config = { config = {
# Generate a separate job for each tty. # Generate a separate job for each tty.
jobAttrs = listToAttrs (map (tty: nameValuePair tty { jobs = listToAttrs (map (tty: nameValuePair tty {
startOn = "udev"; startOn = "udev";

2
modules/services/web-servers/apache-httpd/default.nix
View file

@ -559,7 +559,7 @@ in
environment.systemPackages = [httpd] ++ concatMap (svc: svc.extraPath) allSubservices; environment.systemPackages = [httpd] ++ concatMap (svc: svc.extraPath) allSubservices;
jobAttrs.httpd = jobs.httpd =
{ # Statically verify the syntactic correctness of the generated { # Statically verify the syntactic correctness of the generated
# httpd.conf. !!! this is impure! It doesn't just check for # httpd.conf. !!! this is impure! It doesn't just check for
# syntax, but also whether the Apache user/group exist, # syntax, but also whether the Apache user/group exist,

2
modules/services/web-servers/jboss.nix
View file

@ -70,7 +70,7 @@ in
config = mkIf config.services.jboss.enable { config = mkIf config.services.jboss.enable {
jobAttrs.jboss = jobs.jboss =
{ description = "JBoss server"; { description = "JBoss server";
exec = "${jbossService}/bin/control start"; exec = "${jbossService}/bin/control start";

2
modules/services/web-servers/tomcat.nix
View file

@ -101,7 +101,7 @@ in
home = "/homeless-shelter"; home = "/homeless-shelter";
}; };
jobAttrs.tomcat = jobs.tomcat =
{ description = "Apache Tomcat server"; { description = "Apache Tomcat server";
startOn = "network-interface/started"; startOn = "network-interface/started";

2
modules/services/x11/xfs.nix
View file

@ -40,7 +40,7 @@ in
message = "Please enable fontDir (fonts.enableFontDir) to use xfs."; message = "Please enable fontDir (fonts.enableFontDir) to use xfs.";
}; };
jobAttrs.xfs = jobs.xfs =
{ description = "X Font Server"; { description = "X Font Server";
startOn = "${startingDependency}/started"; startOn = "${startingDependency}/started";

2
modules/services/x11/xserver.nix
View file

@ -348,7 +348,7 @@ in
services.hal.packages = halConfigFiles; services.hal.packages = halConfigFiles;
jobAttrs.xserver = jobs.xserver =
{ startOn = if cfg.autorun then "hal" else "never"; { startOn = if cfg.autorun then "hal" else "never";
environment = environment =

2
modules/system/upstart-events/ctrl-alt-delete.nix
View file

@ -3,7 +3,7 @@
###### implementation ###### implementation
{ {
jobAttrs.ctrl_alt_delete = jobs.ctrl_alt_delete =
{ name = "ctrl-alt-delete"; { name = "ctrl-alt-delete";
startOn = "ctrlaltdel"; startOn = "ctrlaltdel";

2
modules/system/upstart-events/halt.nix
View file

@ -116,6 +116,6 @@ let
in in
{ {
jobAttrs = listToAttrs (map (n: nameValuePair "sys-${n}" (jobFun n)) jobs = listToAttrs (map (n: nameValuePair "sys-${n}" (jobFun n))
[ "reboot" "halt" "system-halt" "power-off" ] ); [ "reboot" "halt" "system-halt" "power-off" ] );
} }

2
modules/system/upstart-events/maintenance-shell.nix
View file

@ -3,7 +3,7 @@
###### implementation ###### implementation
{ {
jobAttrs.maintenance_shell = jobs.maintenance_shell =
{ name = "maintenance-shell"; { name = "maintenance-shell";
startOn = [ "maintenance" "stalled" ]; startOn = [ "maintenance" "stalled" ];

5
modules/system/upstart/upstart.nix
View file

@ -73,10 +73,9 @@ let
echo "$jobText" > $out/etc/event.d/${job.name} echo "$jobText" > $out/etc/event.d/${job.name}
''; '';
jobs = jobs =
[pkgs.upstart] # for the built-in logd job [pkgs.upstart] # for the built-in logd job
++ map (job: job.upstartPkg) (attrValues config.jobAttrs); ++ map (job: job.upstartPkg) (attrValues config.jobs);
# 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.
@ -249,7 +248,7 @@ in
options = { options = {
jobAttrs = mkOption { jobs = mkOption {
default = {}; default = {};
description = '' description = ''
This option defines the system jobs started and managed by the This option defines the system jobs started and managed by the

2
modules/tasks/filesystems.nix
View file

@ -233,7 +233,7 @@ in
# Add the mount helpers to the system path so that `mount' can find them. # Add the mount helpers to the system path so that `mount' can find them.
environment.systemPackages = [pkgs.ntfs3g pkgs.mount_cifs pkgs.nfsUtils]; environment.systemPackages = [pkgs.ntfs3g pkgs.mount_cifs pkgs.nfsUtils];
jobAttrs.filesystems = jobs.filesystems =
{ startOn = [ "startup" "new-devices" "ip-up" ]; { startOn = [ "startup" "new-devices" "ip-up" ];
script = task; script = task;

2
modules/tasks/kbd.nix
View file

@ -56,7 +56,7 @@ in
environment.systemPackages = [pkgs.kbd]; environment.systemPackages = [pkgs.kbd];
jobAttrs.kbd = jobs.kbd =
{ description = "Keyboard / console initialisation"; { description = "Keyboard / console initialisation";
startOn = "udev"; startOn = "udev";

2
modules/tasks/lvm.nix
View file

@ -6,7 +6,7 @@
config = { config = {
jobAttrs.lvm = jobs.lvm =
{ startOn = " udev"; # !!! or on new-devices { startOn = " udev"; # !!! or on new-devices
script = script =

2
modules/tasks/network-interfaces.nix
View file

@ -132,7 +132,7 @@ in
pkgs.wirelesstools pkgs.wirelesstools
]; ];
jobAttrs.networkInterfaces = jobs.networkInterfaces =
{ name = "network-interfaces"; { name = "network-interfaces";
startOn = "udev"; startOn = "udev";

2
modules/tasks/swap.nix
View file

@ -66,7 +66,7 @@ in
config = { config = {
jobAttrs.swap = jobs.swap =
{ task = true; { task = true;
startOn = ["startup" "new-devices"]; startOn = ["startup" "new-devices"];

2
modules/tasks/swraid.nix
View file

@ -12,7 +12,7 @@ in
{ {
jobAttrs.swraid = jobs.swraid =
{ startOn = "udev"; # !!! or on "new-devices" { startOn = "udev"; # !!! or on "new-devices"
script = script =

2
modules/tasks/tty-backgrounds.nix
View file

@ -102,7 +102,7 @@ in
target = "splash"; target = "splash";
}; };
jobAttrs.ttyBackgrounds = jobs.ttyBackgrounds =
{ name = "tty-backgrounds"; { name = "tty-backgrounds";
startOn = "udev"; startOn = "udev";

2
modules/testing/test-instrumentation.nix
View file

@ -9,7 +9,7 @@ with pkgs.lib;
config = { config = {
jobAttrs.backdoor = jobs.backdoor =
{ startOn = "network-interfaces"; { startOn = "network-interfaces";
preStart = preStart =