me
/
guix
Archived
1
0
Fork 0
Code

ui: Delay use of (guix build syscalls). 

This ensures (guix build syscalls) is loaded only when needed.

* guix/ui.scm (%text-width): Unconditionally alias ‘*line-width*’.
Remove initialization.
<top level>: Remove code for Guile < 2.2.7.
(package->recutils): Change default #:width to (terminal-columns).

Change-Id: I990a1b5b0f20a6243e47e314d1d3d4f8298b7151
master
Ludovic Courtès 2024-04-01 16:19:17 +02:00
parent 44de6d3990
commit 657107cb90
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
guix/ui.scm
View File

@ -1473,23 +1473,9 @@ converted to a space; sequences of more than one line break are preserved."
;;;
(define %text-width
;; '*line-width*' was introduced in Guile 2.2.7/3.0.1. On older versions of
;; Guile, monkey-patch 'wrap*' below.
(if (defined? '*line-width*)
(let ((parameter (fluid->parameter *line-width*)))
(parameter (terminal-columns))
parameter)
(make-parameter (terminal-columns))))
(unless (defined? '*line-width*) ;Guile < 2.2.7
(set! (@@ (texinfo plain-text) wrap*)
;; XXX: Monkey patch this private procedure to let 'package->recutils'
;; parameterize the fill of description field correctly.
(lambda strings
(let ((indent (fluid-ref (@@ (texinfo plain-text) *indent*))))
(fill-string (string-concatenate strings)
#:line-width (%text-width) #:initial-indent indent
#:subsequent-indent indent)))))
;; '*line-width*' was introduced in Guile 2.2.7/3.0.1. Keep this alias for
;; backward-compatibility and for convenience.
(fluid->parameter *line-width*))
(define (texi->plain-text str)
"Return a plain-text representation of texinfo fragment STR."
@ -1535,7 +1521,7 @@ followed by \"+ \", which makes for a valid multi-line field value in the
'()
str)))
(define* (package->recutils p port #:optional (width (%text-width))
(define* (package->recutils p port #:optional (width (terminal-columns))
#:key
(hyperlinks? (supports-hyperlinks? port))
(extra-fields '())