diff options
| author | David Craven <david@craven.ch> | 2017-01-01 16:14:45 +0100 |
|---|---|---|
| committer | David Craven <david@craven.ch> | 2017-01-01 18:12:06 +0100 |
| commit | f53a5514e0e9535d2e7c668803e64b4aac17da2b (patch) | |
| tree | c4901add490da99bfd21a7583c13b40e96604b52 | |
| parent | dc77498c1c6e3aaef9aae1cac189e6d9db470952 (diff) | |
| download | guix-f53a5514e0e9535d2e7c668803e64b4aac17da2b.tar guix-f53a5514e0e9535d2e7c668803e64b4aac17da2b.tar.gz | |
import: crate: Provide a default home-page value.
* guix/import/crate.scm (make-crate-sexp): Provide a default home-page
value.
* tests/crate.scm (test-crate): Add repository field.
Problem reported by ng0 <ng0@libertad.pw>.
| -rw-r--r-- | guix/import/crate.scm | 12 | ||||
| -rw-r--r-- | tests/crate.scm | 1 |
2 files changed, 10 insertions, 3 deletions
diff --git a/guix/import/crate.scm b/guix/import/crate.scm index 3a19fc70cf..33cc6104c5 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -55,7 +55,8 @@ (crate (assoc-ref crate-json "crate")) (name (assoc-ref crate "name")) (version (assoc-ref crate "max_version")) - (home-page (assoc-ref crate "homepage")) + (homepage (assoc-ref crate "homepage")) + (repository (assoc-ref crate "repository")) (synopsis (assoc-ref crate "description")) (description (assoc-ref crate "description")) (license (string->license (assoc-ref crate "license"))) @@ -67,7 +68,10 @@ (filter (lambda (dep) (not ((crate-kind-predicate "normal") dep))) deps)) (inputs (crates->inputs input-crates)) - (native-inputs (crates->inputs native-input-crates))) + (native-inputs (crates->inputs native-input-crates)) + (home-page (match homepage + (() repository) + (_ homepage)))) (callback #:name name #:version version #:inputs inputs #:native-inputs native-inputs #:home-page home-page #:synopsis synopsis @@ -95,7 +99,9 @@ VERSION, INPUTS, NATIVE-INPUTS, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE." (build-system cargo-build-system) ,@(maybe-native-inputs native-inputs) ,@(maybe-inputs inputs) - (home-page ,home-page) + (home-page ,(match home-page + (() "") + (_ home-page))) (synopsis ,synopsis) (description ,(beautify-description description)) (license ,(match license diff --git a/tests/crate.scm b/tests/crate.scm index 18d5f72a8c..6f6fc2bc29 100644 --- a/tests/crate.scm +++ b/tests/crate.scm @@ -35,6 +35,7 @@ \"license\": \"MIT/Apache-2.0\", \"description\": \"summary\", \"homepage\": \"http://example.com\", + \"repository\": \"http://example.com\", } }") |