nixpkgs

Go to file

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

doc

Merge pull request #1815 from vcunat/p/doc-package-naming

2014-03-04 23:41:35 +01:00

lib

Merge branch 'slim_fix' of git://github.com/jagajaga/nixpkgs

2014-03-29 00:17:52 -04:00

maintainers/scripts

Fix updating of the tarball mirror

2014-02-19 13:58:42 +01:00

nixos

Merge branch 'virtualbox' of git://github.com/Calrama/nixpkgs