[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
446/449: gnu: r-with-tests: Drop labels from input lists.
From: |
guix-commits |
Subject: |
446/449: gnu: r-with-tests: Drop labels from input lists. |
Date: |
Tue, 22 Nov 2022 15:48:11 -0500 (EST) |
rekado pushed a commit to branch wip-bioconductor
in repository guix.
commit 7a47a0c149b1959c9bbded6edf68deb2f891916c
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Tue Nov 22 18:59:56 2022 +0100
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.
---
gnu/packages/statistics.scm | 84 ++++++++++++++++++++++-----------------------
1 file changed, 41 insertions(+), 43 deletions(-)
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index a26f72ebab..23feceb6ed 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -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,
;; we decided to drop it.
(native-inputs
- `(("bzip2" ,bzip2)
- ("perl" ,perl)
- ("pkg-config" ,pkg-config)
- ("texinfo" ,texinfo) ; for building HTML manuals
- ("texlive" ,(texlive-updmap.cfg (list texlive-ae
- texlive-inconsolata
- texlive-fonts-ec
- texlive-grfext
- texlive-amsfonts
- texlive-latex-base
- texlive-latex-fancyvrb
- texlive-latex-graphics
- texlive-hyperref
- texlive-oberdiek
- texlive-latex-tools
- texlive-latex-upquote
- texlive-url
- texlive-latex-xkeyval)))
- ("tzdata" ,tzdata-for-tests)
- ("xz" ,xz)))
+ (list bzip2
+ perl
+ pkg-config
+ texinfo ; for building HTML manuals
+ (texlive-updmap.cfg (list texlive-ae
+ texlive-inconsolata
+ texlive-fonts-ec
+ texlive-grfext
+ texlive-amsfonts
+ texlive-latex-base
+ texlive-latex-fancyvrb
+ texlive-latex-graphics
+ texlive-hyperref
+ texlive-oberdiek
+ texlive-latex-tools
+ texlive-latex-upquote
+ texlive-url
+ texlive-latex-xkeyval))
+ tzdata-for-tests
+ xz))
(inputs
- `(;; We need not only cairo here, but pango to ensure that tests for the
- ;; "cairo" bitmapType plotting backend succeed.
- ("pango" ,pango)
- ("coreutils" ,coreutils)
- ("curl" ,curl)
- ("openblas" ,openblas)
- ("gfortran" ,gfortran)
- ("icu4c" ,icu4c)
- ("libjpeg" ,libjpeg-turbo)
- ("libpng" ,libpng)
- ("libtiff" ,libtiff)
- ("libxt" ,libxt)
- ("pcre2" ,pcre2)
- ("readline" ,readline)
- ;; This avoids a reference to the ungraftable static bash. R uses the
- ;; detected shell for the "system" procedure.
- ("bash" ,bash-minimal)
- ("tcl" ,tcl)
- ("tk" ,tk)
- ("which" ,which)
- ("zlib" ,zlib)))
+ (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.
+ pango
+ pcre2
+ readline
+ tcl
+ tk
+ which
+ zlib
+ ;; This avoids a reference to the ungraftable static bash. R uses
the
+ ;; detected shell for the "system" procedure.
+ bash-minimal))
(native-search-paths
(list (search-path-specification
(variable "R_LIBS_SITE")
@@ -452,8 +452,6 @@ available, greatly increasing its breadth and scope.")
"|"
(assoc-ref inputs "perl")
"|"
- (assoc-ref inputs "texlive")
- "|"
(assoc-ref inputs "texlive-bin")
"|"
(assoc-ref inputs "texinfo")
- 433/449: gnu: r-biotip: Update to 1.12.0., (continued)
- 433/449: gnu: r-biotip: Update to 1.12.0., guix-commits, 2022/11/22
- 434/449: gnu: r-biotmle: Update to 1.22.0., guix-commits, 2022/11/22
- 425/449: gnu: r-biomformat: Update to 1.26.0., guix-commits, 2022/11/22
- 436/449: gnu: r-dada2: Update to 1.26.0., guix-commits, 2022/11/22
- 437/449: gnu: r-dmrseq: Update to 1.18.0., guix-commits, 2022/11/22
- 438/449: gnu: r-omicade4: Update to 1.38.0., guix-commits, 2022/11/22
- 443/449: gnu: r-tximeta: Update to 1.16.0., guix-commits, 2022/11/22
- 444/449: gnu: r-phyloseq: Update to 1.42.0., guix-commits, 2022/11/22
- 445/449: gnu: r-ggtern: Update to 3.4.0., guix-commits, 2022/11/22
- 440/449: gnu: r-biscuiteer: Update to 1.12.0., guix-commits, 2022/11/22
- 446/449: gnu: r-with-tests: Drop labels from input lists.,
guix-commits <=
- 449/449: gnu: r-minimal: Simplify build phase., guix-commits, 2022/11/22
- 201/449: gnu: r-dnabarcodes: Update to 1.28.0., guix-commits, 2022/11/22
- 211/449: gnu: r-chipexoqual: Update to 1.22.0., guix-commits, 2022/11/22
- 224/449: gnu: r-scdd: Update to 1.22.0., guix-commits, 2022/11/22
- 233/449: gnu: r-methylumi: Update to 2.44.0., guix-commits, 2022/11/22
- 238/449: gnu: r-varianttools: Update to 1.40.0., guix-commits, 2022/11/22
- 262/449: gnu: r-motifstack: Update to 1.42.0., guix-commits, 2022/11/22
- 266/449: gnu: r-annotationtools: Update to 1.72.0., guix-commits, 2022/11/22
- 282/449: gnu: r-wiggleplotr: Update to 1.22.0., guix-commits, 2022/11/22
- 291/449: gnu: r-iclusterplus: Update to 1.34.0., guix-commits, 2022/11/22