Yury G. Kudryashov a670a7aca1 merge trunk ...

A few conflicts due to renames

svn path=/nixpkgs/branches/stdenv-updates/; revision=30947

2011-12-16 22:57:21 +00:00

..

compilers

merge trunk

2011-12-16 22:57:21 +00:00

eclipse

…

guile-modules

…

interpreters

svn merge https://nixos.org/repos/nix/nixpkgs/trunk

2011-12-15 19:16:38 +00:00

libraries

merge trunk

2011-12-16 22:57:21 +00:00

misc

…

ocaml-modules

Add ocamlnat (native toplevel for OCaml)

2011-12-16 09:35:13 +00:00

perl-modules

…

python-modules

…

ruby-modules

…

tools

merge trunk

2011-12-16 22:57:21 +00:00

web

upgraded nodejs

2011-12-11 19:38:57 +00:00