aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-12-19 23:39:43 +0100
committerLudovic Courtès <ludo@gnu.org>2016-12-19 23:57:19 +0100
commitf78903f36308081eeea52223fb3f5dca5096baef (patch)
tree9ed2dd4d25627fa0b71e095016e5acf86ea517ad
parent463995da0c8ae95654a6184c0a7ff0d1e0914c83 (diff)
downloadguix-f78903f36308081eeea52223fb3f5dca5096baef.tar
guix-f78903f36308081eeea52223fb3f5dca5096baef.tar.gz
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.
-rw-r--r--doc/guix.texi3
-rw-r--r--gnu/services/base.scm12
2 files changed, 5 insertions, 10 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index c2182093dd..7c37468cdf 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -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
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 8e686898c5..f2bac297aa 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -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)