philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
nixpkgs/nixos/modules
History
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
..
config power-management: Don't enable acpid. 2014-03-15 12:17:00 +01:00
hardware Upgrade bumblebee and add nixos module 2014-02-09 15:09:41 +01:00
installer typo: occured -> occurred 2014-03-07 19:39:55 +01:00
misc nixos: add BitTorrent Sync service module 2014-03-20 12:24:28 -05:00
profiles remove references to isSystemUser and fix eval of tested job 2014-02-08 21:10:00 +01:00
programs Merge branch 'zsh' of git://github.com/ttuegel/nixpkgs 2014-03-15 13:11:38 -04:00
security nixos: add Duo Security module 2014-03-16 07:11:50 -05:00
services Merge branch 'slim_fix' of git://github.com/jagajaga/nixpkgs 2014-03-29 00:17:52 -04:00
system Set /run/keys ownership based on numerical ids 2014-03-19 05:18:24 -04:00
tasks nixos: Add ZFS auto-snapshotting module 2014-03-15 01:56:42 +01:00
testing
virtualisation Merge branch 'virtualbox' of git://github.com/Calrama/nixpkgs 2014-03-29 00:23:54 -04:00
module-list.nix nixos: add BitTorrent Sync service module 2014-03-20 12:24:28 -05:00
rename.nix move windowManager.xbmc to desktopManager.xbmc 2014-03-12 09:20:59 +01:00