me/guix
Archived
1
0
Fork 0
Code Activity

services: guix: Remove dependency on lsh.

Browse source 
* 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:
Ludovic Courtès 2016-12-19 23:39:43 +01:00
parent 463995da0c
commit f78903f363
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/guix.texi
View file

@ -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}. List of extra command-line options for @command{guix-daemon}.
@item @code{lsof} (default: @var{lsof}) @item @code{lsof} (default: @var{lsof})
@itemx @code{lsh} (default: @var{lsh}) The lsof package to use.
The lsof and lsh packages to use.
@end table @end table
@end deftp @end deftp

12
gnu/services/base.scm
View file

@ -37,7 +37,6 @@
#:use-module ((gnu packages base) #:use-module ((gnu packages base)
#:select (canonical-package glibc)) #:select (canonical-package glibc))
#:use-module (gnu packages package-management) #:use-module (gnu packages package-management)
#:use-module (gnu packages ssh)
#:use-module (gnu packages lsof) #:use-module (gnu packages lsof)
#:use-module (gnu packages terminals) #:use-module (gnu packages terminals)
#:use-module ((gnu build file-systems) #: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 (extra-options guix-configuration-extra-options ;list of strings
(default '())) (default '()))
(lsof guix-configuration-lsof ;<package> (lsof guix-configuration-lsof ;<package>
(default lsof)) (default lsof)))
(lsh guix-configuration-lsh ;<package>
(default lsh)))
(define %default-guix-configuration (define %default-guix-configuration
(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 (($ <guix-configuration> guix build-group build-accounts
authorize-key? keys authorize-key? keys
use-substitutes? substitute-urls extra-options use-substitutes? substitute-urls extra-options
lsof lsh) lsof)
(list (shepherd-service (list (shepherd-service
(documentation "Run the Guix daemon.") (documentation "Run the Guix daemon.")
(provision '(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) "--substitute-urls" #$(string-join substitute-urls)
#$@extra-options) #$@extra-options)
;; Add 'lsof' (for the GC) and 'lsh' (for offloading) to the ;; Add 'lsof' (for the GC) to the daemon's $PATH.
;; daemon's $PATH.
#:environment-variables #:environment-variables
(list (string-append "PATH=" #$lsof "/bin:" #$lsh "/bin")))) (list (string-append "PATH=" #$lsof "/bin"))))
(stop #~(make-kill-destructor))))))) (stop #~(make-kill-destructor)))))))
(define (guix-accounts config) (define (guix-accounts config)