diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-08-02 22:00:36 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-08-08 11:54:24 +0200 |
| commit | cd1a98b928be9602ebf103744164ace7bfcae22c (patch) | |
| tree | 57f6430046136a8521c98b931b3b42558cc4e362 | |
| parent | 445a0d134ce735577d1e22f210c2e5ceafc56762 (diff) | |
| download | guix-cd1a98b928be9602ebf103744164ace7bfcae22c.tar.gz | |
installer: Render the final configuration with (guix read-print).
* gnu/installer.scm (module-to-import?): Return #t for (guix read-print). * gnu/installer/steps.scm (configuration->file): Use 'pretty-print-with-comments/splice' instead of 'for-each' and 'pretty-print'.
| -rw-r--r-- | gnu/installer.scm | 3 | ||||
| -rw-r--r-- | gnu/installer/steps.scm | 12 |
2 files changed, 7 insertions, 8 deletions
diff --git a/gnu/installer.scm b/gnu/installer.scm index 415f5a7af7..8a6e604fa5 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com> -;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2019, 2020, 2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de> ;;; @@ -63,6 +63,7 @@ (('gnu 'installer _ ...) #t) (('gnu 'build _ ...) #t) (('guix 'build _ ...) #t) + (('guix 'read-print) #t) (_ #f))) (define not-config? diff --git a/gnu/installer/steps.scm b/gnu/installer/steps.scm index 8bc38181a7..f1d61a2bc5 100644 --- a/gnu/installer/steps.scm +++ b/gnu/installer/steps.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018, 2019 Mathieu Othacehe <m.othacehe@gmail.com> -;;; Copyright © 2020, 2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2020-2022 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,9 +21,9 @@ #:use-module (guix records) #:use-module (guix build utils) #:use-module (guix i18n) + #:use-module (guix read-print) #:use-module (gnu installer utils) #:use-module (ice-9 match) - #:use-module (ice-9 pretty-print) #:use-module (srfi srfi-1) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) @@ -244,11 +244,9 @@ found in RESULTS." ;; by the graphical installer.\n") port) (newline port) - (for-each (lambda (part) - (if (null? part) - (newline port) - (pretty-print part port))) - configuration) + (pretty-print-with-comments/splice port configuration + #:max-width 75) + (flush-output-port port)))) ;;; Local Variables: |