[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
105/155: services: guix: Remove dependency on lsh.
From: |
John Darrington |
Subject: |
105/155: services: guix: Remove dependency on lsh. |
Date: |
Wed, 21 Dec 2016 20:48:37 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit 8d1bbf4498fc55eea84658c58cc9fe5f50c7a68e
Author: Ludovic Courtès <address@hidden>
Date: Mon Dec 19 23:39:43 2016 +0100
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.
---
doc/guix.texi | 3 +--
gnu/services/base.scm | 12 ++++--------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index c218209..7c37468 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})
address@hidden @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 8e68689..f2bac29 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)
address@hidden)
- ;; 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)
- 72/155: gnu: gnumach-headers: Update to 1.8., (continued)
- 72/155: gnu: gnumach-headers: Update to 1.8., John Darrington, 2016/12/21
- 75/155: gnu: pcsc-lite: Update to 1.8.19., John Darrington, 2016/12/21
- 87/155: gexp: Slightly simplify 'gexp-inputs'., John Darrington, 2016/12/21
- 84/155: doc: Mention 'grub' field of 'grub-configuration'., John Darrington, 2016/12/21
- 80/155: gnu: samba: Update to 4.5.3 [fixes CVE-2016-{2123, 2125, 2126}]., John Darrington, 2016/12/21
- 97/155: install: The list of services is now a plain list., John Darrington, 2016/12/21
- 90/155: gnu: linux-libre: Update to 4.8.15., John Darrington, 2016/12/21
- 95/155: Revert "gnu: grub: Add dependency on efibootmgr.", John Darrington, 2016/12/21
- 108/155: gnu: enlightenment: Update to 0.21.5., John Darrington, 2016/12/21
- 81/155: gnu: openssh: Update to 7.4p1., John Darrington, 2016/12/21
- 105/155: services: guix: Remove dependency on lsh.,
John Darrington <=
- 123/155: build: Bump version number., John Darrington, 2016/12/21
- 119/155: gnu: cuirass: Make sure 'cuirass' has 'evaluate' in $PATH., John Darrington, 2016/12/21
- 125/155: import: pypi: Match new 'pypi-uri' domain in updater., John Darrington, 2016/12/21
- 133/155: gnu: nss: Add comment about test failures in NSS 3.27.2, John Darrington, 2016/12/21
- 73/155: gnu: mig: Update to 1.8., John Darrington, 2016/12/21
- 99/155: gnu: utox: Update to 0.11.0., John Darrington, 2016/12/21
- 109/155: gnu: cutadapt: Use ‘modify-phases’ syntax., John Darrington, 2016/12/21
- 106/155: services: guix: Add 'log-file' configuration option., John Darrington, 2016/12/21
- 121/155: services: cuirass: Add Cuirass to the system profile., John Darrington, 2016/12/21
- 128/155: mailmap: Add alias for Marius Bakke., John Darrington, 2016/12/21