Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/desktops/e18/enlightenment.nix		2014-08-04 16:51:47 +02:00
..
amazon-config.nix
amazon-image.nix	amazon-image.nix: Overwrite busybox swapon	2014-08-01 17:55:37 -04:00
container-config.nix
containers.nix
docker.nix	Upgrade docker to 1.1.2 and add docker module	2014-07-28 21:45:49 +02:00
ec2-data.nix
google-compute-config.nix
google-compute-image.nix	Google Compute image:	2014-08-01 15:25:50 +02:00
libvirtd.nix
nixos-container.pl
nova-config.nix
nova-image.nix
nova.nix
qemu-opts
qemu-vm.nix	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
virtualbox-guest.nix	Get all lib functions from lib, not pkgs.lib, in modules	2014-07-02 12:28:18 -04:00
virtualbox-image.nix	Fix virtualbox image building with new nix	2014-07-15 19:17:06 -04:00
xen-dom0.nix
xen-domU.nix