diff options
| author | Lancelot SIX <lsix@lancelotsix.com> | 2017-11-08 11:32:44 +0100 |
|---|---|---|
| committer | Lancelot SIX <lsix@lancelotsix.com> | 2017-11-08 11:32:44 +0100 |
| commit | a0c917332024ce08e4a948ea97a1c98f0bc6292d (patch) | |
| tree | 4f7b4a2f834aa1e6d38c92d66946a694f534cc21 /pkgs/tools/misc/time | |
| parent | 27f7999280c1f48885ea886edd4d8355b6f06ac1 (diff) | |
| download | nixpkgs-a0c917332024ce08e4a948ea97a1c98f0bc6292d.tar nixpkgs-a0c917332024ce08e4a948ea97a1c98f0bc6292d.tar.gz nixpkgs-a0c917332024ce08e4a948ea97a1c98f0bc6292d.tar.bz2 nixpkgs-a0c917332024ce08e4a948ea97a1c98f0bc6292d.tar.lz nixpkgs-a0c917332024ce08e4a948ea97a1c98f0bc6292d.tar.xz nixpkgs-a0c917332024ce08e4a948ea97a1c98f0bc6292d.tar.zst nixpkgs-a0c917332024ce08e4a948ea97a1c98f0bc6292d.zip | |
time: 1.7 -> 1.8
See http://lists.gnu.org/archive/html/info-gnu/2017-11/msg00002.html for release information
Diffstat (limited to 'pkgs/tools/misc/time')
| -rw-r--r-- | pkgs/tools/misc/time/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/tools/misc/time/max-resident.patch | 16 |
2 files changed, 6 insertions, 23 deletions
diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix index 911f0ff50bf..cce7614b904 100644 --- a/pkgs/tools/misc/time/default.nix +++ b/pkgs/tools/misc/time/default.nix @@ -1,15 +1,14 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "time-1.7"; +stdenv.mkDerivation rec { + name = "time-${version}"; + version = "1.8"; src = fetchurl { - url = mirror://gnu/time/time-1.7.tar.gz; - sha256 = "0va9063fcn7xykv658v2s9gilj2fq4rcdxx2mn2mmy1v4ndafzp3"; + url = "mirror://gnu/time/${name}.tar.gz"; + sha256 = "06rfg8dn0q2r8pdq8i6brrs6rqrsgvkwbbl4kfx3a6lnal0m8bwa"; }; - patches = [ ./max-resident.patch ]; - meta = { description = "Tool that runs programs and summarizes the system resources they use"; @@ -27,7 +26,7 @@ stdenv.mkDerivation { `time' reports unavailable information as zero values. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/time/; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/misc/time/max-resident.patch b/pkgs/tools/misc/time/max-resident.patch deleted file mode 100644 index e593d833d5e..00000000000 --- a/pkgs/tools/misc/time/max-resident.patch +++ /dev/null @@ -1,16 +0,0 @@ -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); |