Vladimír Čunát b4af993c3f Merge branch 'master' into staging ... Conflicts (simple): pkgs/development/lisp-modules/clwrapper/setup-hook.sh		2014-11-14 14:28:23 +01:00
..
amazon-config.nix
amazon-image.nix	Obsolete security.initialPassword	2014-11-03 12:36:56 +01:00
azure-config.nix
azure-image.nix
container-config.nix
containers.nix
docker-image.nix	nixos: Fix priorities of initialHashedPassword.	2014-11-04 05:19:07 +01:00
docker.nix	docker: propagate nix.proxy into daemon environment	2014-11-07 13:46:36 +02:00
ec2-data.nix
google-compute-config.nix
google-compute-image.nix
libvirtd.nix
lxc.nix	Add support for global LXC config files	2014-10-18 05:02:39 +02:00
nixos-container.pl
nova-config.nix
nova-image.nix
nova.nix
openvswitch.nix
parallels-guest.nix	nixos/parallels-guest: add options	2014-11-12 01:26:23 +03:00
qemu-opts
qemu-vm.nix	Fix the driver for qemu ("vesa" -> "modesetting")	2014-10-15 12:24:50 +02:00
virtualbox-guest.nix
virtualbox-image.nix
xen-dom0.nix
xen-domU.nix