[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/09: import: utils: Trim patch version from names.
|
From: |
guix-commits |
|
Subject: |
04/09: import: utils: Trim patch version from names. |
|
Date: |
Sun, 5 Apr 2020 13:36:21 -0400 (EDT) |
lfam pushed a commit to branch wip-rav1e
in repository guix.
commit 2524b98cbd6e693a5cd966daa3950a928b5d25c3
Author: Martin Becze <address@hidden>
AuthorDate: Thu Jan 30 11:19:13 2020 -0500
import: utils: Trim patch version from names.
This remove the the patch version from input 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): Likewise.
(cargo-recursive-import): Likewise.
Signed-off-by: Leo Famulari <address@hidden>
---
guix/import/utils.scm | 7 ++++---
tests/crate.scm | 44 ++++++++++++++++++++++----------------------
2 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index 709cd71..a0aacdc 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -265,9 +265,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 39561d5..893dd70 100644
--- a/tests/crate.scm
+++ b/tests/crate.scm
@@ -279,7 +279,7 @@
(_ (error "Unexpected URL: " url)))))
(match (crate->guix-package "foo")
- ((define-public rust-foo-1.0.0
+ ((define-public rust-foo-1.0
(package (name "rust-foo")
(version "1.0.0")
(source
@@ -295,7 +295,7 @@
('quasiquote
(#:skip-build? #t
#:cargo-inputs
- (("rust-leaf-alice-1.0.0" ('unquote
rust-leaf-alice-1.0.0))))))
+ (("rust-leaf-alice" ('unquote
rust-leaf-alice-1.0))))))
(home-page "http://example.com";)
(synopsis "summary")
(description "summary")
@@ -358,7 +358,7 @@
(_ (error "Unexpected URL: " url)))))
(match (crate-recursive-import "root")
;; rust-intermediate-2 has no dependency on the rust-leaf-alice
package, so this is a valid ordering
- (((define-public rust-leaf-alice-1.0.0
+ (((define-public rust-leaf-alice-1.0
(package
(name "rust-leaf-alice")
(version (? string? ver))
@@ -377,7 +377,7 @@
(synopsis "summary")
(description "summary")
(license (list license:expat license:asl2.0))))
- (define-public rust-leaf-bob-1.0.0
+ (define-public rust-leaf-bob-1.0
(package
(name "rust-leaf-bob")
(version (? string? ver))
@@ -396,7 +396,7 @@
(synopsis "summary")
(description "summary")
(license (list license:expat license:asl2.0))))
- (define-public rust-intermediate-2-1.0.0
+ (define-public rust-intermediate-2-1.0
(package
(name "rust-intermediate-2")
(version (? string? ver))
@@ -413,13 +413,13 @@
(arguments
('quasiquote (#:skip-build? #t
#:cargo-inputs
- (("rust-leaf-bob-1.0.0"
+ (("rust-leaf-bob"
('unquote rust-leaf-bob-1.0.0))))))
(home-page "http://example.com";)
(synopsis "summary")
(description "summary")
(license (list license:expat license:asl2.0))))
- (define-public rust-intermediate-1-1.0.0
+ (define-public rust-intermediate-1-1.0
(package
(name "rust-intermediate-1")
(version (? string? ver))
@@ -436,17 +436,17 @@
(arguments
('quasiquote (#:skip-build? #t
#:cargo-inputs
- (("rust-intermediate-2-1.0.0"
- ,rust-intermediate-2-1.0.0)
- ("rust-leaf-alice-1.0.0"
- ('unquote rust-leaf-alice-1.0.0))
- ("rust-leaf-bob-1.0.0"
- ('unquote rust-leaf-bob-1.0.0))))))
+ (("rust-intermediate-2"
+ ,rust-intermediate-2-1.0)
+ ("rust-leaf-alice"
+ ('unquote rust-leaf-alice-1.0))
+ ("rust-leaf-bob"
+ ('unquote rust-leaf-bob-1.0))))))
(home-page "http://example.com";)
(synopsis "summary")
(description "summary")
(license (list license:expat license:asl2.0))))
- (define-public rust-root-1.0.0
+ (define-public rust-root-1.0
(package
(name "rust-root")
(version (? string? ver))
@@ -463,14 +463,14 @@
(arguments
('quasiquote (#:skip-build?
#t #:cargo-inputs
- (("rust-intermediate-1-1.0.0"
- ('unquote rust-intermediate-1-1.0.0))
- ("rust-intermediate-2-1.0.0"
- ('unquote rust-intermediate-2-1.0.0))
- ("rust-leaf-alice-1.0.0"
- ('unquote rust-leaf-alice-1.0.0))
- ("rust-leaf-bob-1.0.0"
- ('unquote rust-leaf-bob-1.0.0))))))
+ (("rust-intermediate-1"
+ ('unquote rust-intermediate-1-1.0))
+ ("rust-intermediate-2"
+ ('unquote rust-intermediate-2-1.0))
+ ("rust-leaf-alice"
+ ('unquote rust-leaf-alice-1.0))
+ ("rust-leaf-bob"
+ ('unquote rust-leaf-bob-1.0))))))
(home-page "http://example.com";)
(synopsis "summary")
(description "summary")
- branch wip-rav1e created (now 4654f56), guix-commits, 2020/04/05
- 01/09: import: utils: 'recursive-import' accepts an optional version parameter., guix-commits, 2020/04/05
- 05/09: import: crate: Parametrized importing of dev dependencies., guix-commits, 2020/04/05
- 06/09: guix: self: Adds guile-semver as a depenedency., guix-commits, 2020/04/05
- 03/09: import: crate: Memorize crate->guix-package., guix-commits, 2020/04/05
- 04/09: import: utils: Trim patch version from names.,
guix-commits <=
- 02/09: import: crate: Use guile-semver to resolve module versions., guix-commits, 2020/04/05
- 08/09: gnu: Support rav1e in FFmpeg., guix-commits, 2020/04/05
- 07/09: gnu: Add rav1e., guix-commits, 2020/04/05
- 09/09: WIP: Move packages into the correct modules., guix-commits, 2020/04/05