nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>.
This commit is contained in:
David Craven 2017-01-01 16:14:45 +01:00
parent dc77498c1c
commit f53a5514e0
No known key found for this signature in database
GPG Key ID: C5E051C79C0BECDB
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
guix/import/crate.scm
View File

@ -55,7 +55,8 @@
(crate (assoc-ref crate-json "crate")) (crate (assoc-ref crate-json "crate"))
(name (assoc-ref crate "name")) (name (assoc-ref crate "name"))
(version (assoc-ref crate "max_version")) (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")) (synopsis (assoc-ref crate "description"))
(description (assoc-ref crate "description")) (description (assoc-ref crate "description"))
(license (string->license (assoc-ref crate "license"))) (license (string->license (assoc-ref crate "license")))
@ -67,7 +68,10 @@
(filter (lambda (dep) (filter (lambda (dep)
(not ((crate-kind-predicate "normal") dep))) deps)) (not ((crate-kind-predicate "normal") dep))) deps))
(inputs (crates->inputs input-crates)) (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 (callback #:name name #:version version
#:inputs inputs #:native-inputs native-inputs #:inputs inputs #:native-inputs native-inputs
#:home-page home-page #:synopsis synopsis #: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) (build-system cargo-build-system)
,@(maybe-native-inputs native-inputs) ,@(maybe-native-inputs native-inputs)
,@(maybe-inputs inputs) ,@(maybe-inputs inputs)
(home-page ,home-page) (home-page ,(match home-page
(() "")
(_ home-page)))
(synopsis ,synopsis) (synopsis ,synopsis)
(description ,(beautify-description description)) (description ,(beautify-description description))
(license ,(match license (license ,(match license

1
tests/crate.scm
View File

@ -35,6 +35,7 @@
\"license\": \"MIT/Apache-2.0\", \"license\": \"MIT/Apache-2.0\",
\"description\": \"summary\", \"description\": \"summary\",
\"homepage\": \"http://example.com\", \"homepage\": \"http://example.com\",
\"repository\": \"http://example.com\",
} }
}") }")