me
/
guix
Archived
1
0
Fork 0
Code

import: Beautify descriptions when appropriate. 

* guix/import/elpa.scm (elpa-package->sexp)
* guix/import/gnu.scm (gnu-package->sexp)
* guix/import/hackage.scm (hackage-module->sexp)
* guix/import/minetest.scm (make-minetest-sexp)
* guix/import/opam.scm (opam->guix-package)
* guix/import/pypi.scm (make-pypi-sexp): Beautify descriptions.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
master
Xinglu Chen 2021-12-17 14:10:40 +01:00 committed by Ludovic Courtès
parent 5cd1019488
commit 155fc235b5
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
guix/import/elpa.scm
View File

@ -388,7 +388,7 @@ type '<elpa-package>'."
'()) '())
(home-page ,(elpa-package-home-page pkg)) (home-page ,(elpa-package-home-page pkg))
(synopsis ,(elpa-package-synopsis pkg)) (synopsis ,(elpa-package-synopsis pkg))
(description ,(elpa-package-description pkg)) (description ,(beautify-description (elpa-package-description pkg)))
(license ,license)) (license ,license))
dependencies-names)) dependencies-names))

3
guix/import/gnu.scm
View File

@ -100,7 +100,8 @@ download policy (see 'download-tarball' for details.)"
(file-sha256 tarball)))))) (file-sha256 tarball))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(synopsis ,(gnu-package-doc-summary package)) (synopsis ,(gnu-package-doc-summary package))
(description ,(gnu-package-doc-description package)) (description ,(beautify-description
(gnu-package-doc-description package)))
(home-page ,(match (gnu-package-doc-urls package) (home-page ,(match (gnu-package-doc-urls package)
((head . tail) (qualified-url head)))) ((head . tail) (qualified-url head))))
(license find-by-yourself!))) (license find-by-yourself!)))

4
guix/import/hackage.scm
View File

@ -33,7 +33,7 @@
#:use-module ((guix utils) #:select (package-name->name+version #:use-module ((guix utils) #:select (package-name->name+version
canonical-newline-port)) canonical-newline-port))
#:use-module (guix http-client) #:use-module (guix http-client)
#:use-module ((guix import utils) #:select (factorize-uri recursive-import)) #:use-module (guix import utils)
#:use-module (guix import cabal) #:use-module (guix import cabal)
#:use-module (guix store) #:use-module (guix store)
#:use-module (gcrypt hash) #:use-module (gcrypt hash)
@ -315,7 +315,7 @@ the hash of the Cabal file."
,@(maybe-arguments) ,@(maybe-arguments)
(home-page ,(cabal-package-home-page cabal)) (home-page ,(cabal-package-home-page cabal))
(synopsis ,(cabal-package-synopsis cabal)) (synopsis ,(cabal-package-synopsis cabal))
(description ,(cabal-package-description cabal)) (description ,(beautify-description (cabal-package-description cabal)))
(license ,(string->license (cabal-package-license cabal)))) (license ,(string->license (cabal-package-license cabal))))
(append hackage-dependencies hackage-native-dependencies)))) (append hackage-dependencies hackage-native-dependencies))))

2
guix/import/minetest.scm
View File

@ -322,7 +322,7 @@ MEDIA-LICENSE and LICENSE."
,@(maybe-propagated-inputs (map contentdb->package-name inputs)) ,@(maybe-propagated-inputs (map contentdb->package-name inputs))
(home-page ,home-page) (home-page ,home-page)
(synopsis ,(delete-cr synopsis)) (synopsis ,(delete-cr synopsis))
(description ,(delete-cr description)) (description ,(beautify-description (delete-cr description)))
(license ,(if (eq? media-license license) (license ,(if (eq? media-license license)
license license
`(list ,media-license ,license))) `(list ,media-license ,license)))

3
guix/import/opam.scm
View File

@ -371,7 +371,8 @@ or #f on failure."
,(list 'quasiquote `((upstream-name . ,name)))))) ,(list 'quasiquote `((upstream-name . ,name))))))
(home-page ,(metadata-ref opam-content "homepage")) (home-page ,(metadata-ref opam-content "homepage"))
(synopsis ,(metadata-ref opam-content "synopsis")) (synopsis ,(metadata-ref opam-content "synopsis"))
(description ,(metadata-ref opam-content "description")) (description ,(beautify-description
(metadata-ref opam-content "description")))
(license ,(spdx-string->license (license ,(spdx-string->license
(metadata-ref opam-content "license")))) (metadata-ref opam-content "license"))))
(filter (filter

2
guix/import/pypi.scm
View File

@ -471,7 +471,7 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE."
,@(maybe-inputs native-inputs 'native-inputs) ,@(maybe-inputs native-inputs 'native-inputs)
(home-page ,home-page) (home-page ,home-page)
(synopsis ,synopsis) (synopsis ,synopsis)
(description ,description) (description ,(beautify-description description))
(license ,(license->symbol license))) (license ,(license->symbol license)))
upstream-dependencies)))))))) upstream-dependencies))))))))