Lluís Batlle i Rossell 9183f21f7e Merging from trunk. ... I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages. Also a small conflict in all-packages about making openssl overridable. And I some linux 2.6.31-zen kernel files also marked in conflict. svn path=/nixpkgs/branches/stdenv-updates/; revision=19438		2010-01-14 14:49:31 +00:00
..
audio	* Idem for gtk-libs/2.16.	2009-10-28 15:31:52 +00:00
display-managers/slim	* slim: ConsoleKit compatibility fix.	2009-08-17 01:09:17 +00:00
editors	update to 2.2.1	2009-12-24 21:37:18 +00:00
graphics	Merging from trunk.	2010-01-14 14:49:31 +00:00
misc	Updating calibre.	2010-01-08 20:30:24 +00:00
networking	Merging from trunk.	2010-01-14 14:49:31 +00:00
office	Stole a patch from cblfs.cross-lfs.org to fix compilation errors with glibc 2.11	2010-01-14 12:29:54 +00:00
science	pkgs/applications/science/math/maxima: updated to version 5.20.1	2010-01-12 21:39:23 +00:00
taxes	* Got rid of a lot of "postInstall=postInstall" and similar lines in	2009-04-23 13:31:10 +00:00
version-management	fix various builds by updating perl URI package update perl URI package	2009-12-21 08:55:31 +00:00
video	update to 1.0.4	2009-12-25 19:22:25 +00:00
virtualization	Updated VirtualBox to version 3.1.2	2010-01-13 16:14:22 +00:00
window-managers	applications/window-managers/xcompmgr: New package.	2010-01-06 20:45:43 +00:00