aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2021-06-21 14:31:03 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2021-06-30 21:34:26 +0200
commit6f13881f1e92832023caadb3cb51ce393e685e58 (patch)
treee0b76528f9f75975c287fd919cab977dc1cd234c /gnu
parent14298cd301156866db51b1b2c4f656ae1639d90a (diff)
downloadguix-6f13881f1e92832023caadb3cb51ce393e685e58.tar.gz
guix-6f13881f1e92832023caadb3cb51ce393e685e58.zip
installer: Offer the CUPS printing service.
* gnu/installer/services.scm (%system-services): Add CUPS. * gnu/installer/newt/services.scm (run-other-services-cbt-page): New procedure. (run-services-page): Call it last.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/installer/newt/services.scm25
-rw-r--r--gnu/installer/services.scm9
2 files changed, 32 insertions, 2 deletions
diff --git a/gnu/installer/newt/services.scm b/gnu/installer/newt/services.scm
index 74f28e41ba..1af4e7df2d 100644
--- a/gnu/installer/newt/services.scm
+++ b/gnu/installer/newt/services.scm
@@ -68,6 +68,28 @@ system.")
(condition
(&installer-step-abort)))))))
+(define (run-other-services-cbt-page)
+ "Run a page allowing the user to select other services."
+ (let ((items (filter (lambda (service)
+ (not (member (system-service-type service)
+ '(desktop
+ network-management
+ networking))))
+ %system-services)))
+ (run-checkbox-tree-page
+ #:info-text (G_ "You can now select other services to run on your \
+system.")
+ #:title (G_ "Other services")
+ #:items items
+ #:selection (map system-service-recommended? items)
+ #:item->text (compose G_ system-service-name)
+ #:checkbox-tree-height 9
+ #:exit-button-callback-procedure
+ (lambda ()
+ (raise
+ (condition
+ (&installer-step-abort)))))))
+
(define (run-network-management-page)
"Run a page to select among several network management methods."
(let ((title (G_ "Network management")))
@@ -100,4 +122,5 @@ client may be enough for a server.")
(run-networking-cbt-page)
(if (null? desktop)
(list (run-network-management-page))
- '()))))
+ '())
+ (run-other-services-cbt-page))))
diff --git a/gnu/installer/services.scm b/gnu/installer/services.scm
index b0007218ae..341d8b69c8 100644
--- a/gnu/installer/services.scm
+++ b/gnu/installer/services.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -117,7 +118,13 @@
(system-service
(name (G_ "DHCP client (dynamic IP address assignment)"))
(type 'network-management)
- (snippet '((service dhcp-client-service-type)))))))
+ (snippet '((service dhcp-client-service-type))))
+
+ ;; Dealing with documents.
+ (system-service
+ (name (G_ "CUPS printing system (no Web interface by default)"))
+ (type 'document)
+ (snippet '((service cups-service-type)))))))
(define (desktop-system-service? service)
"Return true if SERVICE is a desktop environment service."