ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 23:46:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: r-with-tests, r-minimal: Update to 4.0.0.

Browse source 
* gnu/packages/statistics.scm (r-with-tests, r-minimal): Update to 4.0.0.
(r-with-tests)[arguments]: Add phase "set-locales".
[native-inputs]: Add texlive-ae, texlive-inconsolata, and
texlive-latex-xkeyval to texlive-union.
[inputs]: Replace pcre with pcre2.
This commit is contained in:
Ricardo Wurmus 2020-04-27 14:37:07 +02:00
parent 89909327d0
commit c1dc7858d7
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gnu/packages/statistics.scm
View file

@ -183,7 +183,7 @@ (define-public libxls
(define r-with-tests
(package
(name "r-with-tests")
(version "3.6.3")
(version "4.0.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://cran/src/base/R-"
@ -191,7 +191,7 @@ (define r-with-tests
version ".tar.gz"))
(sha256
(base32
"13xaxwfbzj0bd6rn2n27z0n04lb93mcyq991w4vdbbg8v282jc49"))))
"0h1995smlyiyhx7gpg9paxsfqrcn6g9bbp5h9r47i6an3clv1gh6"))))
(build-system gnu-build-system)
(arguments
`(#:disallowed-references (,tzdata-for-tests)
@ -269,6 +269,11 @@ (define r-with-tests
(("my \\$date = strftime \"%B %Y\", localtime" line)
(string-append line " 1"))))
#t))
(add-before 'build 'set-locales
(lambda _
(setlocale LC_ALL "C")
(setenv "LC_ALL" "C")
#t))
(add-before 'configure 'set-default-pager
;; Set default pager to "cat", because otherwise it is "false",
;; making "help()" print nothing at all.
@ -322,7 +327,9 @@ (define r-with-tests
("perl" ,perl)
("pkg-config" ,pkg-config)
("texinfo" ,texinfo) ; for building HTML manuals
("texlive" ,(texlive-union (list texlive-fonts-ec
("texlive" ,(texlive-union (list texlive-ae
texlive-inconsolata
texlive-fonts-ec
texlive-amsfonts
texlive-latex-base
texlive-latex-fancyvrb
@ -331,7 +338,8 @@ (define r-with-tests
texlive-latex-oberdiek
texlive-latex-tools
texlive-latex-upquote
texlive-latex-url)))
texlive-latex-url
texlive-latex-xkeyval)))
("tzdata" ,tzdata-for-tests)
("xz" ,xz)))
(inputs
@ -347,7 +355,7 @@ (define r-with-tests
("libpng" ,libpng)
("libtiff" ,libtiff)
("libxt" ,libxt)
("pcre" ,pcre)
("pcre2" ,pcre2)
("readline" ,readline)
;; This avoids a reference to the ungraftable static bash. R uses the
;; detected shell for the "system" procedure.