nixpkgs/pkgs/os-specific/linux/module-init-tools
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
..
aggregator.nix * Module aggregator: use buildEnv, which is much faster because it 2009-04-20 19:13:40 +00:00
default.nix Synchronized stdenv-updates branch with trunk. 2011-10-06 09:37:22 +00:00
docbook2man.patch module-init-tools: 3.16 2011-10-02 04:03:02 +00:00
module-dir.patch module-init-tools: 3.16 2011-10-02 04:03:02 +00:00