diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-27 14:24:37 -0400 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-27 14:27:28 -0400 |
commit | 3c6e220d8100281074c414a43c1efe9a01b53771 (patch) | |
tree | dc5d47fbbac3842d0da893adcd398dea10c1e681 /gnu/installer/utils.scm | |
parent | 08473753a0ebafef22c0894d846e3b42fd6be2a2 (diff) | |
parent | 62048ff9fcfbe3fc790a7207fc5f6f3e0476a02a (diff) | |
download | guix-3c6e220d8100281074c414a43c1efe9a01b53771.tar guix-3c6e220d8100281074c414a43c1efe9a01b53771.tar.gz |
Merge branch 'master' into staging.
With resolved conflicts in:
gnu/local.mk
gnu/packages/crates-io.scm
Diffstat (limited to 'gnu/installer/utils.scm')
-rw-r--r-- | gnu/installer/utils.scm | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/gnu/installer/utils.scm b/gnu/installer/utils.scm index fb62fb8896..5fd2e2d425 100644 --- a/gnu/installer/utils.scm +++ b/gnu/installer/utils.scm @@ -23,6 +23,8 @@ #:use-module (guix build utils) #:use-module (guix i18n) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-9) + #:use-module (srfi srfi-9 gnu) #:use-module (srfi srfi-19) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) @@ -33,7 +35,12 @@ #:use-module (ice-9 regex) #:use-module (ice-9 format) #:use-module (ice-9 textual-ports) - #:export (read-lines + #:export (<secret> + secret? + make-secret + secret-content + + read-lines read-all nearest-exact-integer read-percentage @@ -58,6 +65,16 @@ with-silent-shepherd)) +(define-record-type <secret> + (make-secret content) + secret? + (content secret-content)) + +(set-record-type-printer! + <secret> + (lambda (secret port) + (format port "<secret>"))) + (define* (read-lines #:optional (port (current-input-port))) "Read lines from PORT and return them as a list." (let loop ((line (read-line port)) |