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
..
make-initrd.nix	Fixing the correct handling of uboot in the initrd and the kernel derivations.	2010-02-27 18:51:06 +00:00
make-initrd.sh	Porting changes from stdenv-updates into this branch.	2009-11-08 00:32:12 +00:00
modules-closure.nix	* addCoverageInstrumentation: factor out the code that keeps the build	2009-09-01 21:56:46 +00:00
modules-closure.sh	Synchronized stdenv-updates branch with trunk.	2011-10-06 09:37:22 +00:00
paths-from-graph.pl	* nixSqlite expects another integer (denoting the size of the NAR) in	2011-02-16 11:49:08 +00:00