Archived
1
0
Fork 0

gnu: r-with-tests: Drop labels from input lists.

* gnu/packages/statistics.scm (r-with-tests)[native-inputs]: Drop input
labels.
[inputs]: Same.
(r-minimal)[arguments]: Remove lookup of "texlive" package.
This commit is contained in:
Ricardo Wurmus 2022-11-22 18:59:56 +01:00
parent f3004710fa
commit ffe149ccc5
No known key found for this signature in database
GPG key ID: 197A5888235FACAC

View file

@ -366,11 +366,11 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\
;; As the JDK is a rather large input with only very limited effects on R, ;; As the JDK is a rather large input with only very limited effects on R,
;; we decided to drop it. ;; we decided to drop it.
(native-inputs (native-inputs
`(("bzip2" ,bzip2) (list bzip2
("perl" ,perl) perl
("pkg-config" ,pkg-config) pkg-config
("texinfo" ,texinfo) ; for building HTML manuals texinfo ; for building HTML manuals
("texlive" ,(texlive-updmap.cfg (list texlive-ae (texlive-updmap.cfg (list texlive-ae
texlive-inconsolata texlive-inconsolata
texlive-fonts-ec texlive-fonts-ec
texlive-grfext texlive-grfext
@ -383,31 +383,31 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\
texlive-latex-tools texlive-latex-tools
texlive-latex-upquote texlive-latex-upquote
texlive-url texlive-url
texlive-latex-xkeyval))) texlive-latex-xkeyval))
("tzdata" ,tzdata-for-tests) tzdata-for-tests
("xz" ,xz))) xz))
(inputs (inputs
`(;; We need not only cairo here, but pango to ensure that tests for the (list coreutils
curl
openblas
gfortran
icu4c
libjpeg-turbo
libpng
libtiff
libxt
;; We need not only cairo here, but pango to ensure that tests for the
;; "cairo" bitmapType plotting backend succeed. ;; "cairo" bitmapType plotting backend succeed.
("pango" ,pango) pango
("coreutils" ,coreutils) pcre2
("curl" ,curl) readline
("openblas" ,openblas) tcl
("gfortran" ,gfortran) tk
("icu4c" ,icu4c) which
("libjpeg" ,libjpeg-turbo) zlib
("libpng" ,libpng)
("libtiff" ,libtiff)
("libxt" ,libxt)
("pcre2" ,pcre2)
("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.
("bash" ,bash-minimal) bash-minimal))
("tcl" ,tcl)
("tk" ,tk)
("which" ,which)
("zlib" ,zlib)))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
(variable "R_LIBS_SITE") (variable "R_LIBS_SITE")
@ -452,8 +452,6 @@ available, greatly increasing its breadth and scope.")
"|" "|"
(assoc-ref inputs "perl") (assoc-ref inputs "perl")
"|" "|"
(assoc-ref inputs "texlive")
"|"
(assoc-ref inputs "texlive-bin") (assoc-ref inputs "texlive-bin")
"|" "|"
(assoc-ref inputs "texinfo") (assoc-ref inputs "texinfo")