diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2022-12-31 14:40:13 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2022-12-31 14:48:46 +0100 |
| commit | d4ed8dc3c5743aac6766da0e54e0c969386ed8ac (patch) | |
| tree | adee048d8c34caa3c0ff15a80003bdb0b16956ae | |
| parent | 4046405f73da2fb9b89ca4a3ad455b56b3e826aa (diff) | |
| download | guix-d4ed8dc3c5743aac6766da0e54e0c969386ed8ac.tar guix-d4ed8dc3c5743aac6766da0e54e0c969386ed8ac.tar.gz | |
import/cran: Use multiple values instead of a list of lists.
* guix/import/cran.scm (source-dir->dependencies): Return multiple values.
(description->package): Bind two values.
| -rw-r--r-- | guix/import/cran.scm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/guix/import/cran.scm b/guix/import/cran.scm index e10ada49c7..d33f909369 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -33,6 +33,7 @@ #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) + #:use-module (srfi srfi-71) #:use-module (ice-9 receive) #:use-module (web uri) #:use-module (guix memoization) @@ -473,13 +474,13 @@ the pkg-config tool." "(Makevars.*|configure.*)")) (define (source-dir->dependencies dir) - "Guess dependencies of R package source in DIR and return (INPUTS -NATIVE-INPUTS)." - (list - (if (directory-needs-zlib? dir) '("zlib") '()) - (append - (if (directory-needs-pkg-config? dir) '("pkg-config") '()) - (if (directory-needs-fortran? dir) '("gfortran") '())))) + "Guess dependencies of R package source in DIR and return two values: a list +of package names for INPUTS and another list of names of NATIVE-INPUTS." + (values + (if (directory-needs-zlib? dir) '("zlib") '()) + (append + (if (directory-needs-pkg-config? dir) '("pkg-config") '()) + (if (directory-needs-fortran? dir) '("gfortran") '())))) (define (source->dependencies source tarball?) "SOURCE-DIR->DEPENDENCIES, but for directories and tarballs as indicated @@ -543,9 +544,8 @@ from the alist META, which was derived from the R package's DESCRIPTION file." (hg? 'hg) (else #f)))) (tarball? (not (or git? hg?))) - (source-inputs-all (source->dependencies source tarball?)) - (source-inputs (car source-inputs-all)) - (source-native-inputs (cadr source-inputs-all)) + (source-inputs source-native-inputs + (source->dependencies source tarball?)) (sysdepends (append source-inputs (filter (lambda (name) |