[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/08: import: utils: Trim patch version from names.
|
From: |
guix-commits |
|
Subject: |
06/08: import: utils: Trim patch version from names. |
|
Date: |
Wed, 2 Dec 2020 16:10:11 -0500 (EST) |
htgoebel pushed a commit to branch master
in repository guix.
commit 9a48e35be853e10ba9b21bb91ef52a66b4264c84
Author: Hartmut Goebel <h.goebel@crazy-compilers.com>
AuthorDate: Sat Nov 14 19:47:32 2020 +0100
import: utils: Trim patch version from names.
This remove the patch version from generated package names. For example
'rust-my-crate-1.1.2' now becomes 'rust-my-crate-1.1'.
* guix/import/utils.scm (package->definition): Trim patch version from
generated package names.
* tests/crate.scm: (cargo>guix-package, cargo-recursive-import): Likewise.
---
guix/import/crate.scm | 3 ++-
guix/import/utils.scm | 7 ++++---
tests/crate.scm | 30 +++++++++++++++---------------
3 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/guix/import/crate.scm b/guix/import/crate.scm
index 9704b30..20efa13 100644
--- a/guix/import/crate.scm
+++ b/guix/import/crate.scm
@@ -159,7 +159,8 @@ and LICENSE."
(map
(match-lambda
((name version)
- (list (crate-name->package-name name) version)))
+ (list (crate-name->package-name name)
+ (version-major+minor version))))
inputs))
(let* ((port (http-fetch (crate-uri name version)))
diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index 10eb030..b74393e 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -269,9 +269,10 @@ package definition."
('package ('name name) ('version version) . rest)
('let _ ('package ('name name) ('version version) . rest)))
- `(define-public ,(string->symbol (if append-version?
- (string-append name "-" version)
- version))
+ `(define-public ,(string->symbol
+ (if append-version?
+ (string-append name "-" (version-major+minor
version))
+ version))
,guix-package))))
(define (build-system-modules)
diff --git a/tests/crate.scm b/tests/crate.scm
index b6cd577..3fbf676 100644
--- a/tests/crate.scm
+++ b/tests/crate.scm
@@ -352,7 +352,7 @@
(_ (error "Unexpected URL: " url)))))
(match (crate->guix-package "foo")
- ((define-public 'rust-foo-1.0.3
+ ((define-public 'rust-foo-1.0
(package (name "rust-foo")
(version "1.0.3")
(source
@@ -369,7 +369,7 @@
(#:skip-build? #t
#:cargo-inputs
(("rust-leaf-alice"
- ('unquote 'rust-leaf-alice-0.7.5))))))
+ ('unquote 'rust-leaf-alice-0.7))))))
(home-page "http://example.com";)
(synopsis "summary")
(description "summary")
@@ -433,7 +433,7 @@
(match (crate-recursive-import "root")
;; rust-intermediate-b has no dependency on the rust-leaf-alice
;; package, so this is a valid ordering
- (((define-public 'rust-leaf-alice-0.7.5
+ (((define-public 'rust-leaf-alice-0.7
(package
(name "rust-leaf-alice")
(version "0.7.5")
@@ -452,7 +452,7 @@
(synopsis "summary")
(description "summary")
(license (list license:expat license:asl2.0))))
- (define-public 'rust-leaf-bob-3.0.1
+ (define-public 'rust-leaf-bob-3.0
(package
(name "rust-leaf-bob")
(version "3.0.1")
@@ -471,7 +471,7 @@
(synopsis "summary")
(description "summary")
(license (list license:expat license:asl2.0))))
- (define-public 'rust-intermediate-b-1.2.3
+ (define-public 'rust-intermediate-b-1.2
(package
(name "rust-intermediate-b")
(version "1.2.3")
@@ -489,12 +489,12 @@
('quasiquote (#:skip-build? #t
#:cargo-inputs
(("rust-leaf-bob"
- ('unquote 'rust-leaf-bob-3.0.1))))))
+ ('unquote 'rust-leaf-bob-3.0))))))
(home-page "http://example.com";)
(synopsis "summary")
(description "summary")
(license (list license:expat license:asl2.0))))
- (define-public 'rust-intermediate-a-1.0.42
+ (define-public 'rust-intermediate-a-1.0
(package
(name "rust-intermediate-a")
(version "1.0.42")
@@ -512,16 +512,16 @@
('quasiquote (#:skip-build? #t
#:cargo-inputs
(("rust-intermediate-b"
- ('unquote 'rust-intermediate-b-1.2.3))
+ ('unquote 'rust-intermediate-b-1.2))
("rust-leaf-alice"
- ('unquote 'rust-leaf-alice-0.7.5))
+ ('unquote 'rust-leaf-alice-0.7))
("rust-leaf-bob"
- ('unquote 'rust-leaf-bob-3.0.1))))))
+ ('unquote 'rust-leaf-bob-3.0))))))
(home-page "http://example.com";)
(synopsis "summary")
(description "summary")
(license (list license:expat license:asl2.0))))
- (define-public 'rust-root-1.0.4
+ (define-public 'rust-root-1.0
(package
(name "rust-root")
(version "1.0.4")
@@ -538,13 +538,13 @@
(arguments
('quasiquote (#:cargo-inputs
(("rust-intermediate-a"
- ('unquote 'rust-intermediate-a-1.0.42))
+ ('unquote 'rust-intermediate-a-1.0))
("rust-intermediate-b"
- ('unquote 'rust-intermediate-b-1.2.3))
+ ('unquote 'rust-intermediate-b-1.2))
("rust-leaf-alice"
- ('unquote 'rust-leaf-alice-0.7.5))
+ ('unquote 'rust-leaf-alice-0.7))
("rust-leaf-bob"
- ('unquote 'rust-leaf-bob-3.0.1))))))
+ ('unquote 'rust-leaf-bob-3.0))))))
(home-page "http://example.com";)
(synopsis "summary")
(description "summary")
- branch master updated (9a1b112 -> 054e308), guix-commits, 2020/12/02
- 03/08: import: crate: Use guile-semver to resolve module versions., guix-commits, 2020/12/02
- 04/08: import: crate: Memorize crate->guix-package., guix-commits, 2020/12/02
- 07/08: import: crate: Trim version for names after left-most non-zero part., guix-commits, 2020/12/02
- 06/08: import: utils: Trim patch version from names.,
guix-commits <=
- 05/08: import: crate: Parameterized importing of dev dependencies., guix-commits, 2020/12/02
- 08/08: import: crate: Use existing package satisfying semver requirement., guix-commits, 2020/12/02
- 02/08: import: utils: 'recursive-import' accepts an optional version parameter., guix-commits, 2020/12/02
- 01/08: guix: self: Add guile-semver as a depenedency., guix-commits, 2020/12/02