nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

services: guix: Remove dependency on 'lsof'. 

This is a followup to b8f59cdc20e9d83ce63523ef917e95fcee07f134:
'list-runtime-roots' no longer depends on 'lsof'.

* gnu/services/base.scm (<guix-configuration>)[lsof]: Remove.
(guix-shepherd-service): Adjust accordingly.
* doc/guix.texi (Base Services): Adjust accordingly.
* gnu/system.scm (%base-packages): Remove LSOF.
This commit is contained in:
Ludovic Courtès 2017-11-13 11:34:51 +01:00
parent b918473189
commit a0fea77dbb
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
3 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/guix.texi
View File

@ -9830,9 +9830,6 @@ List of extra command-line options for @command{guix-daemon}.
File where @command{guix-daemon}'s standard output and standard error File where @command{guix-daemon}'s standard output and standard error
are written. are written.
@item @code{lsof} (default: @var{lsof})
The lsof package to use.
@item @code{http-proxy} (default: @code{#f}) @item @code{http-proxy} (default: @code{#f})
The HTTP proxy used for downloading fixed-output derivations and The HTTP proxy used for downloading fixed-output derivations and
substitutes. substitutes.

10
gnu/services/base.scm
View File

@ -42,7 +42,6 @@
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages package-management) #:use-module (gnu packages package-management)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#: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)
#:select (mount-flags->bit-mask)) #:select (mount-flags->bit-mask))
@ -119,7 +118,6 @@
guix-configuration-substitute-urls guix-configuration-substitute-urls
guix-configuration-extra-options guix-configuration-extra-options
guix-configuration-log-file guix-configuration-log-file
guix-configuration-lsof
guix-service guix-service
guix-service-type guix-service-type
@ -1374,8 +1372,6 @@ failed to register hydra.gnu.org public key: ~a~%" status))))))))
(default '())) (default '()))
(log-file guix-configuration-log-file ;string (log-file guix-configuration-log-file ;string
(default "/var/log/guix-daemon.log")) (default "/var/log/guix-daemon.log"))
(lsof guix-configuration-lsof ;<package>
(default lsof))
(http-proxy guix-http-proxy ;string | #f (http-proxy guix-http-proxy ;string | #f
(default #f)) (default #f))
(tmpdir guix-tmpdir ;string | #f (tmpdir guix-tmpdir ;string | #f
@ -1392,7 +1388,7 @@ failed to register hydra.gnu.org public key: ~a~%" status))))))))
use-substitutes? substitute-urls use-substitutes? substitute-urls
max-silent-time timeout max-silent-time timeout
extra-options extra-options
log-file lsof http-proxy tmpdir) log-file http-proxy tmpdir)
(list (shepherd-service (list (shepherd-service
(documentation "Run the Guix daemon.") (documentation "Run the Guix daemon.")
(provision '(guix-daemon)) (provision '(guix-daemon))
@ -1409,10 +1405,8 @@ 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) to the daemon's $PATH.
#:environment-variables #:environment-variables
(list (string-append "PATH=" #$lsof "/bin") (list #$@(if http-proxy
#$@(if http-proxy
(list (string-append "http_proxy=" http-proxy)) (list (string-append "http_proxy=" http-proxy))
'()) '())
#$@(if tmpdir #$@(if tmpdir

2
gnu/system.scm
View File

@ -39,7 +39,6 @@
#:use-module (gnu packages less) #:use-module (gnu packages less)
#:use-module (gnu packages zile) #:use-module (gnu packages zile)
#:use-module (gnu packages nano) #:use-module (gnu packages nano)
#:use-module (gnu packages lsof)
#:use-module (gnu packages gawk) #:use-module (gnu packages gawk)
#:use-module (gnu packages man) #:use-module (gnu packages man)
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
@ -509,7 +508,6 @@ explicitly appear in OS."
;; Default set of packages globally visible. It should include anything ;; Default set of packages globally visible. It should include anything
;; required for basic administrator tasks. ;; required for basic administrator tasks.
(cons* procps psmisc which less zile nano (cons* procps psmisc which less zile nano
lsof ;for Guix's 'list-runtime-roots'
pciutils usbutils pciutils usbutils
util-linux inetutils isc-dhcp util-linux inetutils isc-dhcp
(@ (gnu packages admin) shadow) ;for 'passwd' (@ (gnu packages admin) shadow) ;for 'passwd'