philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
nixpkgs/nixos
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
..
doc nixos manual: make nixos options linkable 2014-03-08 19:34:28 +01:00
gui
lib Shut up Perl warning 2014-03-18 14:10:31 +01:00
maintainers Add all AWS regions to EBS AMI creation script. 2014-02-11 13:26:46 +01:00
modules Merge branch 'virtualbox' of git://github.com/Calrama/nixpkgs 2014-03-29 00:23:54 -04:00
tests remove users.jenkins config start on slave config. 2014-03-13 13:01:50 -07:00
COPYING
default.nix
README
release-combined.nix Disable efi tests again 2014-03-01 09:51:28 -05:00
release.nix Move generation of coverage reports from nixos/lib/testing to releaseTools 2014-03-03 13:57:08 +01:00

README 

*** NixOS ***

NixOS is a Linux distribution based on the purely functional package
management system Nix.  More information can be found at
http://nixos.org/nixos and in the manual in doc/manual.