Vladimír Čunát e51f73652d Merge recent master into staging ... Hydra: ?compare=1149952 Conflicts: nixos/doc/manual/configuration.xml (changed split file) nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition) pkgs/development/libraries/readline/readline6.3.nix (auto-solved)		2014-08-30 10:04:02 +02:00
..
all-hardware.nix	initrd.availableKernelModules: add support for keyboards	2014-08-12 20:00:01 +02:00
base.nix	Remove Subversion from the installation CD	2014-07-30 16:04:15 +02:00
clone-config.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
demo.nix	Add user attribute isNormalUser	2014-08-15 02:16:04 +02:00
graphical.nix	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00
headless.nix	Don't start getty@tty1 on headless machines (like EC2)	2014-05-05 16:47:36 +02:00
installation-device.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
minimal.nix	no-x-libs.nix: Disable su xauth forwarding, and X11 dependency in dbus	2014-04-16 16:58:06 +02:00
qemu-guest.nix	qemu-guest.nix: Load virtio_rng	2014-04-30 18:23:42 +02:00