me/guix
Archived
1
0
Fork 0
Code Activity

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

Browse source 
* 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
1 changed files with 41 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
gnu/packages/statistics.scm
View file

@ -366,48 +366,48 @@ 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
texlive-amsfonts texlive-amsfonts
texlive-latex-base texlive-latex-base
texlive-latex-fancyvrb texlive-latex-fancyvrb
texlive-latex-graphics texlive-latex-graphics
texlive-hyperref texlive-hyperref
texlive-oberdiek texlive-oberdiek
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
;; "cairo" bitmapType plotting backend succeed. curl
("pango" ,pango) openblas
("coreutils" ,coreutils) gfortran
("curl" ,curl) icu4c
("openblas" ,openblas) libjpeg-turbo
("gfortran" ,gfortran) libpng
("icu4c" ,icu4c) libtiff
("libjpeg" ,libjpeg-turbo) libxt
("libpng" ,libpng) ;; We need not only cairo here, but pango to ensure that tests for the
("libtiff" ,libtiff) ;; "cairo" bitmapType plotting backend succeed.
("libxt" ,libxt) pango
("pcre2" ,pcre2) pcre2
("readline" ,readline) readline
;; This avoids a reference to the ungraftable static bash. R uses the tcl
;; detected shell for the "system" procedure. tk
("bash" ,bash-minimal) which
("tcl" ,tcl) zlib
("tk" ,tk) ;; This avoids a reference to the ungraftable static bash. R uses the
("which" ,which) ;; detected shell for the "system" procedure.
("zlib" ,zlib))) bash-minimal))
(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")