@@ -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)
@@ -280,7 +280,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
@@ -296,7 +296,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")
@@ -359,7 +359,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))
@@ -378,7 +378,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))
@@ -397,7 +397,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))
@@ -414,13 +414,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))
@@ -437,17 +437,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))
@@ -464,14 +464,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")
From: Martin Becze <mjbecze@riseup.net> 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/utils.scm | 7 ++++--- tests/crate.scm | 44 +++++++++++++++++++++---------------------- 2 files changed, 26 insertions(+), 25 deletions(-)