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
..
assertions.nix	assertions '.msg' doesn't exist => .message	2012-04-01 10:54:06 +00:00
check-config.nix
crashdump.nix	crashdump: it required some kernel options for the nmi_watchdog to work.	2012-07-18 21:50:18 +02:00
ids.nix	Add "adm" group from the systemd branch to prevent constant collisions	2012-09-28 11:14:33 -04:00
lib.nix	Add lib module for modules to provide helper functions	2012-07-12 13:46:04 -04:00
locate.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
nixpkgs.nix	Don't use consolekit anywhere	2012-08-23 10:25:15 -04:00
passthru.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
version.nix	nixos-version: "pre-svn" -> "pre-git"	2012-06-22 10:28:06 -04:00