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
..
compilers	Merging from trunk.	2010-08-02 15:48:19 +00:00
eclipse	ecj darwin~	2010-03-01 16:40:02 +00:00
guile-modules	Add GNU guile-gnome.	2009-10-05 22:21:50 +00:00
interpreters	Merging from trunk.	2010-08-02 15:48:19 +00:00
libraries	Merging from trunk.	2010-08-02 15:48:19 +00:00
misc	* More cleanup.	2010-07-28 18:01:17 +00:00
perl-modules	* Don't use nested lists.	2010-04-01 14:41:51 +00:00
python-modules	pkgs/development/python-modules/pycrypto: enable building of this package on all GNU platforms	2010-07-28 13:10:18 +00:00
ruby-modules
tools	Merging from trunk.	2010-08-02 15:48:19 +00:00