diff options
| author | Peter Simons <simons@cryp.to> | 2011-11-02 10:28:32 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2011-11-02 10:28:32 +0000 |
| commit | 69488d688d18c3b7fe8ed1e18f3fab6c968eae07 (patch) | |
| tree | cca01a305e045e6f60868a924ae2ca140a798f0c /pkgs/tools/misc | |
| parent | 4d0d7d78c5f116c59cd2736d55a5928981be5dc7 (diff) | |
| parent | c882363fceb87f8f0af915f474bea014475488ea (diff) | |
synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=30186
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/parallel/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/time/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/time/max-resident.patch | 16 |
3 files changed, 20 insertions, 2 deletions
diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index f9a35b235fc98..c104bf752fe14 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/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 = diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix index 658afb37c035c..05ab7cc7ae70b 100644 --- a/pkgs/tools/misc/time/default.nix +++ b/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"; diff --git a/pkgs/tools/misc/time/max-resident.patch b/pkgs/tools/misc/time/max-resident.patch new file mode 100644 index 0000000000000..e593d833d5e49 --- /dev/null +++ b/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); |