diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-10-31 14:44:32 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-10-31 14:44:32 +0000 |
| commit | bd5e996e20abbcbf98c0f77748c83a654e9784a2 (patch) | |
| tree | c57d47468e5743e5dc20753b99c3005807a947aa /pkgs/tools/misc/time | |
| parent | e15db25ff3a8b96fdab929be4f3dde0d89d4d954 (diff) | |
| download | nixpkgs-bd5e996e20abbcbf98c0f77748c83a654e9784a2.tar nixpkgs-bd5e996e20abbcbf98c0f77748c83a654e9784a2.tar.gz nixpkgs-bd5e996e20abbcbf98c0f77748c83a654e9784a2.tar.bz2 nixpkgs-bd5e996e20abbcbf98c0f77748c83a654e9784a2.tar.lz nixpkgs-bd5e996e20abbcbf98c0f77748c83a654e9784a2.tar.xz nixpkgs-bd5e996e20abbcbf98c0f77748c83a654e9784a2.tar.zst nixpkgs-bd5e996e20abbcbf98c0f77748c83a654e9784a2.zip | |
* Apply a patch to fix the "max resident" size reported by ‘time’
being off by a factor of 4. (The most recent release of ‘time’ is from 1996 BTW...) svn path=/nixpkgs/trunk/; revision=30143
Diffstat (limited to 'pkgs/tools/misc/time')
| -rw-r--r-- | pkgs/tools/misc/time/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/time/max-resident.patch | 16 |
2 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix index 658afb37c03..05ab7cc7ae7 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 00000000000..e593d833d5e --- /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); |