Peter Simons 1abdc56a12 Synchronized stdenv-updates branch with trunk. ... There were conflicting patches of pkgs/os-specific/linux/module-init-tools. Apparently, the expression was updated independently in both branches. I've resolved the conflict by preferring the patches from stdenv-updates, because those patches appeared to be more sophisticated, i.e. they build the manual, etc. svn path=/nixpkgs/branches/stdenv-updates/; revision=29680		2011-10-06 09:37:22 +00:00
..
compilers	Synchronized stdenv-updates branch with trunk.	2011-10-06 09:37:22 +00:00
eclipse
guile-modules
interpreters	Ruby: Separate 'install the current version of ruby' from 'install version x of ruby' when x is also the current version	2011-10-03 15:35:50 +00:00
libraries	Synchronized stdenv-updates branch with trunk.	2011-10-06 09:37:22 +00:00
misc
ocaml-modules
perl-modules	* Updated IO::Compress.	2011-09-16 10:32:37 +00:00
python-modules	* wxPython updated to 2.8.12.0.	2011-09-20 11:19:55 +00:00
ruby-modules
tools	Synchronized stdenv-updates branch with trunk.	2011-10-06 09:37:22 +00:00
web