--- Begin Message ---
|
Subject: |
[PATCH 1/2] adds the capability of importing a specified version to the crate importer |
|
Date: |
Fri, 6 Sep 2019 11:32:10 -0400 |
---
guix/import/crate.scm | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/guix/import/crate.scm b/guix/import/crate.scm
index f6057dbf8b..3266ebdfec 100644
--- a/guix/import/crate.scm
+++ b/guix/import/crate.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 David Craven <address@hidden>
;;; Copyright © 2019 Ludovic Courtès <address@hidden>
+;;; Copyright © 2019 Martin Becze <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -181,8 +182,8 @@ and LICENSE."
;; This regexp matches that.
(make-regexp "^(.*) OR (.*)$"))
-(define (crate->guix-package crate-name)
- "Fetch the metadata for CRATE-NAME from crates.io, and return the
+(define (crate->guix-package crate-name@version)
+ "Fetch the metadata for CRATE-NAME@VERSION from crates.io, and return the
`package' s-expression corresponding to that package, or #f on failure."
(define (string->license string)
(match (regexp-exec %dual-license-rx string)
@@ -193,13 +194,29 @@ and LICENSE."
(define (normal-dependency? dependency)
(eq? (crate-dependency-kind dependency) 'normal))
+ (define crate-name-version-list
+ (let ((lnv (string-split crate-name@version #\@)))
+ (if (= 1 (length lnv))
+ (append lnv '(#f))
+ lnv)))
+
+ (define crate-name
+ (car crate-name-version-list))
+
+
(define crate
(lookup-crate crate-name))
+ (define crate-version-string
+ (let ((version (cadr crate-name-version-list)))
+ (if version
+ version
+ (crate-latest-version crate))))
+
(and crate
(let* ((version (find (lambda (version)
(string=? (crate-version-number version)
- (crate-latest-version crate)))
+ crate-version-string))
(crate-versions crate)))
(dependencies (crate-version-dependencies version))
(dep-crates (filter normal-dependency? dependencies))
--
2.23.0
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: [bug#37322] [PATCH v2 1/2] added versoining to crate import |
|
Date: |
Tue, 10 Sep 2019 00:38:50 +0200 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) |
Hi Martin,
Martin Becze <address@hidden> skribis:
> ---
> guix/import/crate.scm | 12 +++++++++---
> guix/scripts/import/crate.scm | 10 +++++++++-
> 2 files changed, 18 insertions(+), 4 deletions(-)
Pushed as fd63ecbe050bf8fa7c8ff0a003d56cce97b6ded1. I tweaked quite a
few things, mostly for cosmetic reasons, and added a commit log that
follows our conventions. Please take a look!
Thank you,
Ludo’.
--- End Message ---