[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/06: import: Beautify descriptions when appropriate.
From: |
guix-commits |
Subject: |
02/06: import: Beautify descriptions when appropriate. |
Date: |
Fri, 17 Dec 2021 11:31:11 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 155fc235b5e1b41b4665c782365dd2bf11beae9c
Author: Xinglu Chen <public@yoctocell.xyz>
AuthorDate: Fri Dec 17 14:10:40 2021 +0100
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>
---
guix/import/elpa.scm | 2 +-
guix/import/gnu.scm | 3 ++-
guix/import/hackage.scm | 4 ++--
guix/import/minetest.scm | 2 +-
guix/import/opam.scm | 3 ++-
guix/import/pypi.scm | 2 +-
6 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm
index d20e274..dd539cd 100644
--- a/guix/import/elpa.scm
+++ b/guix/import/elpa.scm
@@ -388,7 +388,7 @@ type '<elpa-package>'."
'())
(home-page ,(elpa-package-home-page pkg))
(synopsis ,(elpa-package-synopsis pkg))
- (description ,(elpa-package-description pkg))
+ (description ,(beautify-description (elpa-package-description pkg)))
(license ,license))
dependencies-names))
diff --git a/guix/import/gnu.scm b/guix/import/gnu.scm
index 51d5b77..2b9b71f 100644
--- a/guix/import/gnu.scm
+++ b/guix/import/gnu.scm
@@ -100,7 +100,8 @@ download policy (see 'download-tarball' for details.)"
(file-sha256 tarball))))))
(build-system gnu-build-system)
(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)
((head . tail) (qualified-url head))))
(license find-by-yourself!)))
diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm
index 6ef1e7a..b94f416 100644
--- a/guix/import/hackage.scm
+++ b/guix/import/hackage.scm
@@ -33,7 +33,7 @@
#:use-module ((guix utils) #:select (package-name->name+version
canonical-newline-port))
#: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 store)
#:use-module (gcrypt hash)
@@ -315,7 +315,7 @@ the hash of the Cabal file."
,@(maybe-arguments)
(home-page ,(cabal-package-home-page 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))))
(append hackage-dependencies hackage-native-dependencies))))
diff --git a/guix/import/minetest.scm b/guix/import/minetest.scm
index 0f3ab47..abddd88 100644
--- a/guix/import/minetest.scm
+++ b/guix/import/minetest.scm
@@ -322,7 +322,7 @@ MEDIA-LICENSE and LICENSE."
,@(maybe-propagated-inputs (map contentdb->package-name inputs))
(home-page ,home-page)
(synopsis ,(delete-cr synopsis))
- (description ,(delete-cr description))
+ (description ,(beautify-description (delete-cr description)))
(license ,(if (eq? media-license license)
license
`(list ,media-license ,license)))
diff --git a/guix/import/opam.scm b/guix/import/opam.scm
index d9fdf45..a6f6fe8 100644
--- a/guix/import/opam.scm
+++ b/guix/import/opam.scm
@@ -371,7 +371,8 @@ or #f on failure."
,(list 'quasiquote `((upstream-name .
,name))))))
(home-page ,(metadata-ref opam-content "homepage"))
(synopsis ,(metadata-ref opam-content "synopsis"))
- (description ,(metadata-ref opam-content "description"))
+ (description ,(beautify-description
+ (metadata-ref opam-content
"description")))
(license ,(spdx-string->license
(metadata-ref opam-content "license"))))
(filter
diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index 343e7c0..b4284f5 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -471,7 +471,7 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and
LICENSE."
,@(maybe-inputs native-inputs 'native-inputs)
(home-page ,home-page)
(synopsis ,synopsis)
- (description ,description)
+ (description ,(beautify-description description))
(license ,(license->symbol license)))
upstream-dependencies))))))))
- branch master updated (d6abbfd -> 4204156), guix-commits, 2021/12/17
- 01/06: import: utils: Wrap lines in description., guix-commits, 2021/12/17
- 02/06: import: Beautify descriptions when appropriate.,
guix-commits <=
- 03/06: guix hash: Support several files., guix-commits, 2021/12/17
- 04/06: guix hash: Add 'serializer' option., guix-commits, 2021/12/17
- 05/06: guix hash: Add git serializer., guix-commits, 2021/12/17
- 06/06: doc: Format 'guix hash -S' values as a table., guix-commits, 2021/12/17