Lluís Batlle i Rossell 5417c720fd Merging from trunk. ... I tried to fix some trivial conflicts. I don't know if I merged well some more difficult conflicts on openssl/darwin_patch or haskell-platform. svn path=/nixpkgs/branches/stdenv-updates/; revision=22878		2010-08-02 15:48:19 +00:00
..
admin	Making tigervnc build with the xserver 1.8	2010-07-29 07:59:06 +00:00
archivers	Merging from trunk.	2010-08-02 15:48:19 +00:00
backup	Making duplicity's rdiffdir work (it had to be wrapped)	2010-06-05 15:06:12 +00:00
bluetooth	* Added Blueman (a Bluetooth application).	2010-07-06 14:54:22 +00:00
cd-dvd	Add GNU mkisofs.	2010-01-21 16:53:16 +00:00
compression	Updating from trunk	2010-06-14 09:28:10 +00:00
filesystems	* ltrace: updated to 0.5.3.	2010-07-29 18:55:16 +00:00
graphics	* More cleanup.	2010-07-28 15:35:01 +00:00
misc	Merging from trunk.	2010-08-02 15:48:19 +00:00
networking	pkgs/tools/networking/nbd: install the README file to $out/share/doc	2010-08-02 13:37:36 +00:00
package-management	Merging from trunk.	2010-08-02 15:48:19 +00:00
pydb	* Get rid of many instances of "args: with args;", and other coding	2010-07-28 11:55:54 +00:00
security	* ltrace: updated to 0.5.3.	2010-07-29 18:55:16 +00:00
system	* Fix some more "args: with args".	2010-07-30 14:47:23 +00:00
text	Merging from trunk.	2010-08-02 15:48:19 +00:00
typesetting	Switched the default version of ghc and Haskell Platform to 6.12.3 and 2010.2.0.0.	2010-07-22 18:47:59 +00:00
video	* Get rid of many instances of "args: with args;", and other coding	2010-07-28 11:55:54 +00:00
virtualization	* Updated the EC2 API/AMI tools.	2010-07-13 20:58:58 +00:00
X11	* ltrace: updated to 0.5.3.	2010-07-29 18:55:16 +00:00