futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

import/cran: Use multiple values instead of a list of lists.

Browse Source 
* guix/import/cran.scm (source-dir->dependencies): Return multiple values.
(description->package): Bind two values.
This commit is contained in:
Ricardo Wurmus 2022-12-31 14:40:13 +01:00
parent 4046405f73
commit d4ed8dc3c5
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
guix/import/cran.scm
View File

@ -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)