diff options
| author | Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> | 2016-05-06 14:44:51 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> | 2016-05-06 14:58:19 +0200 |
| commit | e42eb908f6133c4c192b4a4ff17d52a4819c2a2e (patch) | |
| tree | 81205879c8edbeb953d59215aa4e1d5724f6f1e4 | |
| parent | d33c8b464915fb9bbe07434116fd6f3428e8cef0 (diff) | |
| download | guix-e42eb908f6133c4c192b4a4ff17d52a4819c2a2e.tar.gz guix-e42eb908f6133c4c192b4a4ff17d52a4819c2a2e.zip | |
gnu: r: Update to 3.3.0.
* gnu/packages/statistics.scm (r): Update to 3.3.0.
[inputs]: Add curl and tzdata.
[arguments]: Set TZDIR in "set-timezone" phase.
| -rw-r--r-- | gnu/packages/statistics.scm | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 90dc4144ef..04274f279a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -99,7 +99,7 @@ be output in text, PostScript, PDF or HTML.") (define-public r (package (name "r") - (version "3.2.5") + (version "3.3.0") (source (origin (method url-fetch) (uri (string-append "mirror://cran/src/base/R-" @@ -107,7 +107,7 @@ be output in text, PostScript, PDF or HTML.") version ".tar.gz")) (sha256 (base32 - "1dc0iybjk9kr1nghz3fpir6mb9hb9rnrz9bgh00w5pg5vir5cx30")))) + "1r0i0cqs3p0vrpiwq0zg5kbrmja9rmaijyzf9f23v6d5n5ab2mlj")))) (build-system gnu-build-system) (arguments `(#:make-flags @@ -121,10 +121,14 @@ be output in text, PostScript, PDF or HTML.") ;; Set default pager to "cat", because otherwise it is "false", ;; making "help()" print nothing at all. (lambda _ (setenv "PAGER" "cat") #t)) - (add-before - 'check 'set-timezone + (add-before 'check 'set-timezone ;; Some tests require the timezone to be set. - (lambda _ (setenv "TZ" "UTC") #t)) + (lambda* (#:key inputs #:allow-other-keys) + (setenv "TZ" "UTC") + (setenv "TZDIR" + (string-append (assoc-ref inputs "tzdata") + "/share/zoneinfo")) + #t)) (add-after 'build 'make-info (lambda _ (zero? (system* "make" "info")))) (add-after 'build 'install-info @@ -161,6 +165,8 @@ be output in text, PostScript, PDF or HTML.") ("xz" ,xz))) (inputs `(("cairo" ,cairo) + ("curl" ,curl) + ("tzdata" ,tzdata) ("gfortran" ,gfortran) ("icu4c" ,icu4c) ("libjpeg" ,libjpeg) |