mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-06 19:09:27 +01: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 @@ This package also provides @command{xls2csv} to export Excel files to CSV.")
(define r-with-tests (define r-with-tests
(package (package
(name "r-with-tests") (name "r-with-tests")
(version "3.6.3") (version "4.0.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-"
@ -191,7 +191,7 @@ This package also provides @command{xls2csv} to export Excel files to CSV.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"13xaxwfbzj0bd6rn2n27z0n04lb93mcyq991w4vdbbg8v282jc49")))) "0h1995smlyiyhx7gpg9paxsfqrcn6g9bbp5h9r47i6an3clv1gh6"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:disallowed-references (,tzdata-for-tests) `(#:disallowed-references (,tzdata-for-tests)
@ -269,6 +269,11 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\
(("my \\$date = strftime \"%B %Y\", localtime" line) (("my \\$date = strftime \"%B %Y\", localtime" line)
(string-append line " 1")))) (string-append line " 1"))))
#t)) #t))
(add-before 'build 'set-locales
(lambda _
(setlocale LC_ALL "C")
(setenv "LC_ALL" "C")
#t))
(add-before 'configure 'set-default-pager (add-before 'configure 'set-default-pager
;; 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.
@ -322,7 +327,9 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\
("perl" ,perl) ("perl" ,perl)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("texinfo" ,texinfo) ; for building HTML manuals ("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-amsfonts
texlive-latex-base texlive-latex-base
texlive-latex-fancyvrb texlive-latex-fancyvrb
@ -331,7 +338,8 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\
texlive-latex-oberdiek texlive-latex-oberdiek
texlive-latex-tools texlive-latex-tools
texlive-latex-upquote texlive-latex-upquote
texlive-latex-url))) texlive-latex-url
texlive-latex-xkeyval)))
("tzdata" ,tzdata-for-tests) ("tzdata" ,tzdata-for-tests)
("xz" ,xz))) ("xz" ,xz)))
(inputs (inputs
@ -347,7 +355,7 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\
("libpng" ,libpng) ("libpng" ,libpng)
("libtiff" ,libtiff) ("libtiff" ,libtiff)
("libxt" ,libxt) ("libxt" ,libxt)
("pcre" ,pcre) ("pcre2" ,pcre2)
("readline" ,readline) ("readline" ,readline)
;; This avoids a reference to the ungraftable static bash. R uses the ;; This avoids a reference to the ungraftable static bash. R uses the
;; detected shell for the "system" procedure. ;; detected shell for the "system" procedure.