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
..
darwin	Add an expression for Darwin's install_name_tool utility, which is required by several other builds.	2011-03-25 12:55:15 +00:00
gnu	GNU MIG: Add the `noyywrap' option for Flex.	2011-06-18 16:36:17 +00:00
linux	Synchronized stdenv-updates branch with trunk.	2011-10-06 09:37:22 +00:00
windows	Making wxGTK stay wxGTK even cross-built, so I remove the wxMSW code I added	2010-05-06 19:19:22 +00:00