me/guix
Archived
1
0
Fork 0
Code Activity

import/cran: Add input style "specification".

Browse source 
* guix/import/cran.scm (%input-style): New parameter.
(format-inputs): Use it.
* guix/scripts/import/cran.scm (guix-import-cran): Set the %input-style
parameter.
 (%options): Add "--style" option.
* doc/guix.texi (Invoking guix import): Document it.
This commit is contained in:
Ricardo Wurmus 2020-12-17 10:40:30 +01:00
parent 08c4dd518a
commit 5f5e3873d7
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
3 changed files with 43 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
doc/guix.texi
View file

@ -11009,6 +11009,13 @@ When @option{--recursive} is added, the importer will traverse the
dependency graph of the given upstream package recursively and generate dependency graph of the given upstream package recursively and generate
package expressions for all those packages that are not yet in Guix. package expressions for all those packages that are not yet in Guix.
When @option{--style=specification} is added, the importer will generate
package definitions whose inputs are package specifications instead of
references to package variables. This is useful when generated package
definitions are to be appended to existing user modules, as the list of
used package modules need not be changed. The default is
@option{--style=variable}.
When @option{--archive=bioconductor} is added, metadata is imported from When @option{--archive=bioconductor} is added, metadata is imported from
@uref{https://www.bioconductor.org/, Bioconductor}, a repository of R @uref{https://www.bioconductor.org/, Bioconductor}, a repository of R
packages for the analysis and comprehension of high-throughput packages for the analysis and comprehension of high-throughput

13
guix/import/cran.scm
View file

@ -51,7 +51,9 @@
#:use-module (guix upstream) #:use-module (guix upstream)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (gnu packages) #:use-module (gnu packages)
#:export (cran->guix-package #:export (%input-style
cran->guix-package
bioconductor->guix-package bioconductor->guix-package
cran-recursive-import cran-recursive-import
%cran-updater %cran-updater
@ -74,6 +76,9 @@
;;; ;;;
;;; Code: ;;; Code:
(define %input-style
(make-parameter 'variable)) ; or 'specification
(define string->license (define string->license
(match-lambda (match-lambda
("AGPL-3" 'agpl3+) ("AGPL-3" 'agpl3+)
@ -128,7 +133,11 @@
(define (format-inputs names) (define (format-inputs names)
"Generate a sorted list of package inputs from a list of package NAMES." "Generate a sorted list of package inputs from a list of package NAMES."
(map (lambda (name) (map (lambda (name)
(list name (list 'unquote (string->symbol name)))) (case (%input-style)
((specification)
(list name (list 'unquote (list 'specification->package name))))
(else
(list name (list 'unquote (string->symbol name))))))
(sort names string-ci<?))) (sort names string-ci<?)))
(define* (maybe-inputs package-inputs #:optional (type 'inputs)) (define* (maybe-inputs package-inputs #:optional (type 'inputs))

45
guix/scripts/import/cran.scm
View file

@ -67,6 +67,10 @@ Import and convert the CRAN package for PACKAGE-NAME.\n"))
(lambda (opt name arg result) (lambda (opt name arg result)
(alist-cons 'repo (string->symbol arg) (alist-cons 'repo (string->symbol arg)
(alist-delete 'repo result)))) (alist-delete 'repo result))))
(option '(#\s "style") #t #f
(lambda (opt name arg result)
(alist-cons 'style (string->symbol arg)
(alist-delete 'style result))))
(option '(#\r "recursive") #f #f (option '(#\r "recursive") #f #f
(lambda (opt name arg result) (lambda (opt name arg result)
(alist-cons 'recursive #t result))) (alist-cons 'recursive #t result)))
@ -93,23 +97,24 @@ Import and convert the CRAN package for PACKAGE-NAME.\n"))
value) value)
(_ #f)) (_ #f))
(reverse opts)))) (reverse opts))))
(match args (parameterize ((%input-style (assoc-ref opts 'style)))
((package-name) (match args
(if (assoc-ref opts 'recursive) ((package-name)
;; Recursive import (if (assoc-ref opts 'recursive)
(with-error-handling ;; Recursive import
(map package->definition (with-error-handling
(filter identity (map package->definition
(cran-recursive-import package-name (filter identity
#:repo (or (assoc-ref opts 'repo) 'cran))))) (cran-recursive-import package-name
;; Single import #:repo (or (assoc-ref opts 'repo) 'cran)))))
(let ((sexp (cran->guix-package package-name ;; Single import
#:repo (or (assoc-ref opts 'repo) 'cran)))) (let ((sexp (cran->guix-package package-name
(unless sexp #:repo (or (assoc-ref opts 'repo) 'cran))))
(leave (G_ "failed to download description for package '~a'~%") (unless sexp
package-name)) (leave (G_ "failed to download description for package '~a'~%")
sexp))) package-name))
(() sexp)))
(leave (G_ "too few arguments~%"))) (()
((many ...) (leave (G_ "too few arguments~%")))
(leave (G_ "too many arguments~%")))))) ((many ...)
(leave (G_ "too many arguments~%")))))))