nixpkgs/nixos/modules
Vladimír Čunát 87c3c0e885 Merge master into #2129
Conflicts (easy, just UID shifted):
	nixos/modules/misc/ids.nix
	nixos/modules/module-list.nix
2014-08-12 19:24:08 +02:00
..
config provide pulseaudioFull and set it as default to hardware.pulseaudio.package 2014-08-12 12:51:25 +02:00
hardware
installer Mount unionfs-fuse filesystems using the normal fileSystems option 2014-07-30 16:04:15 +02:00
misc Merge master into #2129 2014-08-12 19:24:08 +02:00
profiles Remove Subversion from the installation CD 2014-07-30 16:04:15 +02:00
programs gdm: Add very experimental display manager 2014-08-12 11:23:42 +02:00
security Merge master into #2129 2014-08-12 19:24:08 +02:00
services Merge master into #2129 2014-08-12 19:24:08 +02:00
system Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
tasks Merge remote-tracking branch 'origin/master' into staging. 2014-08-04 16:51:47 +02:00
testing Fix evaluation 2014-08-06 19:44:13 +02:00
virtualisation Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
module-list.nix Merge master into #2129 2014-08-12 19:24:08 +02:00
rename.nix