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/crate.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/crate.scm')
| -rw-r--r-- | guix/import/crate.scm | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/guix/import/crate.scm b/guix/import/crate.scm index 84b152620c..9128314370 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -151,16 +151,17 @@ record or #f if it was not found." "Return the `package' s-expression for a rust package with the given NAME, VERSION, CARGO-INPUTS, CARGO-DEVELOPMENT-INPUTS, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE." + (define (format-inputs inputs) + (map + (match-lambda + ((name version) (list (crate-name->package-name name) + (version-major+minor version)))) + inputs)) + (let* ((port (http-fetch (crate-uri name version))) (guix-name (crate-name->package-name name)) - (cargo-inputs - (map - (lambda (name-version) - (apply crate-name->package-name name-version)) cargo-inputs)) - (cargo-development-inputs - (map - (lambda (name-version) - (apply crate-name->package-name name-version)) cargo-development-inputs)) + (cargo-inputs (format-inputs cargo-inputs)) + (cargo-development-inputs (format-inputs cargo-development-inputs)) (pkg `(package (name ,guix-name) (version ,version) |