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
..
audio	fix evaluation since 34301c8	2014-03-27 21:33:25 +01:00
display-managers	Merge branch 'slim_fix' of git://github.com/jagajaga/nixpkgs	2014-03-29 00:17:52 -04:00
editors	idea: update 13.0.2 -> 13.1.1	2014-03-26 21:21:12 +01:00
graphics	shotwell: 0.15.1 -> 0.18	2014-03-21 18:02:15 +01:00
ike	ike: use stdenv.lib.licenses.sleepycat	2014-03-24 19:58:36 -05:00
misc	blender: update from 2.69 to 2.70	2014-03-26 22:25:40 +01:00
networking	Merge branch 'dwb-update' of git://github.com/pSub/nixpkgs	2014-03-28 21:42:51 -04:00
office	Add zotero 4.0.19 (close #2043)	2014-03-27 22:42:47 +01:00
science	Merge branch 'z3' of git://github.com/thoughtpolice/nixpkgs	2014-03-28 23:54:43 -04:00
search	Adding doodle.	2013-04-22 20:57:14 +04:00
taxes	Add aangifte-2013	2014-03-01 16:54:16 +01:00
version-management	haskell-git-annex: update to version 5.20140320	2014-03-22 09:04:46 +01:00
video	Add simplescreenrecorder: an excellent screen recorder for linux	2014-03-26 23:02:33 +01:00
virtualization	Merge branch 'virtualbox' of git://github.com/Calrama/nixpkgs	2014-03-29 00:23:54 -04:00
window-managers	Openbox: Added wrapping for XDG_DATA_DIRS	2014-03-23 21:48:36 +11:00