Shea Levy 1aa5589eef Merge branch 'virtualbox' of git://github.com/Calrama/nixpkgs ...

Update VirtualBox (and implicitly VirtualBox Guest Additions) to 4.3.6
and Oracle VM VirtualBox Extension Pack to 91406

Conflicts due to minor upgrade in the mean time

Conflicts:
	nixos/modules/virtualisation/virtualbox-guest.nix
	pkgs/applications/virtualization/virtualbox/default.nix
	pkgs/applications/virtualization/virtualbox/guest-additions/default.nix

2014-03-29 00:23:54 -04:00

..

amazon-config.nix

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00

amazon-image.nix

Make initialRootPassword overrideable in all virtualisation modules, not just virtualbox.

2014-02-24 18:05:26 +01:00

containers.nix

Make initialRootPassword overrideable in all virtualisation modules, not just virtualbox.

2014-02-24 18:05:26 +01:00

ec2-data.nix

Remove remaining references to Upstart

2013-10-31 13:26:06 +01:00

google-compute-config.nix

Add initial configuration for Google Compute Engine

2013-12-11 15:32:27 +01:00

google-compute-image.nix

Make the GCE image use 100G as disk size (maximum).

2014-03-21 15:18:03 +01:00

libvirtd.nix

nixos/libvirtd-service: fix fail-to-start when no machines are configured

2013-12-09 19:41:44 +01:00

nova-config.nix

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00

nova-image.nix

Rename environment.nix -> nix.package

2013-10-28 22:45:57 +01:00

nova.nix

nixos: capitalize a bunch of service descriptions

2013-11-09 20:45:50 +01:00

qemu-opts

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00

qemu-vm.nix

VM tests: Run hwclock in the initrd

2014-03-28 16:52:08 +01:00

virtualbox-guest.nix

services.mesa -> hardware.opengl

2014-02-08 14:45:37 -05:00

virtualbox-image.nix

virtualbox-image.nix: initialRootPassword setting should be easily overrideable

2014-02-14 09:06:26 -05:00

xen-dom0.nix

nixos: capitalize a bunch of service descriptions

2013-11-09 20:45:50 +01:00

xen-domU.nix

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00