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	update ecj version	2010-11-22 14:50:52 +00:00
guile-modules	Guile-Cairo 1.4.1.	2011-04-23 21:15:06 +00:00
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	Updating avr-gcc and avr-libc (old link is inaccessible)	2011-08-23 07:56:34 +00:00
ocaml-modules	Oops	2011-07-22 07:39:14 +00:00
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	Rake: Fix build. Patch by Ilya Cassina.	2010-10-26 01:15:42 +00:00
tools	Synchronized stdenv-updates branch with trunk.	2011-10-06 09:37:22 +00:00
web	Adding csslint, this uses node as an interpreter. It detects problems in CSS files.	2011-08-21 21:34:17 +00:00