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/misc/emulators/wine/default.nix

@@ -6,21 +6,17 @@
 assert stdenv.isLinux;
 assert stdenv.gcc.gcc != null;
 
-let
-  s = import ./src-for-default.nix;
-in
-
 stdenv.mkDerivation rec {
-  name = "wine-${s.version}";
+  name = "wine-1.3.29";
 
   src = fetchurl {
-    url = s.url;
-    sha256 = s.hash;
+    url = "mirror://sourceforge/wine/${name}.tar.bz2";
+    sha256 = "1mi4xzbpqmian9q5bs6df8b1mfgnnd4mlh0kb2ynbpk7kmx0zyj1";
   };
 
   gecko = fetchurl {
-    url = "http://downloads.sourceforge.net/wine/wine_gecko-1.1.0-x86.cab";
-    sha256 = "0a8bpqqhx146innrdwhn4c0jqi90mkmp8kw6aqwildm073yy31hp";
+    url = "mirror://sourceforge/wine/wine_gecko-1.3-x86.msi";
+    sha256 = "1bmm826dhq82jzxdld4x9cyg8mgzg8llkki59n9fvxggi7l5jxab";
   };
 
   buildInputs = [
@@ -45,7 +41,7 @@ stdenv.mkDerivation rec {
   # elements specified above.
   dontPatchELF = true;
 
-  postInstall = "install -D ${gecko} $out/share/wine/gecko/wine_gecko-1.1.0-x86.cab";
+  postInstall = "install -D ${gecko} $out/share/wine/gecko/${gecko.name}";
 
   enableParallelBuilding = true;
 

pkgs/misc/emulators/wine/src-for-default.nix

@@ -1,9 +0,0 @@
-rec {
-   version="1.3.27";
-   name="wine-1.3.27";
-   hash="1vdyxlsl2zlhlcl5npq59axlkvjmkp7yz5p9rvwkqia79xrs8qv1";
-   url="http://prdownloads.sourceforge.net/wine/wine-${version}.tar.bz2";
-   advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.3.27.tar.bz2";
-  
-  
-}

pkgs/misc/emulators/wine/src-info-for-default.nix

@@ -1,6 +0,0 @@
-{
-  downloadPage = "http://www.winehq.org/";
-  baseName = "wine";
-  versionExtractorSedScript = ''s/[^-]*-(.+)[.]tar[.].*/\1/'';
-  versionReferenceCreator = ''$(replaceAllVersionOccurences)'';
-}