services: guix: Remove dependency on lsh.
* gnu/services/base.scm (<guix-configuration>)[lsh]: Remove. (guix-shepherd-service): Remove lsh from 'PATH'. * doc/guix.texi (Base Services): Adjust accordingly.
This commit is contained in:
parent
463995da0c
commit
f78903f363
|
@ -8300,8 +8300,7 @@ The list of URLs where to look for substitutes by default.
|
|||
List of extra command-line options for @command{guix-daemon}.
|
||||
|
||||
@item @code{lsof} (default: @var{lsof})
|
||||
@itemx @code{lsh} (default: @var{lsh})
|
||||
The lsof and lsh packages to use.
|
||||
The lsof package to use.
|
||||
|
||||
@end table
|
||||
@end deftp
|
||||
|
|
|
@ -37,7 +37,6 @@
|
|||
#:use-module ((gnu packages base)
|
||||
#:select (canonical-package glibc))
|
||||
#:use-module (gnu packages package-management)
|
||||
#:use-module (gnu packages ssh)
|
||||
#:use-module (gnu packages lsof)
|
||||
#:use-module (gnu packages terminals)
|
||||
#:use-module ((gnu build file-systems)
|
||||
|
@ -1091,9 +1090,7 @@ failed to register hydra.gnu.org public key: ~a~%" status))))))))
|
|||
(extra-options guix-configuration-extra-options ;list of strings
|
||||
(default '()))
|
||||
(lsof guix-configuration-lsof ;<package>
|
||||
(default lsof))
|
||||
(lsh guix-configuration-lsh ;<package>
|
||||
(default lsh)))
|
||||
(default lsof)))
|
||||
|
||||
(define %default-guix-configuration
|
||||
(guix-configuration))
|
||||
|
@ -1104,7 +1101,7 @@ failed to register hydra.gnu.org public key: ~a~%" status))))))))
|
|||
(($ <guix-configuration> guix build-group build-accounts
|
||||
authorize-key? keys
|
||||
use-substitutes? substitute-urls extra-options
|
||||
lsof lsh)
|
||||
lsof)
|
||||
(list (shepherd-service
|
||||
(documentation "Run the Guix daemon.")
|
||||
(provision '(guix-daemon))
|
||||
|
@ -1119,10 +1116,9 @@ failed to register hydra.gnu.org public key: ~a~%" status))))))))
|
|||
"--substitute-urls" #$(string-join substitute-urls)
|
||||
#$@extra-options)
|
||||
|
||||
;; Add 'lsof' (for the GC) and 'lsh' (for offloading) to the
|
||||
;; daemon's $PATH.
|
||||
;; Add 'lsof' (for the GC) to the daemon's $PATH.
|
||||
#:environment-variables
|
||||
(list (string-append "PATH=" #$lsof "/bin:" #$lsh "/bin"))))
|
||||
(list (string-append "PATH=" #$lsof "/bin"))))
|
||||
(stop #~(make-kill-destructor)))))))
|
||||
|
||||
(define (guix-accounts config)
|
||||
|
|
Loading…
Reference in New Issue