diff options
author | Martin Becze <mjbecze@riseup.net> | 2020-02-04 07:18:21 -0500 |
---|---|---|
committer | Guix Patches Tester <> | 2020-02-04 12:22:08 +0000 |
commit | 47e9191ae02647f427c2f014f02bc50f52bf7a53 (patch) | |
tree | 101c47cac6db86b6474ef76be00724b93f0c64af /guix/import/utils.scm | |
parent | d7b48592b432a81d39401f5e9edac5df052a1213 (diff) | |
download | patches-47e9191ae02647f427c2f014f02bc50f52bf7a53.tar patches-47e9191ae02647f427c2f014f02bc50f52bf7a53.tar.gz |
guix: import: utils: allow generation of inputs to be version aware
* guix/import/utils.scm (package-names->package-inputs): Added the ability to
handle (name version) pairs
* guix/import/crate.scm (make-crate-sexp): cleaned up input field generation
Diffstat (limited to 'guix/import/utils.scm')
-rw-r--r-- | guix/import/utils.scm | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 59430d3e66..518877d476 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -233,13 +233,20 @@ into a proper sentence and by using two spaces between sentences." cleaned 'pre ". " 'post))) (define* (package-names->package-inputs names #:optional (output #f)) - "Given a list of PACKAGE-NAMES, and an optional OUTPUT, tries to generate a -quoted list of inputs, as suitable to use in an 'inputs' field of a package -definition." - (map (lambda (input) - (cons* input (list 'unquote (string->symbol input)) - (or (and output (list output)) - '()))) + "Given a list of PACKAGE-NAMES or (PACKAGE-NAME VERSION) pairs, and an +optional OUTPUT, tries to generate a quoted list of inputs, as suitable to +use in an 'inputs' field of a package definition." + (define (make-input input version) + (cons* input (list 'unquote (string->symbol + (if version + (string-append input "-" version) + input))) + (or (and output (list output)) + '()))) + + (map (match-lambda + ((input version) (make-input input version)) + (input (make-input input #f))) names)) (define* (maybe-inputs package-names #:optional (output #f)) |