Archived
1
0
Fork 0

refresh: Add '--load-path' option.

* guix/scripts/refresh.scm (%option): Add '--load-path' option.
* doc/guix.texi: Document it.
This commit is contained in:
zimoun 2020-01-15 18:00:03 +01:00 committed by Pierre Neidhardt
parent 2d4688c1ea
commit 21f4fbdd84
No known key found for this signature in database
GPG key ID: 9BDCF497A4BBCC7F
2 changed files with 31 additions and 6 deletions

View file

@ -70,7 +70,7 @@ Copyright @copyright{} 2019 Kyle Andrews@*
Copyright @copyright{} 2019 Alex Griffin@* Copyright @copyright{} 2019 Alex Griffin@*
Copyright @copyright{} 2019 Guillaume Le Vaillant@* Copyright @copyright{} 2019 Guillaume Le Vaillant@*
Copyright @copyright{} 2020 Leo Prikler@* Copyright @copyright{} 2020 Leo Prikler@*
Copyright @copyright{} 2019 Simon Tournier@* Copyright @copyright{} 2019, 2020 Simon Tournier@*
Permission is granted to copy, distribute and/or modify this document Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or under the terms of the GNU Free Documentation License, Version 1.3 or
@ -1096,7 +1096,7 @@ similar file. It can be converted to the OpenSSH format using
@command{lsh-export-key} (@pxref{Converting keys,,, lsh, LSH Manual}): @command{lsh-export-key} (@pxref{Converting keys,,, lsh, LSH Manual}):
@example @example
$ lsh-export-key --openssh < /etc/lsh/host-key.pub $ lsh-export-key --openssh < /etc/lsh/host-key.pub
ssh-rsa AAAAB3NzaC1yc2EAAAAEOp8FoQAAAQEAs1eB46LV@dots{} ssh-rsa AAAAB3NzaC1yc2EAAAAEOp8FoQAAAQEAs1eB46LV@dots{}
@end example @end example
@ -6032,9 +6032,9 @@ build file @file{build.xml} with tasks to build the specified jar
archive. In this case the parameter @code{#:source-dir} can be used to archive. In this case the parameter @code{#:source-dir} can be used to
specify the source sub-directory, defaulting to ``src''. specify the source sub-directory, defaulting to ``src''.
The @code{#:main-class} parameter can be used with the minimal ant The @code{#:main-class} parameter can be used with the minimal ant
buildfile to specify the main class of the resulting jar. This makes the buildfile to specify the main class of the resulting jar. This makes the
jar file executable. The @code{#:test-include} parameter can be used to jar file executable. The @code{#:test-include} parameter can be used to
specify the list of junit tests to run. It defaults to specify the list of junit tests to run. It defaults to
@code{(list "**/*Test.java")}. The @code{#:test-exclude} can be used to @code{(list "**/*Test.java")}. The @code{#:test-exclude} can be used to
disable some tests. It defaults to @code{(list "**/Abstract*.java")}, disable some tests. It defaults to @code{(list "**/Abstract*.java")},
@ -9553,6 +9553,13 @@ the user whether to download it or not. This is the default behavior.
@item --key-server=@var{host} @item --key-server=@var{host}
Use @var{host} as the OpenPGP key server when importing a public key. Use @var{host} as the OpenPGP key server when importing a public key.
@item --load-path=@var{directory}
Add @var{directory} to the front of the package module search path
(@pxref{Package Modules}).
This allows users to define their own packages and make them visible to
the command-line tools.
@end table @end table
The @code{github} updater uses the The @code{github} updater uses the
@ -26114,7 +26121,7 @@ description: Install the given fonts on the specified ttys (fonts are per
+ virtual console on GNU/Linux). The value of this service is a list of + virtual console on GNU/Linux). The value of this service is a list of
+ tty/font pairs. The font can be the name of a font provided by the `kbd' + tty/font pairs. The font can be the name of a font provided by the `kbd'
+ package or any valid argument to `setfont', as in this example: + package or any valid argument to `setfont', as in this example:
+ +
+ '(("tty1" . "LatGrkCyr-8x16") + '(("tty1" . "LatGrkCyr-8x16")
+ ("tty2" . (file-append + ("tty2" . (file-append
+ font-tamzen + font-tamzen

View file

@ -7,6 +7,7 @@
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -27,6 +28,7 @@
#:use-module (guix ui) #:use-module (guix ui)
#:use-module (gcrypt hash) #:use-module (gcrypt hash)
#:use-module (guix scripts) #:use-module (guix scripts)
#:use-module ((guix scripts build) #:select (%standard-build-options))
#:use-module (guix store) #:use-module (guix store)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix packages) #:use-module (guix packages)
@ -116,6 +118,19 @@
(leave (G_ "unsupported policy: ~a~%") (leave (G_ "unsupported policy: ~a~%")
arg))))) arg)))))
;; The short option -L is already used by --list-updaters, therefore
;; it needs to be removed from %standard-build-options.
(let ((%load-path-option (find (lambda (option)
(member "load-path"
(option-names option)))
%standard-build-options)))
(option
(filter (lambda (name) (not (equal? #\L name)))
(option-names %load-path-option))
(option-required-arg? %load-path-option)
(option-optional-arg? %load-path-option)
(option-processor %load-path-option)))
(option '(#\h "help") #f #f (option '(#\h "help") #f #f
(lambda args (lambda args
(show-help) (show-help)
@ -165,6 +180,9 @@ specified with `--select'.\n"))
'always', 'never', and 'interactive', which is also 'always', 'never', and 'interactive', which is also
used when 'key-download' is not specified")) used when 'key-download' is not specified"))
(newline) (newline)
(display (G_ "
--load-path=DIR prepend DIR to the package module search path"))
(newline)
(display (G_ " (display (G_ "
-h, --help display this help and exit")) -h, --help display this help and exit"))
(display (G_ " (display (G_ "