Lluís Batlle i Rossell ee04ffcb55 Updating from trunk. I resolved simple conflicts. ... svn path=/nixpkgs/branches/stdenv-updates/; revision=25061		2010-12-11 12:47:00 +00:00
..
admin	pkgs/tools/admin/tightvnc: move --mandir and --infodir to standard locations	2010-12-06 18:01:51 +00:00
archivers	Updating from trunk. I only had to take away the usual stdenv2 in	2010-10-31 19:30:31 +00:00
backup
bluetooth	* Add some packages to the channel.	2010-10-21 11:18:30 +00:00
cd-dvd	* Add UNetbootin to the channel.	2010-08-11 13:55:56 +00:00
compression	Updating from trunk. I resolved simple conflicts.	2010-12-11 12:47:00 +00:00
filesystems	Updating from trunk. I resolved simple conflicts.	2010-12-11 12:47:00 +00:00
graphics	Applying some patches from Debian to build it with fresh OpenCV	2010-10-14 15:44:58 +00:00
misc	Updating from trunk. I resolved simple conflicts.	2010-12-11 12:47:00 +00:00
networking	Updating from trunk. I resolved simple conflicts.	2010-12-11 12:47:00 +00:00
package-management	* nixSqlite: bump. Also, go back to using SQLite 3.7 because 3.6 also	2010-12-10 10:22:23 +00:00
pydb
security	tor:version bump	2010-12-01 04:07:44 +00:00
system	Updating from trunk. I resolved simple conflicts.	2010-12-11 12:47:00 +00:00
text	pkgs/tools/text/replace: move --mandir to standard location $out/share/man	2010-12-06 17:43:57 +00:00
typesetting	Lout: Update the homepage.	2010-09-21 12:50:39 +00:00
video
virtualization
X11	Updating from trunk. I resolved simple conflicts.	2010-12-11 12:47:00 +00:00