[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: import: crate: Use repository when home-page is u
From: |
guix-commits |
Subject: |
branch master updated: import: crate: Use repository when home-page is unavailable |
Date: |
Fri, 12 Feb 2021 16:49:59 -0500 |
This is an automated email from the git hooks/post-receive script.
ngz pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new ab512c2 import: crate: Use repository when home-page is unavailable
ab512c2 is described below
commit ab512c2104faf6b39cdbe7a0d11facf61158753f
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
AuthorDate: Fri Feb 12 22:44:35 2021 +0100
import: crate: Use repository when home-page is unavailable
* guix/import/crate.scm (make-crate-sexp): Always use home-page, which is
properly set up by the caller.
(crate->guix-package): Make sure to use the repository when home-page is
null.
---
guix/import/crate.scm | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/guix/import/crate.scm b/guix/import/crate.scm
index aee1b01..287ffd2 100644
--- a/guix/import/crate.scm
+++ b/guix/import/crate.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net>
+;;; Copyright © 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -192,9 +193,7 @@ and LICENSE."
(maybe-cargo-inputs cargo-inputs)
(maybe-cargo-development-inputs
cargo-development-inputs)))
- (home-page ,(match home-page
- ('null "")
- (_ home-page)))
+ (home-page ,home-page)
(synopsis ,synopsis)
(description ,(beautify-description description))
(license ,(match license
@@ -304,8 +303,14 @@ look up the development dependencs for the given crate."
#:version (crate-version-number version*)
#:cargo-inputs cargo-inputs
#:cargo-development-inputs cargo-development-inputs
- #:home-page (or (crate-home-page crate)
- (crate-repository crate))
+ #:home-page
+ (let ((home-page (crate-home-page crate)))
+ (if (string? home-page)
+ home-page
+ (let ((repository (crate-repository crate)))
+ (if (string? repository)
+ repository
+ ""))))
#:synopsis (crate-description crate)
#:description (crate-description crate)
#:license (and=> (crate-version-license version*)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: import: crate: Use repository when home-page is unavailable,
guix-commits <=