Browse Source

ui: Rename '_' to 'G_'.

This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance.  See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.

* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'.  Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
gn-latest-20200428
Ludovic Courtès 4 years ago
parent
commit
69daee23af
No known key found for this signature in database GPG Key ID: 90B11993D9AEBB5
52 changed files with 681 additions and 678 deletions
  1. +4
    -1
      build-aux/compile-all.scm
  2. +9
    -9
      gnu/packages.scm
  3. +5
    -5
      gnu/services.scm
  4. +2
    -2
      gnu/services/shepherd.scm
  5. +4
    -4
      gnu/system.scm
  6. +2
    -2
      gnu/system/shadow.scm
  7. +1
    -1
      guix/gnupg.scm
  8. +2
    -2
      guix/http-client.scm
  9. +1
    -1
      guix/import/cpan.scm
  10. +2
    -2
      guix/import/elpa.scm
  11. +3
    -3
      guix/import/pypi.scm
  12. +2
    -2
      guix/nar.scm
  13. +2
    -2
      guix/scripts.scm
  14. +23
    -23
      guix/scripts/archive.scm
  15. +6
    -6
      guix/scripts/authenticate.scm
  16. +42
    -42
      guix/scripts/build.scm
  17. +12
    -12
      guix/scripts/challenge.scm
  18. +7
    -7
      guix/scripts/container.scm
  19. +8
    -8
      guix/scripts/container/exec.scm
  20. +8
    -8
      guix/scripts/copy.scm
  21. +12
    -12
      guix/scripts/download.scm
  22. +7
    -7
      guix/scripts/edit.scm
  23. +21
    -21
      guix/scripts/environment.scm
  24. +22
    -22
      guix/scripts/gc.scm
  25. +15
    -15
      guix/scripts/graph.scm
  26. +10
    -10
      guix/scripts/hash.scm
  27. +7
    -7
      guix/scripts/import.scm
  28. +7
    -7
      guix/scripts/import/cpan.scm
  29. +8
    -8
      guix/scripts/import/cran.scm
  30. +7
    -7
      guix/scripts/import/crate.scm
  31. +8
    -8
      guix/scripts/import/elpa.scm
  32. +7
    -7
      guix/scripts/import/gem.scm
  33. +7
    -7
      guix/scripts/import/gnu.scm
  34. +12
    -12
      guix/scripts/import/hackage.scm
  35. +5
    -5
      guix/scripts/import/nix.scm
  36. +7
    -7
      guix/scripts/import/pypi.scm
  37. +9
    -9
      guix/scripts/import/stackage.scm
  38. +55
    -55
      guix/scripts/lint.scm
  39. +24
    -24
      guix/scripts/offload.scm
  40. +13
    -13
      guix/scripts/pack.scm
  41. +39
    -39
      guix/scripts/package.scm
  42. +4
    -4
      guix/scripts/perform-download.scm
  43. +23
    -23
      guix/scripts/publish.scm
  44. +13
    -13
      guix/scripts/pull.scm
  45. +25
    -25
      guix/scripts/refresh.scm
  46. +11
    -11
      guix/scripts/size.scm
  47. +33
    -33
      guix/scripts/substitute.scm
  48. +58
    -58
      guix/scripts/system.scm
  49. +4
    -4
      guix/ssh.scm
  50. +58
    -58
      guix/ui.scm
  51. +4
    -4
      guix/upstream.scm
  52. +1
    -1
      po/guix/Makevars

+ 4
- 1
build-aux/compile-all.scm View File

@ -24,7 +24,10 @@
(guix build utils))
(define warnings
'(unsupported-warning format unbound-variable arity-mismatch))
;; FIXME: 'format' is missing because it reports "non-literal format
;; strings" due to the fact that we use 'G_' instead of '_'. We'll need
;; help from Guile to solve this.
'(unsupported-warning unbound-variable arity-mismatch))
(define host (getenv "host"))


+ 9
- 9
gnu/packages.scm View File

@ -89,7 +89,7 @@
"Search the patch FILE-NAME. Raise an error if not found."
(or (search-path (%patch-path) file-name)
(raise (condition
(&message (message (format #f (_ "~a: patch not found")
(&message (message (format #f (G_ "~a: patch not found")
file-name)))))))
(define-syntax-rule (search-patches file-name ...)
@ -105,7 +105,7 @@ found."
(raise (condition
(&message
(message
(format #f (_ "could not find bootstrap binary '~a' \
(format #f (G_ "could not find bootstrap binary '~a' \
for system '~a'")
file-name system)))))))
@ -157,7 +157,7 @@ returned list is sorted in alphabetical order."
result)
(const #f) ; skip
(lambda (path stat errno result)
(warning (_ "cannot access `~a': ~a~%")
(warning (G_ "cannot access `~a': ~a~%")
path (strerror errno))
result)
'()
@ -310,21 +310,21 @@ return its return value."
(match (find-best-packages-by-name name version)
((pkg . pkg*)
(unless (null? pkg*)
(warning (_ "ambiguous package specification `~a'~%") spec)
(warning (_ "choosing ~a@~a from ~a~%")
(warning (G_ "ambiguous package specification `~a'~%") spec)
(warning (G_ "choosing ~a@~a from ~a~%")
(package-name pkg) (package-version pkg)
(location->string (package-location pkg))))
(match (package-superseded pkg)
((? package? new)
(info (_ "package '~a' has been superseded by '~a'~%")
(info (G_ "package '~a' has been superseded by '~a'~%")
(package-name pkg) (package-name new))
new)
(#f
pkg)))
(x
(if version
(leave (_ "~A: package not found for version ~a~%") name version)
(leave (_ "~A: unknown package~%") name)))))
(leave (G_ "~A: package not found for version ~a~%") name version)
(leave (G_ "~A: unknown package~%") name)))))
(define (specification->package spec)
"Return a package matching SPEC. SPEC may be a package name, or a package
@ -352,6 +352,6 @@ version; if SPEC does not specify an output, return OUTPUT."
(package
(if (member sub-drv (package-outputs package))
(values package sub-drv)
(leave (_ "package `~a' lacks output `~a'~%")
(leave (G_ "package `~a' lacks output `~a'~%")
(package-full-name package)
sub-drv))))))

+ 5
- 5
gnu/services.scm View File

@ -183,7 +183,7 @@ TYPE does not have a default value, an error is raised."
(condition
(&missing-value-service-error (type type) (location location))
(&message
(message (format #f (_ "~a: no value specified \
(message (format #f (G_ "~a: no value specified \
for service of type '~a'")
(location->string location)
(service-type-name type)))))))
@ -624,7 +624,7 @@ kernel."
(target-type target-type))
(&message
(message
(format #f (_ "no target of type '~a' for service ~s")
(format #f (G_ "no target of type '~a' for service ~s")
(service-type-name target-type)
service))))))
(x
@ -635,7 +635,7 @@ kernel."
(&message
(message
(format #f
(_ "more than one target service of type '~a'")
(G_ "more than one target service of type '~a'")
(service-type-name target-type))))))))))
(fold add-edge edges (service-type-extensions (service-kind service))))
@ -686,7 +686,7 @@ TARGET-TYPE; return the root service adjusted accordingly."
(service #f)
(target-type target-type))
(&message
(message (format #f (_ "service of type '~a' not found")
(message (format #f (G_ "service of type '~a' not found")
(service-type-name target-type)))))))
(x
(raise
@ -696,7 +696,7 @@ TARGET-TYPE; return the root service adjusted accordingly."
(&message
(message
(format #f
(_ "more than one target service of type '~a'")
(G_ "more than one target service of type '~a'")
(service-type-name target-type)))))))))
;;; services.scm ends here.

+ 2
- 2
gnu/services/shepherd.scm View File

@ -163,7 +163,7 @@ assertion failure."
(raise (condition
(&message
(message
(format #f (_ "service '~a' provided more than once")
(format #f (G_ "service '~a' provided more than once")
symbol)))))))
(for-each assert-unique (shepherd-service-provision service))
@ -178,7 +178,7 @@ assertion failure."
(raise (condition
(&message
(message
(format #f (_ "service '~a' requires '~a', \
(format #f (G_ "service '~a' requires '~a', \
which is not provided by any service")
(match (shepherd-service-provision service)
((head . _) head)


+ 4
- 4
gnu/system.scm View File

@ -522,7 +522,7 @@ This is for backward-compatibility of fields that used to be strings and are
now file-like objects.."
(match thing
((? string?)
(warning (_ "using a string for file '~a' is deprecated; \
(warning (G_ "using a string for file '~a' is deprecated; \
use 'plain-file' instead~%")
file-name)
(plain-file file-name thing))
@ -538,7 +538,7 @@ and are now file-like objects."
(with-monad %store-monad
(match thing
((? procedure?)
(warning (_ "using a monadic value for '~a' is deprecated; \
(warning (G_ "using a monadic value for '~a' is deprecated; \
use 'plain-file' instead~%")
file-name)
thing)
@ -680,7 +680,7 @@ hardware-related operations as necessary when booting a Linux container."
(#f
(raise (condition
(&message
(message (format #f (_ "~a: invalid locale name") name))))))
(message (format #f (G_ "~a: invalid locale name") name))))))
(def def)))
(define (operating-system-locale-directory os)
@ -862,7 +862,7 @@ this file is the reconstruction of GRUB menu entries for old configurations."
(_ ;the old format
"/")))))
(x ;unsupported format
(warning (_ "unrecognized boot parameters for '~a'~%")
(warning (G_ "unrecognized boot parameters for '~a'~%")
system)
#f)))


+ 2
- 2
gnu/system/shadow.scm View File

@ -220,7 +220,7 @@ set debug-file-directory ~/.guix-profile/lib/debug\n")))
(raise (condition
(&message
(message
(format #f (_ "supplementary group '~a' \
(format #f (G_ "supplementary group '~a' \
of user '~a' is undeclared")
group
(user-account-name user))))))))
@ -230,7 +230,7 @@ of user '~a' is undeclared")
(raise (condition
(&message
(message
(format #f (_ "primary group '~a' \
(format #f (G_ "primary group '~a' \
of user '~a' is undeclared")
(user-account-group user)
(user-account-name user)))))))


+ 1
- 1
guix/gnupg.scm View File

@ -166,7 +166,7 @@ and 'interactive' (default)."
(define (receive?)
(let ((answer
(begin (format #t (_ "~a~a~%")
(begin (format #t (G_ "~a~a~%")
"Would you like to download this key "
"and add it to your keyring?")
(read-line))))


+ 2
- 2
guix/http-client.scm View File

@ -262,7 +262,7 @@ Raise an '&http-get-error' condition if downloading fails."
302) ; found (redirection)
(let ((uri (resolve-uri-reference (response-location resp) uri)))
(close-port port)
(format #t (_ "following redirection to `~a'...~%")
(format #t (G_ "following redirection to `~a'...~%")
(uri->string uri))
(loop uri)))
(else
@ -274,7 +274,7 @@ Raise an '&http-get-error' condition if downloading fails."
(message
(format
#f
(_ "~a: HTTP download failed: ~a (~s)")
(G_ "~a: HTTP download failed: ~a (~s)")
(uri->string uri) code
(response-reason-phrase resp))))))))))))


+ 1
- 1
guix/import/cpan.scm View File

@ -288,7 +288,7 @@ META."
;; Warn about inputs that are part of perl's core
(unless (null? core-inputs)
(for-each (lambda (module)
(warning (_ "input '~a' of ~a is in Perl core~%")
(warning (G_ "input '~a' of ~a is in Perl core~%")
module (package-name package)))
core-inputs)))
(let ((version (cpan-version meta))


+ 2
- 2
guix/import/elpa.scm View File

@ -82,7 +82,7 @@ NAMES (strings)."
;; Use a relatively small TTL for the archive itself.
(parameterize ((%http-cache-ttl (* 6 3600)))
(call-with-downloaded-file url read))
(leave (_ "~A: currently not supported~%") repo))))
(leave (G_ "~A: currently not supported~%") repo))))
(define* (call-with-downloaded-file url proc #:optional (error-thunk #f))
"Fetch URL, store the content in a temporary file and call PROC with that
@ -94,7 +94,7 @@ return its value or leave if it's false."
(lambda (key . args)
(if error-thunk
(error-thunk)
(leave (_ "~A: download failed~%") url)))))
(leave (G_ "~A: download failed~%") url)))))
(define (is-elpa-package? name elpa-pkg-spec)
"Return true if the string NAME corresponds to the name of the package


+ 3
- 3
guix/import/pypi.scm View File

@ -132,7 +132,7 @@ extracted in the current directory, and will be deleted."
(string-drop-right basename 8))
(else
(begin
(warning (_ "Unsupported archive format: \
(warning (G_ "Unsupported archive format: \
cannot determine package dependencies"))
#f)))))
@ -215,7 +215,7 @@ cannot determine package dependencies"))
(delete-file req-file)
(rmdir dirname)))
(begin
(warning (_ "'tar xf' failed with exit code ~a\n")
(warning (G_ "'tar xf' failed with exit code ~a\n")
exit-code)
'())))
'())))
@ -279,7 +279,7 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE."
(and package
(guard (c ((missing-source-error? c)
(let ((package (missing-source-error-package c)))
(leave (_ "no source release for pypi package ~a ~a~%")
(leave (G_ "no source release for pypi package ~a ~a~%")
(assoc-ref* package "info" "name")
(assoc-ref* package "info" "version")))))
(let ((name (assoc-ref* package "info" "name"))


+ 2
- 2
guix/nar.scm View File

@ -208,7 +208,7 @@ s-expression"))
(hash (get-hash))
(has-sig? (= 1 (read-int port))))
(format log-port
(_ "importing file or directory '~a'...~%")
(G_ "importing file or directory '~a'...~%")
file)
;; The signature may contain characters that are meant to be
@ -219,7 +219,7 @@ s-expression"))
(begin
(assert-valid-signature sig hash file)
(format log-port
(_ "found valid signature for '~a'~%")
(G_ "found valid signature for '~a'~%")
file)
(finalize-store-file temp file
#:references refs


+ 2
- 2
guix/scripts.scm View File

@ -50,7 +50,7 @@ reporting."
operand-proc seeds))
(lambda (key proc msg args . rest)
;; XXX: MSG is not i18n'd.
(leave (_ "invalid argument: ~a~%")
(leave (G_ "invalid argument: ~a~%")
(apply format #f msg args)))))
(define (environment-build-options)
@ -76,7 +76,7 @@ parameter of 'args-fold'."
;; Actual parsing takes place here.
(apply args-fold* args options
(lambda (opt name arg . rest)
(leave (_ "~A: unrecognized option~%") name))
(leave (G_ "~A: unrecognized option~%") name))
argument-handler
seeds))


+ 23
- 23
guix/scripts/archive.scm View File

@ -58,41 +58,41 @@
(verbosity . 0)))
(define (show-help)
(display (_ "Usage: guix archive [OPTION]... PACKAGE...
(display (G_ "Usage: guix archive [OPTION]... PACKAGE...
Export/import one or more packages from/to the store.\n"))
(display (_ "
(display (G_ "
--export export the specified files/packages to stdout"))
(display (_ "
(display (G_ "
-r, --recursive combined with '--export', include dependencies"))
(display (_ "
(display (G_ "
--import import from the archive passed on stdin"))
(display (_ "
(display (G_ "
--missing print the files from stdin that are missing"))
(display (_ "
(display (G_ "
-x, --extract=DIR extract the archive on stdin to DIR"))
(newline)
(display (_ "
(display (G_ "
--generate-key[=PARAMETERS]
generate a key pair with the given parameters"))
(display (_ "
(display (G_ "
--authorize authorize imports signed by the public key on stdin"))
(newline)
(display (_ "
(display (G_ "
-e, --expression=EXPR build the package or derivation EXPR evaluates to"))
(display (_ "
(display (G_ "
-S, --source build the packages' source derivations"))
(display (_ "
(display (G_ "
-s, --system=SYSTEM attempt to build for SYSTEM--e.g., \"i686-linux\""))
(display (_ "
(display (G_ "
--target=TRIPLET cross-build for TRIPLET--e.g., \"armel-linux-gnu\""))
(newline)
(show-build-options-help)
(newline)
(display (_ "
(display (G_ "
-h, --help display this help and exit"))
(display (_ "
(display (G_ "
-V, --version display version information and exit"))
(newline)
(show-bug-report-information))
@ -140,7 +140,7 @@ Export/import one or more packages from/to the store.\n"))
(or arg %key-generation-parameters))))
(alist-cons 'generate-key params result)))
(lambda (key proc err)
(leave (_ "invalid key generation parameters: ~a: ~a~%")
(leave (G_ "invalid key generation parameters: ~a: ~a~%")
(error-source err)
(error-string err))))))
(option '("authorize") #f #f
@ -179,7 +179,7 @@ derivation of a package."
(let ((source (package-source p)))
(if source
(package-source-derivation store source)
(leave (_ "package `~a' has no source~%")
(leave (G_ "package `~a' has no source~%")
(package-name p))))
(package-derivation store p system)))
((? procedure? proc)
@ -248,25 +248,25 @@ resulting archive to the standard output port."
(build-derivations store drv))
(export-paths store files (current-output-port)
#:recursive? (assoc-ref opts 'export-recursive?))
(leave (_ "unable to export the given packages~%")))))
(leave (G_ "unable to export the given packages~%")))))
(define (generate-key-pair parameters)
"Generate a key pair with PARAMETERS, a canonical sexp, and store it in the
right place."
(when (or (file-exists? %public-key-file)
(file-exists? %private-key-file))
(leave (_ "key pair exists under '~a'; remove it first~%")
(leave (G_ "key pair exists under '~a'; remove it first~%")
(dirname %public-key-file)))
(format (current-error-port)
(_ "Please wait while gathering entropy to generate the key pair;
(G_ "Please wait while gathering entropy to generate the key pair;
this may take time...~%"))
(let* ((pair (catch 'gcry-error
(lambda ()
(generate-key parameters))
(lambda (key proc err)
(leave (_ "key generation failed: ~a: ~a~%")
(leave (G_ "key generation failed: ~a: ~a~%")
(error-source err)
(error-string err)))))
(public (find-sexp-token pair 'public-key))
@ -293,13 +293,13 @@ the input port."
(lambda ()
(string->canonical-sexp (read-string (current-input-port))))
(lambda (key proc err)
(leave (_ "failed to read public key: ~a: ~a~%")
(leave (G_ "failed to read public key: ~a: ~a~%")
(error-source err) (error-string err)))))
(let ((key (read-key))
(acl (current-acl)))
(unless (eq? 'public-key (canonical-sexp-nth-data key 0))
(leave (_ "s-expression does not denote a public key~%")))
(leave (G_ "s-expression does not denote a public key~%")))
;; Add KEY to the ACL and write that.
(let ((acl (public-keys->acl (cons key (acl->public-keys acl)))))
@ -345,5 +345,5 @@ the input port."
(restore-file (current-input-port) target)))
(else
(leave
(_ "either '--export' or '--import' \
(G_ "either '--export' or '--import' \
must be specified~%"))))))))))))

+ 6
- 6
guix/scripts/authenticate.scm View File

@ -56,7 +56,7 @@ both the hash and the actual signature."
".pub")
read-canonical-sexp)
(leave
(_ "cannot find public key for secret key '~a'~%")
(G_ "cannot find public key for secret key '~a'~%")
key-file)))
(data (read-hash-data port (key-type public-key)))
(signature (signature-sexp data secret-key public-key)))
@ -76,11 +76,11 @@ to stdout upon success."
(let ((hash (hash-data->bytevector data)))
(display (bytevector->base16-string hash))
#t) ; success
(leave (_ "error: invalid signature: ~a~%")
(leave (G_ "error: invalid signature: ~a~%")
(canonical-sexp->string signature)))
(leave (_ "error: unauthorized public key: ~a~%")
(leave (G_ "error: unauthorized public key: ~a~%")
(canonical-sexp->string subject)))
(leave (_ "error: corrupt signature data: ~a~%")
(leave (G_ "error: corrupt signature data: ~a~%")
(canonical-sexp->string signature)))))
@ -118,12 +118,12 @@ to stdout upon success."
(("rsautl" "-verify" "-inkey" _ "-pubin")
(validate-signature (current-input-port)))
(("--help")
(display (_ "Usage: guix authenticate OPTION...
(display (G_ "Usage: guix authenticate OPTION...
Sign or verify the signature on the given file. This tool is meant to
be used internally by 'guix-daemon'.\n")))
(("--version")
(show-version-and-exit "guix authenticate"))
(else
(leave (_ "wrong arguments"))))))
(leave (G_ "wrong arguments"))))))
;;; authenticate.scm ends here

+ 42
- 42
guix/scripts/build.scm View File

@ -121,7 +121,7 @@ found. Return #f if no build log was found."
0
paths))))
(lambda args
(leave (_ "failed to create GC root `~a': ~a~%")
(leave (G_ "failed to create GC root `~a': ~a~%")
root (strerror (system-error-errno args)))))))
(define register-root*
@ -203,7 +203,7 @@ could not be found."
(proc (specification->package old)
(specification->package new)))
(x
(leave (_ "invalid replacement specification: ~s~%") spec))))
(leave (G_ "invalid replacement specification: ~s~%") spec))))
specs))
(define (transform-package-inputs replacement-specs)
@ -260,13 +260,13 @@ current 'gnutls' package, after which version 3.5.4 is grafted onto them."
(parser 'with-graft)))))
(define (show-transformation-options-help)
(display (_ "
(display (G_ "
--with-source=SOURCE
use SOURCE when building the corresponding package"))
(display (_ "
(display (G_ "
--with-input=PACKAGE=REPLACEMENT
replace dependency PACKAGE by REPLACEMENT"))
(display (_ "
(display (G_ "
--with-graft=PACKAGE=REPLACEMENT
graft REPLACEMENT on packages that refer to PACKAGE")))
@ -291,7 +291,7 @@ derivation, etc.), applies the transformations specified by OPTS."
(((name . transform) obj)
(let ((new (transform store obj)))
(when (eq? new obj)
(warning (_ "transformation '~a' had no effect on ~a~%")
(warning (G_ "transformation '~a' had no effect on ~a~%")
name
(if (package? obj)
(package-full-name obj)
@ -309,37 +309,37 @@ derivation, etc.), applies the transformations specified by OPTS."
"Display on the current output port help about the standard command-line
options handled by 'set-build-options-from-command-line', and listed in
'%standard-build-options'."
(display (_ "
(display (G_ "
-L, --load-path=DIR prepend DIR to the package module search path"))
(display (_ "
(display (G_ "
-K, --keep-failed keep build tree of failed builds"))
(display (_ "
(display (G_ "
-k, --keep-going keep going when some of the derivations fail"))
(display (_ "
(display (G_ "
-n, --dry-run do not build the derivations"))
(display (_ "
(display (G_ "
--fallback fall back to building when the substituter fails"))
(display (_ "
(display (G_ "
--no-substitutes build instead of resorting to pre-built substitutes"))
(display (_ "
(display (G_ "
--substitute-urls=URLS
fetch substitute from URLS if they are authorized"))
(display (_ "
(display (G_ "
--no-grafts do not graft packages"))
(display (_ "
(display (G_ "
--no-build-hook do not attempt to offload builds via the build hook"))
(display (_ "
(display (G_ "
--max-silent-time=SECONDS
mark the build as failed after SECONDS of silence"))
(display (_ "
(display (G_ "
--timeout=SECONDS mark the build as failed after SECONDS of activity"))
(display (_ "
(display (G_ "
--verbosity=LEVEL use the given verbosity LEVEL"))
(display (_ "
(display (G_ "
--rounds=N build N times in a row to detect non-determinism"))
(display (_ "
(display (G_ "
-c, --cores=N allow the use of up to N CPU cores for the build"))
(display (_ "
(display (G_ "
-M, --max-jobs=N allow at most N build jobs")))
(define (set-build-options-from-command-line store opts)
@ -445,14 +445,14 @@ options handled by 'set-build-options-from-command-line', and listed in
(let ((c (false-if-exception (string->number arg))))
(if c
(apply values (alist-cons 'cores c result) rest)
(leave (_ "not a number: '~a' option argument: ~a~%")
(leave (G_ "not a number: '~a' option argument: ~a~%")
name arg)))))
(option '(#\M "max-jobs") #t #f
(lambda (opt name arg result . rest)
(let ((c (false-if-exception (string->number arg))))
(if c
(apply values (alist-cons 'max-jobs c result) rest)
(leave (_ "not a number: '~a' option argument: ~a~%")
(leave (G_ "not a number: '~a' option argument: ~a~%")
name arg)))))))
@ -471,43 +471,43 @@ options handled by 'set-build-options-from-command-line', and listed in
(verbosity . 0)))
(define (show-help)
(display (_ "Usage: guix build [OPTION]... PACKAGE-OR-DERIVATION...
(display (G_ "Usage: guix build [OPTION]... PACKAGE-OR-DERIVATION...
Build the given PACKAGE-OR-DERIVATION and return their output paths.\n"))
(display (_ "
(display (G_ "
-e, --expression=EXPR build the package or derivation EXPR evaluates to"))
(display (_ "
(display (G_ "
-f, --file=FILE build the package or derivation that the code within
FILE evaluates to"))
(display (_ "
(display (G_ "
-S, --source build the packages' source derivations"))
(display (_ "
(display (G_ "
--sources[=TYPE] build source derivations; TYPE may optionally be one
of \"package\", \"all\" (default), or \"transitive\""))
(display (_ "
(display (G_ "
-s, --system=SYSTEM attempt to build for SYSTEM--e.g., \"i686-linux\""))
(display (_ "
(display (G_ "
--target=TRIPLET cross-build for TRIPLET--e.g., \"armel-linux-gnu\""))
(display (_ "
(display (G_ "
-d, --derivations return the derivation paths of the given packages"))
(display (_ "
(display (G_ "
--check rebuild items to check for non-determinism issues"))
(display (_ "
(display (G_ "
--repair repair the specified items"))
(display (_ "
(display (G_ "
-r, --root=FILE make FILE a symlink to the result, and register it
as a garbage collector root"))
(display (_ "
(display (G_ "
-q, --quiet do not show the build log"))
(display (_ "
(display (G_ "
--log-file return the log file names for the given derivations"))
(newline)
(show-build-options-help)
(newline)
(show-transformation-options-help)
(newline)
(display (_ "
(display (G_ "
-h, --help display this help and exit"))
(display (_ "
(display (G_ "
-V, --version display version information and exit"))
(newline)
(show-bug-report-information))
@ -534,7 +534,7 @@ Build the given PACKAGE-OR-DERIVATION and return their output paths.\n"))
("transitive"
(alist-cons 'source package-transitive-sources result))
(else
(leave (_ "invalid argument: '~a' option argument: ~a, ~
(leave (G_ "invalid argument: '~a' option argument: ~a, ~
must be one of 'package', 'all', or 'transitive'~%")
name arg)))))
(option '("check") #f #f
@ -587,7 +587,7 @@ must be one of 'package', 'all', or 'transitive'~%")
build---packages, gexps, derivations, and so on."
(define (validate-type x)
(unless (or (package? x) (derivation? x) (gexp? x) (procedure? x))
(leave (_ "~s: not something we can build~%") x)))
(leave (G_ "~s: not something we can build~%") x)))
(define (ensure-list x)
(let ((lst (match x
@ -641,7 +641,7 @@ build."
(match (package-source p)
(#f
(format (current-error-port)
(_ "~a: warning: \
(G_ "~a: warning: \
package '~a' has no source~%")
(location->string (package-location p))
(package-name p))
@ -675,7 +675,7 @@ needed."
(log-url store file #:base-urls urls))))
(if log
(format #t "~a~%" log)
(leave (_ "no build log for '~a'~%") file))))
(leave (G_ "no build log for '~a'~%") file))))
;;;


+ 12
- 12
guix/scripts/challenge.scm View File

@ -188,10 +188,10 @@ object. When VERBOSE?, display matches in addition to mismatches and
inconclusive reports."
(define (report-hashes item local narinfos)
(if local
(report (_ " local hash: ~a~%") (hash->string local))
(report (_ " no local build for '~a'~%") item))
(report (G_ " local hash: ~a~%") (hash->string local))
(report (G_ " no local build for '~a'~%") item))
(for-each (lambda (narinfo)
(report (_ " ~50a: ~a~%")
(report (G_ " ~50a: ~a~%")
(uri->string (narinfo-uri narinfo))
(hash->string
(narinfo-hash->sha256 (narinfo-hash narinfo)))))
@ -199,15 +199,15 @@ inconclusive reports."
(match comparison-report
(($ <comparison-report> item 'mismatch local (narinfos ...))
(report (_ "~a contents differ:~%") item)
(report (G_ "~a contents differ:~%") item)
(report-hashes item local narinfos))
(($ <comparison-report> item 'inconclusive #f narinfos)
(warning (_ "could not challenge '~a': no local build~%") item))
(warning (G_ "could not challenge '~a': no local build~%") item))
(($ <comparison-report> item 'inconclusive locals ())
(warning (_ "could not challenge '~a': no substitutes~%") item))
(warning (G_ "could not challenge '~a': no substitutes~%") item))
(($ <comparison-report> item 'match local (narinfos ...))
(when verbose?
(report (_ "~a contents match:~%") item)
(report (G_ "~a contents match:~%") item)
(report-hashes item local narinfos)))))
@ -216,17 +216,17 @@ inconclusive reports."
;;;
(define (show-help)
(display (_ "Usage: guix challenge [PACKAGE...]
(display (G_ "Usage: guix challenge [PACKAGE...]
Challenge the substitutes for PACKAGE... provided by one or more servers.\n"))
(display (_ "
(display (G_ "
--substitute-urls=URLS
compare build results with those at URLS"))
(display (_ "
(display (G_ "
-v, --verbose show details about successful comparisons"))
(newline)
(display (_ "
(display (G_ "
-h, --help display this help and exit"))
(display (_ "
(display (G_ "
-V, --version display version information and exit"))
(newline)
(show-bug-report-information))


+ 7
- 7
guix/scripts/container.scm View File

@ -22,17 +22,17 @@
#:export (guix-container))
(define (show-help)
(display (_ "Usage: guix container ACTION ARGS...
(display (G_ "Usage: guix container ACTION ARGS...
Build and manipulate Linux containers.\n"))
(newline)
(display (_ "The valid values for ACTION are:\n"))
(display (G_ "The valid values for ACTION are:\n"))
(newline)
(display (_ "\
(display (G_ "\
exec execute a command inside of an existing container\n"))
(newline)
(display (_ "
(display (G_ "
-h, --help display this help and exit"))
(display (_ "
(display (G_ "
-V, --version display version information and exit"))
(newline)
(show-bug-report-information))
@ -50,7 +50,7 @@ Build and manipulate Linux containers.\n"))
(match args
(()
(format (current-error-port)
(_ "guix container: missing action~%")))
(G_ "guix container: missing action~%")))
((or ("-h") ("--help"))
(show-help)
(exit 0))
@ -60,4 +60,4 @@ Build and manipulate Linux containers.\n"))
(if (member action %actions)
(apply (resolve-action action) args)
(format (current-error-port)
(_ "guix container: invalid action~%")))))))
(G_ "guix container: invalid action~%")))))))

+ 8
- 8
guix/scripts/container/exec.scm View File

@ -37,12 +37,12 @@
(show-version-and-exit "guix container exec")))))
(define (show-help)
(display (_ "Usage: guix container exec PID COMMAND [ARGS...]
(display (G_ "Usage: guix container exec PID COMMAND [ARGS...]
Execute COMMMAND within the container process PID.\n"))
(newline)
(display (_ "
(display (G_ "
-h, --help display this help and exit"))
(display (_ "
(display (G_ "
-V, --version display version information and exit"))
(newline)
(show-bug-report-information))
@ -66,7 +66,7 @@ and the other containing arguments for the command to be executed."
(define (guix-container-exec . args)
(define (handle-argument arg result)
(if (assoc-ref result 'pid)
(leave (_ "~a: extraneous argument~%") arg)
(leave (G_ "~a: extraneous argument~%") arg)
(alist-cons 'pid (string->number* arg) result)))
(with-error-handling
@ -84,13 +84,13 @@ and the other containing arguments for the command to be executed."
'("TERM"))))
(unless pid
(leave (_ "no pid specified~%")))
(leave (G_ "no pid specified~%")))
(when (null? command)
(leave (_ "no command specified~%")))
(leave (G_ "no command specified~%")))
(unless (file-exists? (string-append "/proc/" (number->string pid)))
(leave (_ "no such process ~d~%") pid))
(leave (G_ "no such process ~d~%") pid))
(let ((result (container-excursion pid
(lambda ()
@ -102,4 +102,4 @@ and the other containing arguments for the command to be executed."
environment)
(apply execlp program program program-args)))))))
(unless (zero? result)
(leave (_ "exec failed with status ~d~%") result)))))))
(leave (G_ "exec failed with status ~d~%") result)))))))

+ 8
- 8
guix/scripts/copy.scm View File

@ -56,9 +56,9 @@ number (or #f) corresponding to SPEC."
((? integer? port)
(values user host port))
(x
(leave (_ "~a: invalid TCP port number~%") port))))
(leave (G_ "~a: invalid TCP port number~%") port))))
(x
(leave (_ "~a: invalid SSH specification~%") spec))))
(leave (G_ "~a: invalid SSH specification~%") spec))))
(define (send-to-remote-host target opts)
"Send ITEMS to TARGET. ITEMS is a list of store items or package names; for ;
@ -109,18 +109,18 @@ package names, build the underlying packages before sending them."
;;;
(define (show-help)
(display (_ "Usage: guix copy [OPTION]... ITEMS...
(display (G_ "Usage: guix copy [OPTION]... ITEMS...
Copy ITEMS to or from the specified host over SSH.\n"))
(display (_ "
(display (G_ "
--to=HOST send ITEMS to HOST"))
(display (_ "
(display (G_ "
--from=HOST receive ITEMS from HOST"))
(newline)
(show-build-options-help)
(newline)
(display (_ "
(display (G_ "
-h, --help display this help and exit"))
(display (_ "
(display (G_ "
-V, --version display version information and exit"))
(newline)
(show-bug-report-information))
@ -165,4 +165,4 @@ Copy ITEMS to or from the specified host over SSH.\n"))
(target (assoc-ref opts 'destination)))
(cond (target (send-to-remote-host target opts))
(source (retrieve-from-remote-host source opts))
(else (leave (_ "use '--to' or '--from'~%")))))))
(else (leave (G_ "use '--to' or '--from'~%")))))))

+ 12
- 12
guix/scripts/download.scm View File

@ -64,23 +64,23 @@
(download-proc . ,download-to-store*)))
(define (show-help)
(display (_ "Usage: guix download [OPTION] URL
(display (G_ "Usage: guix download [OPTION] URL
Download the file at URL to the store or to the given file, and print its
file name and the hash of its contents.
Supported formats: 'nix-base32' (default), 'base32', and 'base16'
('hex' and 'hexadecimal' can be used as well).\n"))
(format #t (_ "
(format #t (G_ "
-f, --format=FMT write the hash in the given format"))
(format #t (_ "
(format #t (G_ "
--no-check-certificate
do not validate the certificate of HTTPS servers "))
(format #f (_ "
(format #f (G_ "
-o, --output=FILE download to FILE"))
(newline)
(display (_ "
(display (G_ "
-h, --help display this help and exit"))
(display (_ "
(display (G_ "
-V, --version display version information and exit"))
(newline)
(show-bug-report-information))
@ -98,7 +98,7 @@ Supported formats: 'nix-base32' (default), 'base32', and 'base16'
((or "base16" "hex" "hexadecimal")
bytevector->base16-string)
(x
(leave (_ "unsupported hash format: ~a~%") arg))))
(leave (G_ "unsupported hash format: ~a~%") arg))))
(alist-cons 'format fmt-proc
(alist-delete 'format result))))
@ -130,10 +130,10 @@ Supported formats: 'nix-base32' (default), 'base32', and 'base16'
;; Return the alist of option values.
(args-fold* args %options
(lambda (opt name arg result)
(leave (_ "~A: unrecognized option~%") name))
(leave (G_ "~A: unrecognized option~%") name))
(lambda (arg result)
(when (assq 'argument result)
(leave (_ "~A: extraneous argument~%") arg))
(leave (G_ "~A: extraneous argument~%") arg))
(alist-cons 'argument arg result))
%default-options))
@ -141,9 +141,9 @@ Supported formats: 'nix-base32' (default), 'base32', and 'base16'
(with-error-handling
(let* ((opts (parse-options))
(arg (or (assq-ref opts 'argument)
(leave (_ "no download URI was specified~%"))))
(leave (G_ "no download URI was specified~%"))))
(uri (or (string->uri arg)
(leave (_ "~a: failed to parse URI~%")
(leave (G_ "~a: failed to parse URI~%")
arg)))
(fetch (assq-ref opts 'download-proc))
(path (parameterize ((current-terminal-columns
@ -153,7 +153,7 @@ Supported formats: 'nix-base32' (default), 'base32', and 'base16'
(assq-ref opts 'verify-certificate?))))
(hash (call-with-input-file
(or path
(leave (_ "~a: download failed~%")
(leave (G_ "~a: download failed~%")
arg))
port-sha256))
(fmt (assq-ref opts 'format)))


+ 7
- 7
guix/scripts/edit.scm View File

@ -38,12 +38,12 @@
(show-version-and-exit "guix edit")))))
(define (show-help)
(display (_ "Usage: guix edit PACKAGE...
(display (G_ "Usage: guix edit PACKAGE...
Start $VISUAL or $EDITOR to edit the definitions of PACKAGE...\n"))
(newline)
(display (_ "
(display (G_ "
-h, --help display this help and exit"))
(display (_ "
(display (G_ "
-V, --version display version information and exit"))
(newline)
(show-bug-report-information))
@ -59,7 +59,7 @@ Start $VISUAL or $EDITOR to edit the definitions of PACKAGE...\n"))
(let ((absolute-file-name (search-path path file)))
(unless absolute-file-name
;; Shouldn't happen unless somebody fiddled with the 'location' field.
(leave (_ "file '~a' not found in search path ~s~%")
(leave (G_ "file '~a' not found in search path ~s~%")
file path))
absolute-file-name))
@ -78,7 +78,7 @@ line."
;; Return the list of package names.
(args-fold* args %options
(lambda (opt name arg result)
(leave (_ "~A: unrecognized option~%") name))
(leave (G_ "~A: unrecognized option~%") name))
cons
'()))
@ -87,7 +87,7 @@ line."
(packages (map specification->package specs)))
(for-each (lambda (package)
(unless (package-location package)
(leave (_ "source location of package '~a' is unknown~%")
(leave (G_ "source location of package '~a' is unknown~%")
(package-full-name package))))
packages)
@ -100,5 +100,5 @@ line."
(exit (system (string-join (cons (%editor) file-names))))))
(lambda args
(let ((errno (system-error-errno args)))
(leave (_ "failed to launch '~a': ~a~%")
(leave (G_ "failed to launch '~a': ~a~%")
(%editor) (strerror errno))))))))

+ 21
- 21
guix/scripts/environment.scm View File

@ -132,45 +132,45 @@ and an output string."
(package->bag package)))))
(define (show-help)
(display (_ "Usage: guix environment [OPTION]... PACKAGE... [-- COMMAND...]
(display (G_ "Usage: guix environment [OPTION]... PACKAGE... [-- COMMAND...]
Build an environment that includes the dependencies of PACKAGE and execute
COMMAND or an interactive shell in that environment.\n"))
(display (_ "
(display (G_ "
-e, --expression=EXPR create environment for the package that EXPR
evaluates to"))
(display (_ "
(display (G_ "
-l, --load=FILE create environment for the package that the code within
FILE evaluates to"))
(display (_ "
(display (G_ "
--ad-hoc include all specified packages in the environment instead
of only their inputs"))
(display (_ "
(display (G_ "
--pure unset existing environment variables"))
(display (_ "
(display (G_ "
--search-paths display needed environment variable definitions"))
(display (_ "
(display (G_ "
-s, --system=SYSTEM attempt to build for SYSTEM--e.g., \"i686-linux\""))
(display (_ "
(display (G_ "
-r, --root=FILE make FILE a symlink to the result, and register it
as a garbage collector root"))
(display (_ "
(display (G_ "
-C, --container run command within an isolated container"))
(display (_ "
(display (G_ "
-N, --network allow containers to access the network"))
(display (_ "
(display (G_ "
--share=SPEC for containers, share writable host file system
according to SPEC"))
(display (_ "
(display (G_ "
--expose=SPEC for containers, expose read-only host file system
according to SPEC"))
(display (_ "
(display (G_ "
--bootstrap use bootstrap binaries to build the environment"))
(newline)
(show-build-options-help)
(newline)
(display (_ "
(display (G_ "
-h, --help display this help and exit"))
(display (_ "
(display (G_ "
-V, --version display version information and exit"))
(newline)
(show-bug-report-information))
@ -501,16 +501,16 @@ Otherwise, return the derivation for the Bash package."
"Check if containers can be created and exit with an informative error
message if any test fails."
(unless (user-namespace-supported?)
(report-error (_ "cannot create container: user namespaces unavailable\n"))
(leave (_ "is your kernel version < 3.10?\n")))
(report-error (G_ "cannot create container: user namespaces unavailable\n"))
(leave (G_ "is your kernel version < 3.10?\n")))
(unless (unprivileged-user-namespace-supported?)
(report-error (_ "cannot create container: unprivileged user cannot create user namespaces\n"))
(leave (_ "please set /proc/sys/kernel/unprivileged_userns_clone to \"1\"\n")))
(report-error (G_ "cannot create container: unprivileged user cannot create user namespaces\n"))
(leave (G_ "please set /proc/sys/kernel/unprivileged_userns_clone to \"1\"\n")))
(unless (setgroups-supported?)
(report-error (_ "cannot create container: /proc/self/setgroups does not exist\n"))
(leave (_ "is your kernel version < 3.19?\n"))))
(report-error (G_ "cannot create container: /proc/self/setgroups does not exist\n"))
(leave (G_ "is your kernel version < 3.19?\n"))))
(define (register-gc-root target root)
"Make ROOT an indirect root to TARGET. This is procedure is idempotent."


+ 22
- 22
guix/scripts/gc.scm View File

@ -39,41 +39,41 @@
`((action . collect-garbage)))
(define (show-help)
(display (_ "Usage: guix gc [OPTION]... PATHS...
(display (G_ "Usage: guix gc [OPTION]... PATHS...
Invoke the garbage collector.\n"))
(display (_ "
(display (G_ "
-C, --collect-garbage[=MIN]
collect at least MIN bytes of garbage"))
(display (_ "
(display (G_ "
-F, --free-space=FREE attempt to reach FREE available space in the store"))
(display (_ "
(display (G_ "
-d, --delete attempt to delete PATHS"))
(display (_ "
(display (G_ "
--optimize optimize the store by deduplicating identical files"))
(display (_ "
(display (G_ "
--list-dead list dead paths"))
(display (_ "
(display (G_ "
--list-live list live paths"))
(newline)
(display (_ "
(display (G_ "
--references list the references of PATHS"))
(display (_ "
(display (G_ "
-R, --requisites list the requisites of PATHS"))
(display (_ "
(display (G_ "
--referrers list the referrers of PATHS"))
(newline)
(display (_ "
(display (G_ "
--verify[=OPTS] verify the integrity of the store; OPTS is a
comma-separated combination of 'repair' and
'contents'"))
(display (_ "
(display (G_ "
--list-failures list cached build failures"))
(display (_ "
(display (G_ "
--clear-failures remove PATHS from the set of cached failures"))
(newline)
(display (_ "
(display (G_ "
-h, --help display this help and exit"))
(display (_ "
(display (G_ "
-V, --version display version information and exit"))
(newline)
(show-bug-report-information))
@ -97,7 +97,7 @@ Invoke the garbage collector.\n"))
(let ((amount (size->number arg)))
(if arg
(alist-cons 'min-freed amount result)
(leave (_ "invalid amount of storage: ~a~%")
(leave (G_ "invalid amount of storage: ~a~%")
arg))))
(#f result)))))
(option '(#\F "free-space") #t #f
@ -161,7 +161,7 @@ Invoke the garbage collector.\n"))
;; Return the alist of option values.
(args-fold* args %options
(lambda (opt name arg result)
(leave (_ "~A: unrecognized option~%") name))
(leave (G_ "~A: unrecognized option~%") name))
(lambda (arg result)
(alist-cons 'argument arg result))
%default-options))
@ -188,10 +188,10 @@ Invoke the garbage collector.\n"))
(free (* (file-system-block-size fs)
(file-system-blocks-available fs))))
(if (> free space)
(info (_ "already ~h bytes available on ~a, nothing to do~%")
(info (G_ "already ~h bytes available on ~a, nothing to do~%")
free (%store-prefix))
(let ((to-free (- space free)))
(info (_ "freeing ~h bytes~%") to-free)
(info (G_ "freeing ~h bytes~%") to-free)
(collect-garbage store to-free)))))
(with-error-handling
@ -203,7 +203,7 @@ Invoke the garbage collector.\n"))
opts)))
(define (assert-no-extra-arguments)
(unless (null? paths)
(leave (_ "extraneous arguments: ~{~a ~}~%") paths)))
(leave (G_ "extraneous arguments: ~{~a ~}~%") paths)))
(define (list-relatives relatives)
(for-each (compose (lambda (path)
@ -223,10 +223,10 @@ Invoke the garbage collector.\n"))
(ensure-free-space store free-space))
(min-freed
(let-values (((paths freed) (collect-garbage store min-freed)))
(info (_ "freed ~h bytes~%") freed)))
(info (G_ "freed ~h bytes~%") freed)))
(else
(let-values (((paths freed) (collect-garbage store)))
(info (_ "freed ~h bytes~%") freed))))))
(info (G_ "freed ~h bytes~%") freed))))))
((delete)
(delete-paths store (map direct-store-path paths)))
((list-references)


+ 15
- 15
guix/scripts/graph.scm View File

@ -81,7 +81,7 @@ name."
(raise
(condition
(&message
(message (format #f (_ "~a: invalid argument (package name expected)")
(message (format #f (G_ "~a: invalid argument (package name expected)")
x))))))))
(define nodes-from-package
@ -305,7 +305,7 @@ substitutes."
((info)
(values (substitutable-references info) store))
(()
(leave (_ "references for '~a' are not known~%")
(leave (G_ "references for '~a' are not known~%")
item)))))
(values (references store item) store))))
@ -355,18 +355,18 @@ substitutes."
(or (find (lambda (type)
(string=? (node-type-name type) name))
%node-types)
(leave (_ "~a: unknown node type~%") name)))
(leave (G_ "~a: unknown node type~%") name)))
(define (lookup-backend name)
"Return the graph backend called NAME. Raise an error if it is not found."
(or (find (lambda (backend)
(string=? (graph-backend-name backend) name))
%graph-backends)
(leave (_ "~a: unknown backend~%") name)))
(leave (G_ "~a: unknown backend~%") name)))
(define (list-node-types)
"Print the available node types along with their synopsis."
(display (_ "The available node types are:\n"))
(display (G_ "The available node types are:\n"))
(newline)
(for-each (lambda (type)
(format #t " - ~a: ~a~%"
@ -376,7 +376,7 @@ substitutes."
(define (list-backends)
"Print the available backends along with their synopsis."
(display (_ "The available backend types are:\n"))
(display (G_ "The available backend types are:\n"))
(newline)
(for-each (lambda (backend)
(format #t " - ~a: ~a~%"
@ -420,22 +420,22 @@ substitutes."
(define (show-help)
;; TRANSLATORS: Here 'dot' is the name of a program; it must not be
;; translated.
(display (_ "Usage: guix graph PACKAGE