Package: guix-patches;
Reported by: Martin Becze <mjbecze <at> riseup.net>
Date: Thu, 28 Nov 2019 00:14:01 UTC
Severity: normal
Tags: patch
Fixed in version 44560
Done: Hartmut Goebel <h.goebel <at> crazy-compilers.com>
Bug is archived. No further changes may be made.
Message #323 received at 38408 <at> debbugs.gnu.org (full text, mbox):
From: Hartmut Goebel <h.goebel <at> crazy-compilers.com> To: 38408 <at> debbugs.gnu.org Subject: [PATCH v17 6/8] import: utils: Trim patch version from names. Date: Mon, 16 Nov 2020 20:07:26 +0100
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 9704b3087b..20efa131d5 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 10eb030188..b74393e617 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 b6cd577552..3fbf6762c5 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")
--
2.21.3
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.