[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/07: services: guix-service: Add 'lsof' and 'lsh' to guix-daemon's $PA
From: |
Ludovic Courtès |
Subject: |
07/07: services: guix-service: Add 'lsof' and 'lsh' to guix-daemon's $PATH. |
Date: |
Thu, 19 Mar 2015 22:16:01 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit 2d1d2dd8044fb640627ed19cb99b91a3909e3c6b
Author: Ludovic Courtès <address@hidden>
Date: Thu Mar 19 23:15:33 2015 +0100
services: guix-service: Add 'lsof' and 'lsh' to guix-daemon's $PATH.
* gnu/services/base.scm (guix-service): Add #:lsof and #:lsh parameters.
[start]: Pass #:environment-variables to 'make-forkexec-constructor'.
---
gnu/services/base.scm | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 84bac94..a912603 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -28,6 +28,8 @@
#:use-module ((gnu packages base)
#:select (canonical-package glibc))
#:use-module (gnu packages package-management)
+ #:use-module (gnu packages lsh)
+ #:use-module (gnu packages lsof)
#:use-module ((gnu build file-systems)
#:select (mount-flags->bit-mask))
#:use-module (guix gexp)
@@ -612,7 +614,8 @@ failed to register hydra.gnu.org public key: ~a~%"
status))))))))
(define* (guix-service #:key (guix guix) (builder-group "guixbuild")
(build-accounts 10) (authorize-hydra-key? #t)
(use-substitutes? #t)
- (extra-options '()))
+ (extra-options '())
+ (lsof lsof) (lsh lsh))
"Return a service that runs the build daemon from @var{guix}, and has
@var{build-accounts} user accounts available under @var{builder-group}.
@@ -646,7 +649,13 @@ passed to @command{guix-daemon}."
#$@(if use-substitutes?
'()
'("--no-substitutes"))
- address@hidden)))
+ address@hidden)
+
+ ;; Add 'lsof' (for the GC) and 'lsh' (for offloading) to the
+ ;; daemon's $PATH.
+ #:environment-variables
+ (list (string-append "PATH=" #$lsof "/bin:"
+ #$lsh "/bin"))))
(stop #~(make-kill-destructor))
(user-accounts (guix-build-accounts build-accounts
#:group builder-group))
- branch master updated (f643a6e -> 2d1d2dd), Ludovic Courtès, 2015/03/19
- 01/07: build: Detect lack of guile.m4 at autoconf time., Ludovic Courtès, 2015/03/19
- 02/07: gnu: emms: Fix incorrect substitution in emms-tag-editor.el., Ludovic Courtès, 2015/03/19
- 04/07: gnu: emacs: Change a couple of input labels., Ludovic Courtès, 2015/03/19
- 05/07: gnu: Add emacs-no-x., Ludovic Courtès, 2015/03/19
- 03/07: doc: Add section about the test suite., Ludovic Courtès, 2015/03/19
- 07/07: services: guix-service: Add 'lsof' and 'lsh' to guix-daemon's $PATH.,
Ludovic Courtès <=
- 06/07: gnu: Use emacs-no-x when we just want to byte-compile code., Ludovic Courtès, 2015/03/19