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

pkgs/os-specific/linux/module-init-tools/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, docbook2x}:
 
 stdenv.mkDerivation {
   name = "module-init-tools-3.16";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
     })
   ];
 
-  patches = [./module-dir.patch];
+  patches = [ ./module-dir.patch ./docbook2man.patch ];
 
   postInstall = "rm $out/sbin/insmod.static"; # don't need it
 

pkgs/os-specific/linux/module-init-tools/docbook2man.patch

@@ -0,0 +1,12 @@
+diff -Naur module-init-tools-3.16-orig/Makefile.in module-init-tools-3.16/Makefile.in
+--- module-init-tools-3.16-orig/Makefile.in	2011-06-02 13:56:45.000000000 -0400
++++ module-init-tools-3.16/Makefile.in	2011-10-01 23:59:30.584443193 -0400
+@@ -174,7 +174,7 @@
+ CYGPATH_W = @CYGPATH_W@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOCBOOKTOMAN = @DOCBOOKTOMAN@
++DOCBOOKTOMAN = @DOCBOOKTOMAN@ --sgml
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@