[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/12] import: crate: Add crate updater.
From: |
David Craven |
Subject: |
[PATCH 07/12] import: crate: Add crate updater. |
Date: |
Thu, 22 Sep 2016 15:18:58 +0200 |
* guix/import/crate.scm (crate-package?, latest-release,
%crate-updater): New variables.
* guix/scripts/refresh.scm (%updaters): Add %crate-updater to list of
updaters.
* guix/upstream.scm (package-update): Use a url from the list when the
find2 procedure doesn't find a url sig-url pair.
---
guix/import/crate.scm | 36 +++++++++++++++++++++++++++++++++++-
guix/scripts/refresh.scm | 4 +++-
guix/upstream.scm | 2 +-
3 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/guix/import/crate.scm b/guix/import/crate.scm
index 3cc17f2..5b34330 100644
--- a/guix/import/crate.scm
+++ b/guix/import/crate.scm
@@ -28,7 +28,8 @@
#:use-module (json)
#:use-module (srfi srfi-1)
#:export (crate->guix-package
- guix-package->crate-name))
+ guix-package->crate-name
+ %crate-updater))
(define (crate-fetch name)
"Return an alist representation of the crates.io metadata for the package
NAME,
@@ -89,3 +90,36 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and
LICENSE."
(define (crate-name->package-name name)
(string-append "rust-" name))
+
+(define (crate-package? package)
+ "Return true if PACKAGE is a Rust crate from crates.io."
+
+ (define (crate-url? url)
+ (string-prefix? "https://crates.io/" url))
+
+ (let ((source-url (and=> (package-source package) origin-uri))
+ (fetch-method (and=> (package-source package) origin-method)))
+ (and (eq? fetch-method download:url-fetch)
+ (match source-url
+ ((? string?)
+ (crate-url? source-url))
+ ((source-url ...)
+ (any crate-url? source-url))))))
+
+(define (latest-release package)
+ "Return an <upstream-source> for the latest release of PACKAGE."
+ (let* ((crate-name (guix-package->crate-name package))
+ (metadata (crate-fetch crate-name))
+ (version (assoc-ref* metadata "crate" "max_version"))
+ (url (crate-uri crate-name version)))
+ (upstream-source
+ (package (package-name package))
+ (version version)
+ (urls (list url)))))
+
+(define %crate-updater
+ (upstream-updater
+ (name 'crates)
+ (description "Updater for crates.io packages")
+ (pred crate-package?)
+ (latest latest-release)))
diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm
index b00ac98..3cd5223 100644
--- a/guix/scripts/refresh.scm
+++ b/guix/scripts/refresh.scm
@@ -38,6 +38,7 @@
%xorg-updater))
#:use-module (guix import elpa)
#:use-module (guix import cran)
+ #:use-module (guix import crate)
#:use-module (guix import hackage)
#:use-module (guix gnupg)
#:use-module (gnu packages)
@@ -206,7 +207,8 @@ unavailable optional dependencies such as Guile-JSON."
%hackage-updater
((guix import pypi) => %pypi-updater)
((guix import gem) => %gem-updater)
- ((guix import github) => %github-updater)))
+ ((guix import github) => %github-updater)
+ ((guix import crate) => %crate-updater)))
(define (lookup-updater name)
"Return the updater called NAME."
diff --git a/guix/upstream.scm b/guix/upstream.scm
index 1815737..ac3f72f 100644
--- a/guix/upstream.scm
+++ b/guix/upstream.scm
@@ -194,7 +194,7 @@ and 'interactive' (default)."
(string-suffix? archive-type url))
urls
(or signature-urls (circular-list #f)))))
- (let ((tarball (download-tarball store url signature-url
+ (let ((tarball (download-tarball store (if url url (car urls))
signature-url
#:key-download key-download)))
(values version tarball))))
(#f
--
2.9.0
- [PATCH 01/12] import: Move json-fetch to (guix import utils)., David Craven, 2016/09/22
- [PATCH 03/12] import: Move string->license to importers., David Craven, 2016/09/22
- [PATCH 02/12] import: Reorder imports in (guix import utils)., David Craven, 2016/09/22
- [PATCH 05/12] import: utils: Refactor license->symbol., David Craven, 2016/09/22
- [PATCH 11/12] gnu: Add cargo-bootstrap., David Craven, 2016/09/22
- [PATCH 07/12] import: crate: Add crate updater.,
David Craven <=
- [PATCH 09/12] gnu: Add rust-bootstrap-x86_64-1.12.0., David Craven, 2016/09/22
- [PATCH 12/12] gnu: Add rust helper functions., David Craven, 2016/09/22
- [PATCH 06/12] import: Add importer for rust crates., David Craven, 2016/09/22
- [PATCH 04/12] import: utils: Add spdx-string->license., David Craven, 2016/09/22