This lets users use three leading semicolons, for instance, in top-level
comments.
* guix/read-print.scm (canonicalize-comment): Add INDENT parameter and
honor it.
(pretty-print-with-comments): Change default value of #:format-comment.
Call FORMAT-COMMENT with INDENT as the second argument.
* tests/read-print.scm: Adjust test accordingly.
* guix/read-print.scm (read-with-comments): Add #:blank-line? and honor it.
(read-with-comments/sequence, pretty-print-with-comments/splice): New
procedures.
* tests/read-print.scm (test-pretty-print/sequence): New macro.
Add tests using it.
* guix/read-print.scm (<page-break>, page-break?, page-break)
(char-set:whitespace-sans-page-break): New variables.
(space?): New procedure.
(read-vertical-space): Use it.
(read-until-end-of-line): New procedure.
(read-with-comments): Add #\page case.
(pretty-print-with-comments): Add 'page-break?' case.
* tests/read-print.scm ("read-with-comments: top-level page break"): New
test.
Add round-trip test with page break within an sexp.
* guix/read-print.scm (<vertical-space>, vertical-space?)
(vertical-space, vertical-space-height): New variables.
(combine-vertical-space, canonicalize-vertical-space)
(read-vertical-space): New procedures.
(read-with-comments): Use it in the #\newline case.
(pretty-print-with-comments): Add #:format-vertical-space and honor it.
Add case for 'vertical-space?'.
* guix/scripts/style.scm (format-package-definition): Pass
#:format-vertical-space to 'object->string*'.
* tests/read-print.scm ("read-with-comments: list with blank line")
("read-with-comments: list with multiple blank lines")
("read-with-comments: top-level blank lines")
("pretty-print-with-comments, canonicalize-vertical-space"): New tests.
Add a couple of additional round-trip tests.
Previously this test would produce a file containing blank lines between
inputs.
* tests/style.scm ("input labels, modify-inputs and margin comment"):
Remove trailing newlines in replacement strings of 'substitute*'
expression.
* guix/read-print.scm (<blank>, blank?): New record type.
(<comment>): Redefine using the record interface.
(read-with-comments, pretty-print-with-comments): Change some uses of
'comment?' to 'blank?'.
* guix/scripts/style.scm (simplify-inputs)[simplify-expressions]: Use
'blank?' instead of 'comment?'.
* guix/read-print.scm (<comment>): Rename constructor to
'string->comment'.
(comment): New procedure.
(read-with-comments, canonicalize-comment): Use 'string->comment'
instead of 'comment'.
Fixes: <https://issues.guix.gnu.org/57037>.
* gnu/packages/guile-xyz.scm (guile-newt): Update to 0.0.3.
[native-inputs]: Add guile-3.0 that is required when cross-compiling.
This is no longer needed as the defaults have changed upstream.
* gnu/packages/mail.scm (msmtp)[arguments]: Remove substitution to force
'ping' instead of 'netcat' to check for network access.
* gnu/packages/onc-rpc.scm (libtirpc)[replacement]: New field.
(libtirpc/fixed): New variable.
(libtirpc-hurd)[source]: Add patch.
* gnu/packages/patches/libtirpc-CVE-2021-46828.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/slang.scm (newt): Fix-cross compilation.
[arguments]: Use G-Expressions for `#:configure-flags',
`#:make-flags' and `#:phases', also set correct path for
`python-config'.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
It has been verified that this does not cause rebuilds when compiling
natively. The references graph when cross-compiling has also been verified --
glibc-2.33 and the native bash-static-5.1.8 still remains in the graph, but
via the cross-compiled inetutils-2.0, ncurses-6.2.20210619 and via
gcc-cross-TARGET-10.3.0-lib, which is not related with Perl cross-compilation.
* gnu/packages/freedesktop.scm
(xdg-utils)[inputs]{bash-minimal,file}: New inputs when cross-compiling.
(xdg-utils)[arguments]<#:phases>{locate-catalog-files}: Add 'native-inputs'
argument when cross-compiling. Look for docbook-xml and docbook-xsl in
native-inputs when cross-compiling. While we are at it, eliminate input
labels with search-input-file.
(xdg-utils)[arguments]<#:phases>{patch-hardcoded-patch}: Use
search-input-file + inputs instead of 'which' when cross-compiling.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
* gnu/packages/freedesktop.scm
(perl-file-mimeinfo)[arguments]<#:phases>: Make it a G-exp to avoid messy nested
quasiquotation.
{wrap-programs}: When cross-compiling, don't use the PELRL5LIB environment
variable, instead use 'search-path-as-list'.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
It is required for cross-compilation.
Cherry-picked from <https://issues.guix.gnu.org/49327#6>.
* gnu/packages/freedesktop.scm
(udisks)[inputs]: Add 'bash-minimal' when cross-compiling.
(perl-file-mimeinfo)[inputs]: Likewise.
(udiskie)[inputs]: Likewise.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
* guix/build-system/perl.scm: Add info on cross-compilation.
(lower)[private-keywords]: Remove #:target when cross-compiling.
(lower)[target]: Set.
(host-inputs)[perl]: New entry.
(host-inputs)[(standard-packages)]: Move to ...
(build-inputs)[(standard-packages)]: ... here when cross-compiling.
(build-inputs)[standard-cross-packages]: Add when cross-compiling.
(target-inputs): New entry when cross-compiling.
(build): Use perl-cross-build when cross-compiling.
(perl-cross-build): New procedure.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
* gnu/packages/search.scm (ugrep)[source]: Convert snippet to G-Expression.
[arguments]: Convert to list of G-Expressions.
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
* gnu/packages/video.scm (yt-dlp)[source](snippet): Rewrite as a G-Expression.
[arguments]: Use G-Expressions.
[inputs]: Drop labels.
[native-inputs]: Likewise.
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
* gnu/packages/games.scm (make-queen-package)[build-system]: Use
copy-build-system.
[arguments]: Convert to list of G-Expressions.
Replace #:modules and #:builder with #:install-plan and #:phases.
The sources for queen-de lack a readme, so check whether one exists prior to
trying to install it. See <https://bugs.gnu.org/56886>.
* gnu/packages/games.scm (make-queen-package)[#:builder]: Only install
readme.txt if it exists.
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
This fixes the build.
* gnu/packages/games.scm (frotz): Update to 2.54.
[arguments]: Use G-expressions. Set CC in #:make-flags.
Remove obsolete 'curses phase.
Don't explicitly return #t from phases.
[native-inputs]: Add pkg-config and which.
[inputs]: Add ao.
Ludovic Courtès
Morgan Smith
Mathieu Othacehe
宋文武
Marius Bakke
Efraim Flashner
Olivier Dion
Jean-Pierre De Jesus DIAZ
Maxim Cournoyer
Hilton Chain
Joeke de Graaf
Maxime Devos
Liliana Marie Prikler
kiasoc5
Felix Gruber
Tobias Geerinckx-Rice