nixpkgs/pkgs/development
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
guile-modules
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
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