ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 13:58:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: r: Update to 3.3.0.

Browse source 
* gnu/packages/statistics.scm (r): Update to 3.3.0.
[inputs]: Add curl and tzdata.
[arguments]: Set TZDIR in "set-timezone" phase.
This commit is contained in:
Ricardo Wurmus 2016-05-06 14:44:51 +02:00
parent d33c8b4649
commit e42eb908f6
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/statistics.scm
View file

@ -99,7 +99,7 @@ (define-public pspp
(define-public r (define-public r
(package (package
(name "r") (name "r")
(version "3.2.5") (version "3.3.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://cran/src/base/R-" (uri (string-append "mirror://cran/src/base/R-"
@ -107,7 +107,7 @@ (define-public r
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1dc0iybjk9kr1nghz3fpir6mb9hb9rnrz9bgh00w5pg5vir5cx30")))) "1r0i0cqs3p0vrpiwq0zg5kbrmja9rmaijyzf9f23v6d5n5ab2mlj"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags `(#:make-flags
@ -121,10 +121,14 @@ (define-public r
;; Set default pager to "cat", because otherwise it is "false", ;; Set default pager to "cat", because otherwise it is "false",
;; making "help()" print nothing at all. ;; making "help()" print nothing at all.
(lambda _ (setenv "PAGER" "cat") #t)) (lambda _ (setenv "PAGER" "cat") #t))
(add-before (add-before 'check 'set-timezone
'check 'set-timezone
;; Some tests require the timezone to be set. ;; 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 (add-after 'build 'make-info
(lambda _ (zero? (system* "make" "info")))) (lambda _ (zero? (system* "make" "info"))))
(add-after 'build 'install-info (add-after 'build 'install-info
@ -161,6 +165,8 @@ (define-public r
("xz" ,xz))) ("xz" ,xz)))
(inputs (inputs
`(("cairo" ,cairo) `(("cairo" ,cairo)
("curl" ,curl)
("tzdata" ,tzdata)
("gfortran" ,gfortran) ("gfortran" ,gfortran)
("icu4c" ,icu4c) ("icu4c" ,icu4c)
("libjpeg" ,libjpeg) ("libjpeg" ,libjpeg)