From unknown Sun Jun 22 00:53:50 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51581] [PATCH 0/2] Wrap lines in the description of generated packages Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Nov 2021 10:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51581 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51581@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16359346603767 (code B ref -1); Wed, 03 Nov 2021 10:18:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 Nov 2021 10:17:40 +0000 Received: from localhost ([127.0.0.1]:39094 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1miDKu-0000yg-Iu for submit@debbugs.gnu.org; Wed, 03 Nov 2021 06:17:40 -0400 Received: from lists.gnu.org ([209.51.188.17]:50560) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1miDKt-0000ya-M6 for submit@debbugs.gnu.org; Wed, 03 Nov 2021 06:17:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39156) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miDKt-0001EB-HX for guix-patches@gnu.org; Wed, 03 Nov 2021 06:17:39 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:36950 helo=mail.yoctocell.xyz) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miDKq-0005Pq-LH for guix-patches@gnu.org; Wed, 03 Nov 2021 06:17:39 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1635934651; bh=nLoMpx25CgG9FYSWLbwcHFlBuo05o0iLXI6r7G3hrgY=; h=From:To:subject:Date; b=dNundwaN4uU+DywM3tO1Q8searVjuhUNy5HyMAd8g7+na6iR37khYRq2ZqaZ0aN24 4SN8ojaNPLpgc8tXhkTQPL25h59IgWS2PSad0IH/0Vc/Mtg1GNlYoLFUDyAQWvQqdO LJAQTanmFdqmzTyInat6t0UiyXuqirfLlToMtYYg= Message-Id: Date: Wed, 03 Nov 2021 11:17:30 +0100 MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Received-SPF: pass client-ip=87.96.130.155; envelope-from=public@yoctocell.xyz; helo=mail.yoctocell.xyz X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FROM_SUSPICIOUS_NTLD=0.001, FROM_SUSPICIOUS_NTLD_FP=1.688, PDS_OTHER_BAD_TLD=0.001, PDS_RDNS_DYNAMIC_FP=0.001, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TO_NO_BRKTS_DYNIP=0.25 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.7 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: This series adds a =?UTF-8?Q?=E2=80=98wrap-lines=E2=80=99?= procedure which wraps the line in a string, similar to =?UTF-8?Q?=E2=80=98fill-paragraph=E2=80=99?= in Emacs. This is used to chop the description of imported packages into multiple lines, [...] Content analysis details: (1.7 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.51.188.17 listed in wl.mailspike.net] -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [209.51.188.17 listed in list.dnswl.org] 0.5 FROM_SUSPICIOUS_NTLD_FP From abused NTLD 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable This series adds a =E2=80=98wrap-lines=E2=80=99 procedure which wraps the l= ine in a string, similar to =E2=80=98fill-paragraph=E2=80=99 in Emacs. This is used= to chop the description of imported packages into multiple lines, instead of just having one really long line. Before: =2D-8<---------------cut here---------------start------------->8--- (description "Hakyll is a static website compiler library. It provides you with the = tools to create a simple or advanced static website using a Haskell DSL and= formats such as markdown or RST. You can find more information, including = a tutorial, on the website: . * . If you seek = assistance, there's: . * A google group: . * An IRC channel, @#hakyll@ on irc.libera.chat (we *do not* have a = channel on Freenode anymore) . Additionally, there's the Haddock documentat= ion in the different modules, meant as a reference.") =2D-8<---------------cut here---------------end--------------->8--- After: =2D-8<---------------cut here---------------start------------->8--- (description "Hakyll is a static website compiler library. It provides you with the = tools to create a simple or advanced static website using a Haskell DSL and formats = such as markdown or RST. You can find more information, including a tutorial, on= the website: . * . If you seek assistance, there's= : . * A google group: . * An IRC channel, @#hakyll@ on irc.libera.chat (we *do not* have a channel on Freenode anymor= e) . Additionally, there's the Haddock documentation in the different modules, m= eant as a reference.") =2D-8<---------------cut here---------------end--------------->8--- Xinglu Chen (2): import: utils: Add =E2=80=98wrap-lines=E2=80=99 procedure. import: Beautify descriptions when appropriate. 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 +- guix/import/utils.scm | 36 +++++++++++++++++++++++++++++++----- tests/import-utils.scm | 5 +++++ 8 files changed, 45 insertions(+), 12 deletions(-) base-commit: 0e19713c1fbfd3a01347e0d490434a53a596ed3c =2D-=20 2.33.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJJBAEBCAAzFiEEAVhh4yyK5+SEykIzrPUJmaL7XHkFAmGCYboVHHB1YmxpY0B5 b2N0b2NlbGwueHl6AAoJEKz1CZmi+1x58+sQAKMRwBdrlI0zKVo4d85a5r7xpHai jnYgh1Hc1A0jrB+pHFK+boNrsKJHd/jYmFAVCqFrDunUlysu8+mlyM9gzIp6Si6G cqIVxyKJI1QDtzojPDii0fLiIBwnYp7Io6JjRydraZVXJGoX2YDKAmef7NXRGFcD 2CK8w8giI5LQLmlkoOKEGfWOafddTke7ijG8s/27//zUjQu3c7+Cw9c/7p5V8FMr GqNU2HXTJCe+fsye/xSlbuxEQOZOhpCxN8ZGYq2pD+XhFqRZSaJAlSDkIjzTxgL7 QBg2NnNbP19Yvp7jFFOqho0PUlqEmmRwM92e4RVo4PD4dZb3adorubx15oBw3uaR sVt1nM0bHdnDKma/MsTtDmEUXwsYvz8yi2Bn4KND5rL9PAvhZ45zFK2vSFiZhjqz I2BuqOFXbkKO5FhOxEgQRlNyKGJyreCxm4+X1b8bQgrgNVbcrE5aVNmumiWI8e4f SnRagU5bU6m3IB9ElU/Ob2+RPtjDoeeeR9ejTaRCHZVploCZan1neX0aJL1zO8/R HcNgXAZgVVlrHxFgqsl5sHjTX9iWF2bmTNATZwppg7b0oedMld8XNVViPepEucOe lUecg95qRz9QnAtHdWVQaAE30sTs0QV/c79dhy3PgZUempcUvcU95GBsVHlgnM1q p2KjYVYgpbwaf0jn =vDpv -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 22 00:53:50 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51581] [PATCH 1/2] import: utils: Add =?UTF-8?Q?=E2=80=98wrap-lines=E2=80=99?= procedure. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Nov 2021 10:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51581 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51581@debbugs.gnu.org Received: via spool by 51581-submit@debbugs.gnu.org id=B51581.16359347663991 (code B ref 51581); Wed, 03 Nov 2021 10:20:02 +0000 Received: (at 51581) by debbugs.gnu.org; 3 Nov 2021 10:19:26 +0000 Received: from localhost ([127.0.0.1]:39099 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1miDMb-00012I-W6 for submit@debbugs.gnu.org; Wed, 03 Nov 2021 06:19:26 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:45492 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1miDMZ-000122-Sv for 51581@debbugs.gnu.org; Wed, 03 Nov 2021 06:19:24 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1635934757; bh=JPjC/7Zjf6NWv4vNGlSahLNZ6gcbOg+AWJtiq6tixjI=; h=From:To:Subject:In-Reply-To:References:Date; b=kpyT46X2EkKGufJK3wKQjQvmY/xIpUnrfhp8bL5xYP5oEW+J0u5O26Qm6ukJlYQVh Gp2Eb/9Owi57ymVFf/hlzIRcjWMUpNt4/JS25AO87Nw9k4kOfDS8hE8EhUtxowdWY0 9INw9w4q2wAhAHj6IkcHG6yY/1zNKGVMBk0BFnnA= In-Reply-To: References: Message-Id: Date: Wed, 03 Nov 2021 11:19:16 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 2.9 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * guix/import/utils.scm (wrap-lines): New procedure. (beautify-description): Use it; add optional =?UTF-8?Q?=E2=80=98length=E2=80=99?= argument. * tests/import-utils.scm ("wrap-lines: 80 characters"): Test it. --- guix/impor [...] Content analysis details: (2.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS 0.0 PDS_RDNS_DYNAMIC_FP RDNS_DYNAMIC with FP steps X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.9 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * guix/import/utils.scm (wrap-lines): New procedure. (beautify-description): Use it; add optional =?UTF-8?Q?=E2=80=98length=E2=80=99?= argument. * tests/import-utils.scm ("wrap-lines: 80 characters"): Test it. --- guix/impor [...] Content analysis details: (1.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager 0.0 PDS_RDNS_DYNAMIC_FP RDNS_DYNAMIC with FP steps * guix/import/utils.scm (wrap-lines): New procedure. (beautify-description): Use it; add optional =E2=80=98length=E2=80=99 argum= ent. * tests/import-utils.scm ("wrap-lines: 80 characters"): Test it. --- guix/import/utils.scm | 36 +++++++++++++++++++++++++++++++----- tests/import-utils.scm | 5 +++++ 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index a180742ca3..103ec2ffe1 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -9,6 +9,7 @@ ;;; Copyright =C2=A9 2020 Martin Becze ;;; Copyright =C2=A9 2021 Maxim Cournoyer ;;; Copyright =C2=A9 2021 Sarah Morgensen +;;; Copyright =C2=A9 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -66,6 +67,7 @@ (define-module (guix import utils) license->symbol =20 snake-case + wrap-lines beautify-description =20 alist->package @@ -231,9 +233,32 @@ (define (snake-case str) with dashes." (string-join (string-split (string-downcase str) #\_) "-")) =20 -(define (beautify-description description) - "Improve the package DESCRIPTION by turning a beginning sentence fragment -into a proper sentence and by using two spaces between sentences." +(define* (wrap-lines str #:optional (length 80)) + "Given a string STR, wrap lines at LENGTH characters" + (define (aux str acc counter) + (cond + ((string-null? str) acc) + ((and (not (=3D (string-length acc) 0)) + (=3D (modulo (string-length acc) length) 0) + (not (=3D counter 1))) + (let ((before (substring acc 0 (- counter 1))) + (after (substring acc counter))) + (aux str (string-append before "\n" after) 1))) + ((char=3D? (string-ref str 0) #\space) + (aux (substring str 1) + (string-append acc (char-set->string (char-set (string-ref str = 0)))) + (+ (string-length acc) 1))) + (else + (aux (substring str 1) + (string-append acc (char-set->string (char-set (string-ref str = 0)))) + counter)))) + + (aux str "" 1)) + +(define* (beautify-description description #:optional (length 80)) + "Improve the package DESCRIPTION by turning a beginning sentence fragmen= t into +a proper sentence and by using two spaces between sentences, and wrap line= s at +LENGTH characters." (let ((cleaned (cond ((string-prefix? "A " description) (string-append "This package provides a" @@ -248,8 +273,9 @@ (define (beautify-description description) (string-length "Functions")))) (else description)))) ;; Use double spacing between sentences - (regexp-substitute/global #f "\\. \\b" - cleaned 'pre ". " 'post))) + (wrap-lines (regexp-substitute/global #f "\\. \\b" + cleaned 'pre ". " 'post) + length))) =20 (define* (package-names->package-inputs names #:optional (output #f)) "Given a list of PACKAGE-NAMES or (PACKAGE-NAME VERSION) pairs, and an diff --git a/tests/import-utils.scm b/tests/import-utils.scm index 7c6c782917..c6790f624a 100644 --- a/tests/import-utils.scm +++ b/tests/import-utils.scm @@ -3,6 +3,7 @@ ;;; Copyright =C2=A9 2016 Ben Woodcroft ;;; Copyright =C2=A9 2020 Martin Becze ;;; Copyright =C2=A9 2021 Sarah Morgensen +;;; Copyright =C2=A9 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,10 @@ (define-module (test-import-utils) =20 (test-begin "import-utils") =20 +(test-equal "wrap-lines: 80 characters" + "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod= tempor\nincididunt ut labore et dolore magna aliqua." + (wrap-lines "Lorem ipsum dolor sit amet, consectetur adipiscing elit, se= d do eiusmod tempor incididunt ut labore et dolore magna aliqua.")) + (test-equal "beautify-description: use double spacing" "This is a package. It is great. Trust me Mr. Hendrix." (beautify-description --=20 2.33.0 From unknown Sun Jun 22 00:53:50 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51581] [PATCH 2/2] import: Beautify descriptions when appropriate. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Nov 2021 10:20:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51581 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51581@debbugs.gnu.org Received: via spool by 51581-submit@debbugs.gnu.org id=B51581.16359347734012 (code B ref 51581); Wed, 03 Nov 2021 10:20:03 +0000 Received: (at 51581) by debbugs.gnu.org; 3 Nov 2021 10:19:33 +0000 Received: from localhost ([127.0.0.1]:39102 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1miDMj-00012e-Cs for submit@debbugs.gnu.org; Wed, 03 Nov 2021 06:19:33 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:45522 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1miDMh-00012J-C3 for 51581@debbugs.gnu.org; Wed, 03 Nov 2021 06:19:31 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1635934765; bh=HLMHC9Dph5H9p1lXqlDaYly1hPpXwOZSEuStQ5cricA=; h=From:To:Subject:In-Reply-To:References:Date; b=K84scvnxrLrRDh++cW3T4TNADJO667+ZP7PJzAiZlCxAj2WbqeROqbgEQOwIt0qGf ef5GxOGZJiT1LBu+RWP/USo01DRCWcPGfJZJ0IfY2Ap1lHK4ivWlcBfZzRwQud7/SP 3j3U0FcTcx1AqNhbyAT6UOQHAfh0HDMB9vN0/gGU= In-Reply-To: References: Message-Id: Date: Wed, 03 Nov 2021 11:19:25 +0100 MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 2.9 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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/opa [...] Content analysis details: (2.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS 0.0 PDS_RDNS_DYNAMIC_FP RDNS_DYNAMIC with FP steps X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.9 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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/opa [...] Content analysis details: (1.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager 0.0 PDS_RDNS_DYNAMIC_FP RDNS_DYNAMIC with FP steps * 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. --- 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 96ebc17af1..8daa77bfcd 100644 --- a/guix/import/elpa.scm +++ b/guix/import/elpa.scm @@ -390,7 +390,7 @@ (define melpa-source '()) (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 51d5b77d34..2b9b71feb0 100644 --- a/guix/import/gnu.scm +++ b/guix/import/gnu.scm @@ -100,7 +100,8 @@ (define sig-url (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 03881f1a3d..95955e27a0 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -32,7 +32,7 @@ (define-module (guix import hackage) #: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 @@ (define (maybe-arguments) ,@(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 0f3ab473ca..abddd885ee 100644 --- a/guix/import/minetest.scm +++ b/guix/import/minetest.scm @@ -322,7 +322,7 @@ (define (make-minetest-sexp author/name version repository commit ,@(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 fe13d29f03..395019d758 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -371,7 +371,8 @@ (define* (opam->guix-package name #:key (repo '()) version) ,(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 f908136481..3d463a0775 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -474,7 +474,7 @@ (define (maybe-upstream-name name) ,@(maybe-inputs native-inputs 'native-inputs) (home-page ,home-page) (synopsis ,synopsis) - (description ,description) + (description ,(beautify-description description)) (license ,(license->symbol license))) upstream-dependencies)))))))) -- 2.33.0 From unknown Sun Jun 22 00:53:50 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51581] [PATCH 0/2] Wrap lines in the description of generated packages Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 Nov 2021 22:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51581 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Xinglu Chen Cc: 51581@debbugs.gnu.org Received: via spool by 51581-submit@debbugs.gnu.org id=B51581.1636757081550 (code B ref 51581); Fri, 12 Nov 2021 22:45:02 +0000 Received: (at 51581) by debbugs.gnu.org; 12 Nov 2021 22:44:41 +0000 Received: from localhost ([127.0.0.1]:46138 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlfHl-00008o-4g for submit@debbugs.gnu.org; Fri, 12 Nov 2021 17:44:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35220) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlfHj-00008b-6K for 51581@debbugs.gnu.org; Fri, 12 Nov 2021 17:44:39 -0500 Received: from [2001:470:142:3::e] (port=40988 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mlfHd-00057C-Ez; Fri, 12 Nov 2021 17:44:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=BuHuLPvWHFDAluLEbhprRMjEC8G+QYhIBMtFnAlBELE=; b=l39GX2qBLlBnLlSLco3v 2zrz0DP4cD7cTowIUoeBk9ABwCxKO2CrlPIPO7iv9mNJQ2/ZcxphpGeTOCBhdF9Qf/SxzcebAuu6V CaC8FxIC5M9UxJ8h73IyCBIY7tt6DbkJ9imKAl99Ii6G6Rbm2GARkoH4t9RbGv843kM2zXgSmVfKQ 5byr4zz59+nfXVdgpafS9vAlQI+EA4YBfFQTpLR4SfrffyoKMTt2VwdcKCXGJsnLOkQRNH9779yxG IFMAIwBwGRJSVKINlbeW8b6j4pLjJJhgpiIECOlaciFIlqon4QXP9bN998oTP9YDlOojXND1IYt75 j5Lw4fx8t8HZVg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:56391 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mlfHd-0000PE-6C; Fri, 12 Nov 2021 17:44:33 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: Date: Fri, 12 Nov 2021 23:44:31 +0100 In-Reply-To: (Xinglu Chen's message of "Wed, 03 Nov 2021 11:17:30 +0100") Message-ID: <87zgq9c7u8.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.3 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) Hi! Xinglu Chen skribis: > This series adds a =E2=80=98wrap-lines=E2=80=99 procedure which wraps the= line in a > string, similar to =E2=80=98fill-paragraph=E2=80=99 in Emacs. This is us= ed to chop the > description of imported packages into multiple lines, instead of just > having one really long line. Does (@ (guix ui) fill-paragraph) suit your needs? :-) If so, could you send updated patches? The rest LGTM. Thanks, Ludo=E2=80=99. From unknown Sun Jun 22 00:53:50 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51581] [PATCH 0/2] Wrap lines in the description of generated packages Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Dec 2021 15:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51581 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Xinglu Chen Cc: 51581@debbugs.gnu.org Received: via spool by 51581-submit@debbugs.gnu.org id=B51581.163837275817431 (code B ref 51581); Wed, 01 Dec 2021 15:33:01 +0000 Received: (at 51581) by debbugs.gnu.org; 1 Dec 2021 15:32:38 +0000 Received: from localhost ([127.0.0.1]:45126 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msRb3-0004X2-O6 for submit@debbugs.gnu.org; Wed, 01 Dec 2021 10:32:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45614) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msRb2-0004Wk-4Y for 51581@debbugs.gnu.org; Wed, 01 Dec 2021 10:32:36 -0500 Received: from [2001:470:142:3::e] (port=53630 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1msRaw-0006tW-QA; Wed, 01 Dec 2021 10:32:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=8vvawIpmEQ0qYs8BfxH9rCvBtu/C8di3cjZab7x2l88=; b=mlUd3KJmKUTSfhl7q1hT ysJ4qDRWxrh8cxWtZsY8CTbmEW/o9eHsx4TOl+NHz6qgH8YmLhSRNonkmQDCWWDaYmkUCIljv2//y UbZkKMijlSQEQ7OIOzgETXivS07Wti3A0iH0HqZvFyb9tYD64hUu7QNUXEk6D9vWz5OHRdjbCKgSP 3V+1aphj94xk8X5/Itz9jeo2gbHXDNpTpAqnDHvJ7J3sQ98AWsa/nuZQ8EWoWLgoFSB0JQB5TC0Ih NCbNn6wrnYe4hxcGSJw1GNrJ2LTJ/TthAv9VXnWeed4dg1Gsq6Qubi2vHMM19M+b3ivZ4BHlgf8t+ mxLhaVzr1Fg3/g==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:53995 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1msRaw-0001DZ-M4; Wed, 01 Dec 2021 10:32:30 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87zgq9c7u8.fsf@gnu.org> Date: Wed, 01 Dec 2021 16:32:29 +0100 In-Reply-To: <87zgq9c7u8.fsf@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Fri, 12 Nov 2021 23:44:31 +0100") Message-ID: <875ys82vea.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.3 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) Ping! :-) Ludovic Court=C3=A8s skribis: > Hi! > > Xinglu Chen skribis: > >> This series adds a =E2=80=98wrap-lines=E2=80=99 procedure which wraps th= e line in a >> string, similar to =E2=80=98fill-paragraph=E2=80=99 in Emacs. This is u= sed to chop the >> description of imported packages into multiple lines, instead of just >> having one really long line. > > Does (@ (guix ui) fill-paragraph) suit your needs? :-) > > If so, could you send updated patches? The rest LGTM. > > Thanks, > Ludo=E2=80=99. From unknown Sun Jun 22 00:53:50 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Xinglu Chen Subject: bug#51581: closed (Re: [PATCH v2 0/2] Wrap lines in the description of generated packages) Message-ID: References: <87tuf7p6rq.fsf@gnu.org> X-Gnu-PR-Message: they-closed 51581 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 51581@debbugs.gnu.org Date: Fri, 17 Dec 2021 15:54:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1639756442-7826-1" This is a multi-part message in MIME format... ------------=_1639756442-7826-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #51581: [PATCH 0/2] Wrap lines in the description of generated packages which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 51581@debbugs.gnu.org. --=20 51581: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D51581 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1639756442-7826-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 51581-done) by debbugs.gnu.org; 17 Dec 2021 15:53:40 +0000 Received: from localhost ([127.0.0.1]:40480 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myFYB-00021X-NJ for submit@debbugs.gnu.org; Fri, 17 Dec 2021 10:53:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34020) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myFYA-00021J-E8 for 51581-done@debbugs.gnu.org; Fri, 17 Dec 2021 10:53:39 -0500 Received: from [2001:470:142:3::e] (port=51318 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myFY4-0006FS-PV; Fri, 17 Dec 2021 10:53:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=4Jn2fUhHR6VFCj5fz8OehXA7fghvWYe/xDGSQyxv0Sc=; b=YtLIxz0/5EHKNdwZGa5R 9pwicFfq2iBWVrxGS9x75mioc6vstBkQ3880W+LM+mRu6YukfmiagjdzYvCI/C2faUyOty60oYcPE hzdYIhr7h6loKjgF0V4Yys+C4Qn0ppA/TS2DQ5hcr+7V4cCXhJicplTzcDOGhwe87sWTJEro5r6sh ZbedidQcyvrTCc4UWBER2LjsxHCNKPg0w947uNcvTroyzWTP3mfHOA5XaruvaF9ngQ33zCfNFZF8n nSgcO/yevIvP/BtklRJueHF5Gt0yIefH1czVU7lUGcoJlJ4Kl5qFUJvbfMz5U2t01916J+uEbidQd rkI+e0yvOwv/UA==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=34548 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myFY4-0002J0-Og; Fri, 17 Dec 2021 10:53:32 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Xinglu Chen Subject: Re: [PATCH v2 0/2] Wrap lines in the description of generated packages References: X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 27 Frimaire an 230 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Fri, 17 Dec 2021 16:53:29 +0100 In-Reply-To: (Xinglu Chen's message of "Fri, 17 Dec 2021 14:10:17 +0100") Message-ID: <87tuf7p6rq.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: 51581-done Cc: 51581-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) Hi, Xinglu Chen skribis: > import: utils: Wrap files in description. > import: Beautify descriptions when appropriate. Applied, thanks! Ludo=E2=80=99. ------------=_1639756442-7826-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 3 Nov 2021 10:17:40 +0000 Received: from localhost ([127.0.0.1]:39094 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1miDKu-0000yg-Iu for submit@debbugs.gnu.org; Wed, 03 Nov 2021 06:17:40 -0400 Received: from lists.gnu.org ([209.51.188.17]:50560) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1miDKt-0000ya-M6 for submit@debbugs.gnu.org; Wed, 03 Nov 2021 06:17:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39156) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miDKt-0001EB-HX for guix-patches@gnu.org; Wed, 03 Nov 2021 06:17:39 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:36950 helo=mail.yoctocell.xyz) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miDKq-0005Pq-LH for guix-patches@gnu.org; Wed, 03 Nov 2021 06:17:39 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1635934651; bh=nLoMpx25CgG9FYSWLbwcHFlBuo05o0iLXI6r7G3hrgY=; h=From:To:subject:Date; b=dNundwaN4uU+DywM3tO1Q8searVjuhUNy5HyMAd8g7+na6iR37khYRq2ZqaZ0aN24 4SN8ojaNPLpgc8tXhkTQPL25h59IgWS2PSad0IH/0Vc/Mtg1GNlYoLFUDyAQWvQqdO LJAQTanmFdqmzTyInat6t0UiyXuqirfLlToMtYYg= To: guix-patches@gnu.org subject: [PATCH 0/2] Wrap lines in the description of generated packages Message-Id: Date: Wed, 03 Nov 2021 11:17:30 +0100 MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Received-SPF: pass client-ip=87.96.130.155; envelope-from=public@yoctocell.xyz; helo=mail.yoctocell.xyz X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FROM_SUSPICIOUS_NTLD=0.001, FROM_SUSPICIOUS_NTLD_FP=1.688, PDS_OTHER_BAD_TLD=0.001, PDS_RDNS_DYNAMIC_FP=0.001, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TO_NO_BRKTS_DYNIP=0.25 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.7 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: This series adds a ‘wrap-lines’ procedure which wraps the line in a string, similar to ‘fill-paragraph’ in Emacs. This is used to chop the description of imported packages into multiple lines, [...] Content analysis details: (1.7 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.51.188.17 listed in wl.mailspike.net] -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [209.51.188.17 listed in list.dnswl.org] 0.5 FROM_SUSPICIOUS_NTLD_FP From abused NTLD 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable This series adds a =E2=80=98wrap-lines=E2=80=99 procedure which wraps the l= ine in a string, similar to =E2=80=98fill-paragraph=E2=80=99 in Emacs. This is used= to chop the description of imported packages into multiple lines, instead of just having one really long line. Before: =2D-8<---------------cut here---------------start------------->8--- (description "Hakyll is a static website compiler library. It provides you with the = tools to create a simple or advanced static website using a Haskell DSL and= formats such as markdown or RST. You can find more information, including = a tutorial, on the website: . * . If you seek = assistance, there's: . * A google group: . * An IRC channel, @#hakyll@ on irc.libera.chat (we *do not* have a = channel on Freenode anymore) . Additionally, there's the Haddock documentat= ion in the different modules, meant as a reference.") =2D-8<---------------cut here---------------end--------------->8--- After: =2D-8<---------------cut here---------------start------------->8--- (description "Hakyll is a static website compiler library. It provides you with the = tools to create a simple or advanced static website using a Haskell DSL and formats = such as markdown or RST. You can find more information, including a tutorial, on= the website: . * . If you seek assistance, there's= : . * A google group: . * An IRC channel, @#hakyll@ on irc.libera.chat (we *do not* have a channel on Freenode anymor= e) . Additionally, there's the Haddock documentation in the different modules, m= eant as a reference.") =2D-8<---------------cut here---------------end--------------->8--- Xinglu Chen (2): import: utils: Add =E2=80=98wrap-lines=E2=80=99 procedure. import: Beautify descriptions when appropriate. 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 +- guix/import/utils.scm | 36 +++++++++++++++++++++++++++++++----- tests/import-utils.scm | 5 +++++ 8 files changed, 45 insertions(+), 12 deletions(-) base-commit: 0e19713c1fbfd3a01347e0d490434a53a596ed3c =2D-=20 2.33.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJJBAEBCAAzFiEEAVhh4yyK5+SEykIzrPUJmaL7XHkFAmGCYboVHHB1YmxpY0B5 b2N0b2NlbGwueHl6AAoJEKz1CZmi+1x58+sQAKMRwBdrlI0zKVo4d85a5r7xpHai jnYgh1Hc1A0jrB+pHFK+boNrsKJHd/jYmFAVCqFrDunUlysu8+mlyM9gzIp6Si6G cqIVxyKJI1QDtzojPDii0fLiIBwnYp7Io6JjRydraZVXJGoX2YDKAmef7NXRGFcD 2CK8w8giI5LQLmlkoOKEGfWOafddTke7ijG8s/27//zUjQu3c7+Cw9c/7p5V8FMr GqNU2HXTJCe+fsye/xSlbuxEQOZOhpCxN8ZGYq2pD+XhFqRZSaJAlSDkIjzTxgL7 QBg2NnNbP19Yvp7jFFOqho0PUlqEmmRwM92e4RVo4PD4dZb3adorubx15oBw3uaR sVt1nM0bHdnDKma/MsTtDmEUXwsYvz8yi2Bn4KND5rL9PAvhZ45zFK2vSFiZhjqz I2BuqOFXbkKO5FhOxEgQRlNyKGJyreCxm4+X1b8bQgrgNVbcrE5aVNmumiWI8e4f SnRagU5bU6m3IB9ElU/Ob2+RPtjDoeeeR9ejTaRCHZVploCZan1neX0aJL1zO8/R HcNgXAZgVVlrHxFgqsl5sHjTX9iWF2bmTNATZwppg7b0oedMld8XNVViPepEucOe lUecg95qRz9QnAtHdWVQaAE30sTs0QV/c79dhy3PgZUempcUvcU95GBsVHlgnM1q p2KjYVYgpbwaf0jn =vDpv -----END PGP SIGNATURE----- --=-=-=-- ------------=_1639756442-7826-1--