[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/12: scripts: import: Increase column width for pretty-printer.
From: |
guix-commits |
Subject: |
06/12: scripts: import: Increase column width for pretty-printer. |
Date: |
Tue, 14 Sep 2021 05:53:04 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 08c7e7df156e3e61d20fba8a76bea65e1c698ef5
Author: Xinglu Chen <public@yoctocell.xyz>
AuthorDate: Sun Sep 5 16:05:36 2021 +0200
scripts: import: Increase column width for pretty-printer.
Previously, the max column width for the pretty-printer was 50, which caused
generated package definitions to include unnecessary newlines, e.g.,
(home-page
"https://gitlab.com/ttyperacer/terminal-typeracer")
instead of
(home-page "https://gitlab.com/ttyperacer/terminal-typeracer")
* guix/scripts/import.scm (guix-import): Set max expression width to 80 when
pretty-printing.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
guix/scripts/import.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/guix/scripts/import.scm b/guix/scripts/import.scm
index 11e9476..40fa675 100644
--- a/guix/scripts/import.scm
+++ b/guix/scripts/import.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2018 Kyle Meyer <kyle@kyleam.com>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
+;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -118,7 +119,8 @@ Run IMPORTER with ARGS.\n"))
(if (member importer importers)
(let ((print (lambda (expr)
(pretty-print expr (newline-rewriting-port
- (current-output-port))))))
+ (current-output-port))
+ #:max-expr-width 80))))
(match (apply (resolve-importer importer) args)
((and expr (or ('package _ ...)
('let _ ...)
- branch master updated (f440ccd -> 580984f), guix-commits, 2021/09/14
- 02/12: download: Remove obsolete workaround., guix-commits, 2021/09/14
- 01/12: guix: Replace 'define-public'., guix-commits, 2021/09/14
- 03/12: download: Disarchive mirrors can be URL-returning procedures., guix-commits, 2021/09/14
- 04/12: etc: Add 'source-manifest.scm'., guix-commits, 2021/09/14
- 07/12: gnu: Add usbip-utils, guix-commits, 2021/09/14
- 06/12: scripts: import: Increase column width for pretty-printer.,
guix-commits <=
- 08/12: gnu: usbip-utils: Do not build static libraries., guix-commits, 2021/09/14
- 12/12: system: Add trailing newline to /etc/timezone., guix-commits, 2021/09/14
- 05/12: etc: Add 'disarchive-manifest.scm'., guix-commits, 2021/09/14
- 09/12: gnu: Add python-w3lib, guix-commits, 2021/09/14
- 10/12: gnu: Add go-cloud-google-com-go-compute-metadata., guix-commits, 2021/09/14
- 11/12: gnu: Add go-github-com-google-gmail-oauth2-tools-go-sendgmail., guix-commits, 2021/09/14