summaryrefslogtreecommitdiff
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)
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 c2182093dd0..7c37468cdf6 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -8300,8 +8300,7 @@ The list of URLs where to look for substitutes by default.
8300List of extra command-line options for @command{guix-daemon}. 8300List of extra command-line options for @command{guix-daemon}.
8301 8301
8302@item @code{lsof} (default: @var{lsof}) 8302@item @code{lsof} (default: @var{lsof})
8303@itemx @code{lsh} (default: @var{lsh}) 8303The lsof package to use.
8304The lsof and lsh packages to use.
8305 8304
8306@end table 8305@end table
8307@end deftp 8306@end deftp
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 8e686898c56..f2bac297aa7 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -37,7 +37,6 @@
37 #:use-module ((gnu packages base) 37 #:use-module ((gnu packages base)
38 #:select (canonical-package glibc)) 38 #:select (canonical-package glibc))
39 #:use-module (gnu packages package-management) 39 #:use-module (gnu packages package-management)
40 #:use-module (gnu packages ssh)
41 #:use-module (gnu packages lsof) 40 #:use-module (gnu packages lsof)
42 #:use-module (gnu packages terminals) 41 #:use-module (gnu packages terminals)
43 #:use-module ((gnu build file-systems) 42 #:use-module ((gnu build file-systems)
@@ -1091,9 +1090,7 @@ failed to register hydra.gnu.org public key: ~a~%" status))))))))
1091 (extra-options guix-configuration-extra-options ;list of strings 1090 (extra-options guix-configuration-extra-options ;list of strings
1092 (default '())) 1091 (default '()))
1093 (lsof guix-configuration-lsof ;<package> 1092 (lsof guix-configuration-lsof ;<package>
1094 (default lsof)) 1093 (default lsof)))
1095 (lsh guix-configuration-lsh ;<package>
1096 (default lsh)))
1097 1094
1098(define %default-guix-configuration 1095(define %default-guix-configuration
1099 (guix-configuration)) 1096 (guix-configuration))
@@ -1104,7 +1101,7 @@ failed to register hydra.gnu.org public key: ~a~%" status))))))))
1104 (($ <guix-configuration> guix build-group build-accounts 1101 (($ <guix-configuration> guix build-group build-accounts
1105 authorize-key? keys 1102 authorize-key? keys
1106 use-substitutes? substitute-urls extra-options 1103 use-substitutes? substitute-urls extra-options
1107 lsof lsh) 1104 lsof)
1108 (list (shepherd-service 1105 (list (shepherd-service
1109 (documentation "Run the Guix daemon.") 1106 (documentation "Run the Guix daemon.")
1110 (provision '(guix-daemon)) 1107 (provision '(guix-daemon))
@@ -1119,10 +1116,9 @@ failed to register hydra.gnu.org public key: ~a~%" status))))))))
1119 "--substitute-urls" #$(string-join substitute-urls) 1116 "--substitute-urls" #$(string-join substitute-urls)
1120 #$@extra-options) 1117 #$@extra-options)
1121 1118
1122 ;; Add 'lsof' (for the GC) and 'lsh' (for offloading) to the 1119 ;; Add 'lsof' (for the GC) to the daemon's $PATH.
1123 ;; daemon's $PATH.
1124 #:environment-variables 1120 #:environment-variables
1125 (list (string-append "PATH=" #$lsof "/bin:" #$lsh "/bin")))) 1121 (list (string-append "PATH=" #$lsof "/bin"))))
1126 (stop #~(make-kill-destructor))))))) 1122 (stop #~(make-kill-destructor)))))))
1127 1123
1128(define (guix-accounts config) 1124(define (guix-accounts config)