Eelco Dolstra
3ad370ae0a
Merge remote-tracking branch 'origin/master' into systemd
...
Conflicts:
modules/misc/ids.nix
modules/services/mail/postfix.nix
modules/services/system/nscd.nix
modules/services/x11/desktop-managers/xfce.nix
modules/system/boot/stage-1.nix
2012-09-28 11:35:27 -04:00
Eelco Dolstra
1e666c10fa
Get rid of the last use of mkThenElse
2012-09-20 16:55:32 -04:00
Eelco Dolstra
4a95f8996b
To ease migration to systemd, generate units from the ‘jobs’ option
...
Also get rid of the ‘buildHook’ job option because it wasn't very useful.
2012-06-16 00:19:43 -04:00
Peter Simons
eb6e1310b8
strip trailing whitespace; no functional change
...
svn path=/nixos/trunk/; revision=29285
2011-09-14 18:20:50 +00:00
Eelco Dolstra
83a9bf9a6a
* Change all the startOn / stopOn attributes to the Upstart 0.6 syntax
...
(e.g., startOn = "started foo" instead of startOn = "foo").
svn path=/nixos/branches/upstart-0.6/; revision=18230
2009-11-06 22:19:17 +00:00
Eelco Dolstra
eba8f94069
* jobAttrs -> jobs.
...
svn path=/nixos/trunk/; revision=17769
2009-10-12 18:09:34 +00:00
Eelco Dolstra
e91d882a94
* Converted modules that were still using the old (concrete syntax)
...
style of declaring Upstart jobs. While at it, converted them to the
current NixOS module style and improved some option descriptions.
Hopefully I didn't break too much :-)
svn path=/nixos/trunk/; revision=17761
2009-10-12 16:36:19 +00:00
Nicolas Pierron
2e34baba3b
Rename environment.extraPackages to environment.systemPackages.
...
svn path=/nixos/trunk/; revision=17705
2009-10-07 17:14:25 +00:00
Eelco Dolstra
dba1d48b78
* Move the uid/gid mappings into a module. This allows other modules
...
to use it through config.ids.{uids,gids} rather than `import
relative-path/ids.nix'.
svn path=/nixos/branches/modular-nixos/; revision=15796
2009-05-29 14:25:56 +00:00
Eelco Dolstra
5ebdee3577
* Continued refactoring the tree: moved most Upstart jobs (namely
...
those that run daemons) to modules/services. This probably broke
some things since there are a few relative paths in modules
(e.g. imports of system/ids.nix).
* Moved some PAM modules out of etc/pam.d to the directories of NixOS
modules that use them.
svn path=/nixos/branches/modular-nixos/; revision=15717
2009-05-24 23:13:23 +00:00
