synchronize with trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=30186

pkgs/tools/misc/parallel/default.nix

@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20110822";
+  name = "parallel-20111022";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "0ryj97b9w2mzvmnqhkh384s59v62gf0vlyj8qphiy34505x5pznb";
+    sha256 = "0l9g7lg7avshjm0783abcrcmlmrqkwhzic23lk0jna0nckkd9jhk";
   };
 
   patchPhase =

pkgs/tools/misc/time/default.nix

@@ -8,6 +8,8 @@ stdenv.mkDerivation {
     sha256 = "0va9063fcn7xykv658v2s9gilj2fq4rcdxx2mn2mmy1v4ndafzp3";
   };
 
+  patches = [ ./max-resident.patch ];
+
   meta = {
     description = "GNU Time, a tool that runs programs and summarizes the system resources they use";
 

pkgs/tools/misc/time/max-resident.patch

@@ -0,0 +1,16 @@
+Fix the "max resident" size reported by ‘time’ being off by a factor of 4. 
+
+From http://lists.gnu.org/archive/html/help-gnu-utils/2010-10/msg00002.html
+
+diff -ru -x '*~' time-1.7-orig/time.c time-1.7/time.c
+--- time-1.7-orig/time.c	1996-06-13 15:38:21.000000000 -0400
++++ time-1.7/time.c	2011-10-31 10:40:27.000000000 -0400
+@@ -392,7 +392,7 @@
+ 		       ptok ((UL) resp->ru.ru_ixrss) / MSEC_TO_TICKS (v));
+ 	      break;
+ 	    case 'M':		/* Maximum resident set size.  */
+-	      fprintf (fp, "%lu", ptok ((UL) resp->ru.ru_maxrss));
++              fprintf (fp, "%lu", (UL) resp->ru.ru_maxrss);
+ 	      break;
+ 	    case 'O':		/* Outputs.  */
+ 	      fprintf (fp, "%ld", resp->ru.ru_oublock);