[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/18: installer: Offer the CUPS printing service.
From: |
guix-commits |
Subject: |
03/18: installer: Offer the CUPS printing service. |
Date: |
Wed, 30 Jun 2021 15:36:17 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 6f13881f1e92832023caadb3cb51ce393e685e58
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Mon Jun 21 14:31:03 2021 +0200
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.
---
gnu/installer/newt/services.scm | 25 ++++++++++++++++++++++++-
gnu/installer/services.scm | 9 ++++++++-
2 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/gnu/installer/newt/services.scm b/gnu/installer/newt/services.scm
index 74f28e4..1af4e7d 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 b000721..341d8b6 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."
- branch master updated (364db4f -> f2a8b7e), guix-commits, 2021/06/30
- 04/18: gnu: i7z: Restrict to x86_64 systems., guix-commits, 2021/06/30
- 08/18: gnu: epson-inkjet-printer-escpr: Update to 1.7.12., guix-commits, 2021/06/30
- 06/18: gnu: libpcap: Omit static library., guix-commits, 2021/06/30
- 03/18: installer: Offer the CUPS printing service.,
guix-commits <=
- 07/18: gnu: Add corefreq., guix-commits, 2021/06/30
- 02/18: gnu: vmpk: Update to 0.8.4., guix-commits, 2021/06/30
- 10/18: gnu: virtuoso-ose: Update to 7.2.6., guix-commits, 2021/06/30
- 12/18: gnu: cbonsai: Update to 1.2.1., guix-commits, 2021/06/30
- 15/18: gnu: verilator: Update to 4.204., guix-commits, 2021/06/30
- 18/18: gnu: libesmtp: Expand description., guix-commits, 2021/06/30
- 17/18: gnu: libesmtp: Update to 1.1.0., guix-commits, 2021/06/30
- 09/18: gnu: duplicity: Update to 0.8.20., guix-commits, 2021/06/30
- 01/18: gnu: drumstick: Update to 2.3.0., guix-commits, 2021/06/30
- 05/18: gnu: libpcap: Update to 1.10.1., guix-commits, 2021/06/30