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-minimal: Update to 3.4.0.

Browse source 
* gnu/packages/statistics.scm (r-minimal): Update to 3.4.0.
[arguments]: Set timezone to UTC+1 in "set-timezone" phase to avoid regression
test failure.
This commit is contained in:
Ricardo Wurmus 2017-04-23 20:01:48 +02:00
parent d28fa5cc70
commit a71d769d1e
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gnu/packages/statistics.scm
View file

@ -106,7 +106,7 @@ (define-public pspp
(define-public r-minimal (define-public r-minimal
(package (package
(name "r-minimal") (name "r-minimal")
(version "3.3.3") (version "3.4.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-"
@ -114,7 +114,7 @@ (define-public r-minimal
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0v7wpj89b0i3ad3fi1wak5c93hywmbxv8sdnixhq8l17782nidss")))) "14cb8bwi3akvdb6934kqic2862f2qgav6cq4g0h7gi2p4ka9x3i8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:disallowed-references (,tzdata-2017a) `(#:disallowed-references (,tzdata-2017a)
@ -184,13 +184,15 @@ (define-public r-minimal
;; making "help()" print nothing at all. ;; making "help()" print nothing at all.
(lambda _ (setenv "PAGER" "cat") #t)) (lambda _ (setenv "PAGER" "cat") #t))
(add-before 'check 'set-timezone (add-before 'check 'set-timezone
;; Some tests require the timezone to be set. ;; Some tests require the timezone to be set. However, the
(lambda* (#:key inputs #:allow-other-keys) ;; timezone may not just be "UTC", or else a brittle regression
(setenv "TZ" "UTC") ;; test in reg-tests-1d will fail.
(setenv "TZDIR" (lambda* (#:key inputs #:allow-other-keys)
(string-append (assoc-ref inputs "tzdata") (setenv "TZ" "UTC+1")
"/share/zoneinfo")) (setenv "TZDIR"
#t)) (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