Yury G. Kudryashov 2bca92e32d Merge trunk ... Conflicts: 1. cmake upgrade: use 2.8.7 2. openssl: left FreeBSD-asm patch. svn path=/nixpkgs/branches/stdenv-updates/; revision=31245		2012-01-03 17:25:24 +00:00
..
compilers	Merge trunk	2012-01-02 14:12:40 +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	2012-01-03 17:25:24 +00:00
misc
ocaml-modules	Add ocamlnat (native toplevel for OCaml)	2011-12-16 09:35:13 +00:00
perl-modules
python-modules	* PIL updated to 1.1.7.	2011-12-29 16:53:14 +00:00
ruby-modules
tools	Merge trunk	2012-01-03 17:25:24 +00:00
web	upgraded nodejs	2011-12-11 19:38:57 +00:00