mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
guix system: search: Display default Shepherd service names.
Fixes <https://bugs.gnu.org/29707>. Reported by Clément Lassieur <clement@lassieur.org>. * guix/scripts/system/search.scm (service-type-default-shepherd-services) (service-type-shepherd-names): New procedures. (service-type->recutils): Use it. * tests/guix-system.sh: Add test.
This commit is contained in:
parent
f675d8b97d
commit
6ac8b7359a
2 changed files with 38 additions and 2 deletions
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2017, 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -20,9 +20,11 @@ (define-module (guix scripts system search)
|
|||
#:use-module (guix ui)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (gnu services)
|
||||
#:use-module (gnu services shepherd)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-11)
|
||||
#:use-module (srfi srfi-26)
|
||||
#:use-module (srfi srfi-34)
|
||||
#:use-module (ice-9 regex)
|
||||
#:use-module (ice-9 match)
|
||||
#:export (service-type->recutils
|
||||
|
@ -39,6 +41,29 @@ (define-module (guix scripts system search)
|
|||
(define service-type-name*
|
||||
(compose symbol->string service-type-name))
|
||||
|
||||
(define (service-type-default-shepherd-services type)
|
||||
"Return the list of Shepherd services created by default instances of TYPE,
|
||||
provided TYPE has a default value."
|
||||
(match (guard (c ((service-error? c) #f))
|
||||
(service type))
|
||||
(#f '())
|
||||
((? service? service)
|
||||
(let* ((extension (find (lambda (extension)
|
||||
(eq? (service-extension-target extension)
|
||||
shepherd-root-service-type))
|
||||
(service-type-extensions type)))
|
||||
(compute (and extension (service-extension-compute extension))))
|
||||
(if compute
|
||||
(compute (service-value service))
|
||||
'())))))
|
||||
|
||||
(define (service-type-shepherd-names type)
|
||||
"Return the default names of Shepherd services created for TYPE."
|
||||
(match (map shepherd-service-provision
|
||||
(service-type-default-shepherd-services type))
|
||||
(((names . _) ...)
|
||||
names)))
|
||||
|
||||
(define* (service-type->recutils type port
|
||||
#:optional (width (%text-width))
|
||||
#:key (extra-fields '()))
|
||||
|
@ -66,6 +91,16 @@ (define (extensions->recutils extensions)
|
|||
(format port "extends: ~a~%"
|
||||
(extensions->recutils (service-type-extensions type)))
|
||||
|
||||
;; If possible, display the list of *default* Shepherd service names. Note
|
||||
;; that we may not always be able to do this (e.g., if the service type
|
||||
;; lacks a default value); furthermore, it could be that the service
|
||||
;; generates Shepherd services with different names if we give it different
|
||||
;; parameters (this is the case, for instance, for
|
||||
;; 'console-font-service-type'.)
|
||||
(match (service-type-shepherd-names type)
|
||||
(() #f)
|
||||
(names (format port "shepherdnames:~{ ~a~}~%" names)))
|
||||
|
||||
(when (service-type-description type)
|
||||
(format port "~a~%"
|
||||
(string->recutils
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# GNU Guix --- Functional package management for GNU
|
||||
# Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
# Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
# Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
# Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
|
||||
#
|
||||
|
@ -267,6 +267,7 @@ guix system build "$tmpdir/config.scm" -n
|
|||
|
||||
# Searching.
|
||||
guix system search tor | grep "^name: tor"
|
||||
guix system search tor | grep "^shepherdnames: tor"
|
||||
guix system search anonym network | grep "^name: tor"
|
||||
|
||||
# Below, use -n (--dry-run) for the tests because if we actually tried to
|
||||
|
|
Loading…
Reference in a new issue