me
/
guix
Archived
1
0
Fork 0
Code

import: crate: Include a main verb in crate importer descriptions. 

* guix/import/crate.scm (make-crate-sexp): Start description with
'This package provides '.
* tests/crate.scm: Set descriptions to "This package provides summary".

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Change-Id: If0f47a68f986b9e878fd5caa3e365c5ad863089a
master
Herman Rimm 2024-05-12 21:08:31 +02:00 committed by Ludovic Courtès
parent 1fa2b64ded
commit e62fd9004b
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
guix/import/crate.scm
View File

@ -187,6 +187,7 @@ and LICENSE."
(guix-name (crate-name->package-name name)) (guix-name (crate-name->package-name name))
(cargo-inputs (format-inputs cargo-inputs)) (cargo-inputs (format-inputs cargo-inputs))
(cargo-development-inputs (format-inputs cargo-development-inputs)) (cargo-development-inputs (format-inputs cargo-development-inputs))
(description (beautify-description description))
(pkg `(package (pkg `(package
(name ,guix-name) (name ,guix-name)
(version ,version) (version ,version)
@ -212,7 +213,10 @@ and LICENSE."
cargo-development-inputs))) cargo-development-inputs)))
(home-page ,home-page) (home-page ,home-page)
(synopsis ,(beautify-synopsis synopsis)) (synopsis ,(beautify-synopsis synopsis))
(description ,(beautify-description description)) (description ,(if (string-prefix? "This" description)
description
(string-append "This package provides "
description)))
(license ,(match license (license ,(match license
(() #f) (() #f)
(#f #f) (#f #f)

36
tests/crate.scm
View File

@ -503,7 +503,7 @@
(("rust-leaf-alice" ('unquote 'rust-leaf-alice-0.7)))))) (("rust-leaf-alice" ('unquote 'rust-leaf-alice-0.7))))))
(home-page "http://example.com") (home-page "http://example.com")
(synopsis "summary") (synopsis "summary")
(description "summary") (description "This package provides summary")
(license (list license:expat license:asl2.0)))) (license (list license:expat license:asl2.0))))
(string=? test-source-hash hash)) (string=? test-source-hash hash))
@ -592,7 +592,7 @@
('quasiquote (#:skip-build? #t))) ('quasiquote (#:skip-build? #t)))
(home-page "http://example.com") (home-page "http://example.com")
(synopsis "summary") (synopsis "summary")
(description "summary") (description "This package provides summary")
(license (list license:expat license:asl2.0)))) (license (list license:expat license:asl2.0))))
(define-public 'rust-leaf-alice-0.7 (define-public 'rust-leaf-alice-0.7
(package (package
@ -611,7 +611,7 @@
(arguments ('quasiquote (#:skip-build? #t))) (arguments ('quasiquote (#:skip-build? #t)))
(home-page "http://example.com") (home-page "http://example.com")
(synopsis "summary") (synopsis "summary")
(description "summary") (description "This package provides summary")
(license (list license:expat license:asl2.0)))) (license (list license:expat license:asl2.0))))
(define-public 'rust-leaf-bob-3 (define-public 'rust-leaf-bob-3
(package (package
@ -630,7 +630,7 @@
(arguments ('quasiquote (#:skip-build? #t))) (arguments ('quasiquote (#:skip-build? #t)))
(home-page "http://example.com") (home-page "http://example.com")
(synopsis "summary") (synopsis "summary")
(description "summary") (description "This package provides summary")
(license (list license:expat license:asl2.0)))) (license (list license:expat license:asl2.0))))
(define-public 'rust-intermediate-b-1 (define-public 'rust-intermediate-b-1
(package (package
@ -653,7 +653,7 @@
('unquote rust-leaf-bob-3)))))) ('unquote rust-leaf-bob-3))))))
(home-page "http://example.com") (home-page "http://example.com")
(synopsis "summary") (synopsis "summary")
(description "summary") (description "This package provides summary")
(license (list license:expat license:asl2.0)))) (license (list license:expat license:asl2.0))))
(define-public 'rust-intermediate-a-1 (define-public 'rust-intermediate-a-1
(package (package
@ -680,7 +680,7 @@
('unquote rust-leaf-bob-3)))))) ('unquote rust-leaf-bob-3))))))
(home-page "http://example.com") (home-page "http://example.com")
(synopsis "summary") (synopsis "summary")
(description "summary") (description "This package provides summary")
(license (list license:expat license:asl2.0)))) (license (list license:expat license:asl2.0))))
(define-public 'rust-root-1 (define-public 'rust-root-1
(package (package
@ -711,7 +711,7 @@
('unquote rust-intermediate-c-1)))))) ('unquote rust-intermediate-c-1))))))
(home-page "http://example.com") (home-page "http://example.com")
(synopsis "summary") (synopsis "summary")
(description "summary") (description "This package provides summary")
(license (list license:expat license:asl2.0))))) (license (list license:expat license:asl2.0)))))
#t) #t)
(x (x
@ -740,7 +740,7 @@
('unquote rust-leaf-alice-0.7)))))) ('unquote rust-leaf-alice-0.7))))))
(home-page "http://example.com") (home-page "http://example.com")
(synopsis "summary") (synopsis "summary")
(description "summary") (description "This package provides summary")
(license (list license:expat license:asl2.0)))) (license (list license:expat license:asl2.0))))
(define-public 'rust-leaf-alice-0.7 (define-public 'rust-leaf-alice-0.7
(package (package
@ -758,7 +758,7 @@
(build-system cargo-build-system) (build-system cargo-build-system)
(home-page "http://example.com") (home-page "http://example.com")
(synopsis "summary") (synopsis "summary")
(description "summary") (description "This package provides summary")
(license (list license:expat license:asl2.0)))) (license (list license:expat license:asl2.0))))
(define-public 'rust-leaf-bob-3 (define-public 'rust-leaf-bob-3
(package (package
@ -776,7 +776,7 @@
(build-system cargo-build-system) (build-system cargo-build-system)
(home-page "http://example.com") (home-page "http://example.com")
(synopsis "summary") (synopsis "summary")
(description "summary") (description "This package provides summary")
(license (list license:expat license:asl2.0)))) (license (list license:expat license:asl2.0))))
(define-public 'rust-intermediate-b-1 (define-public 'rust-intermediate-b-1
(package (package
@ -798,7 +798,7 @@
('unquote rust-leaf-bob-3)))))) ('unquote rust-leaf-bob-3))))))
(home-page "http://example.com") (home-page "http://example.com")
(synopsis "summary") (synopsis "summary")
(description "summary") (description "This package provides summary")
(license (list license:expat license:asl2.0)))) (license (list license:expat license:asl2.0))))
(define-public 'rust-intermediate-a-1 (define-public 'rust-intermediate-a-1
(package (package
@ -824,7 +824,7 @@
('unquote rust-leaf-bob-3)))))) ('unquote rust-leaf-bob-3))))))
(home-page "http://example.com") (home-page "http://example.com")
(synopsis "summary") (synopsis "summary")
(description "summary") (description "This package provides summary")
(license (list license:expat license:asl2.0)))) (license (list license:expat license:asl2.0))))
(define-public 'rust-root-1 (define-public 'rust-root-1
(package (package
@ -855,7 +855,7 @@
('unquote rust-intermediate-c-1)))))) ('unquote rust-intermediate-c-1))))))
(home-page "http://example.com") (home-page "http://example.com")
(synopsis "summary") (synopsis "summary")
(description "summary") (description "This package provides summary")
(license (list license:expat license:asl2.0))))) (license (list license:expat license:asl2.0)))))
#t) #t)
(x (x
@ -972,7 +972,7 @@
('unquote 'rust-leaf-bob-4.0.0-yanked)))))) ('unquote 'rust-leaf-bob-4.0.0-yanked))))))
(home-page "http://example.com") (home-page "http://example.com")
(synopsis "summary") (synopsis "summary")
(description "summary") (description "This package provides summary")
(license (list license:expat license:asl2.0))))) (license (list license:expat license:asl2.0)))))
#t) #t)
(x (x
@ -1038,7 +1038,7 @@
(build-system cargo-build-system) (build-system cargo-build-system)
(home-page "http://example.com") (home-page "http://example.com")
(synopsis "summary") (synopsis "summary")
(description "summary") (description "This package provides summary")
(license (list license:expat license:asl2.0)))) (license (list license:expat license:asl2.0))))
(define-public 'rust-leaf-bob-3.0.2-yanked (define-public 'rust-leaf-bob-3.0.2-yanked
(package (package
@ -1058,7 +1058,7 @@
(build-system cargo-build-system) (build-system cargo-build-system)
(home-page "http://example.com") (home-page "http://example.com")
(synopsis "summary") (synopsis "summary")
(description "summary") (description "This package provides summary")
(license (list license:expat license:asl2.0)))) (license (list license:expat license:asl2.0))))
(define-public 'rust-leaf-bob-3 (define-public 'rust-leaf-bob-3
(package (package
@ -1076,7 +1076,7 @@
(build-system cargo-build-system) (build-system cargo-build-system)
(home-page "http://example.com") (home-page "http://example.com")
(synopsis "summary") (synopsis "summary")
(description "summary") (description "This package provides summary")
(license (list license:expat license:asl2.0)))) (license (list license:expat license:asl2.0))))
(define-public 'rust-bar-1 (define-public 'rust-bar-1
(package (package
@ -1103,7 +1103,7 @@
('unquote 'rust-leaf-bob-4.0.0-yanked)))))) ('unquote 'rust-leaf-bob-4.0.0-yanked))))))
(home-page "http://example.com") (home-page "http://example.com")
(synopsis "summary") (synopsis "summary")
(description "summary") (description "This package provides summary")
(license (list license:expat license:asl2.0))))) (license (list license:expat license:asl2.0)))))
#t) #t)
(x (x