[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#40207] [PATCH 1/2] installer: tests: Use a filter to select desktop
From: |
Mathieu Othacehe |
Subject: |
[bug#40207] [PATCH 1/2] installer: tests: Use a filter to select desktop-environments. |
Date: |
Tue, 24 Mar 2020 09:36:25 +0100 |
* gnu/installer/tests.scm (choose-services): Turn desktop-environments list
into a choose-desktop-environment procedure. This way, it is easier to select
all desktop-environments or none, in the same way as choose-network-service?
and choose-network-management-tool? arguments.
---
gnu/installer/tests.scm | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/gnu/installer/tests.scm b/gnu/installer/tests.scm
index 6f5393e3ab..07f3121083 100644
--- a/gnu/installer/tests.scm
+++ b/gnu/installer/tests.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Ludovic Courtès <address@hidden>
+;;; Copyright © 2020 Mathieu Othacehe <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -211,7 +212,7 @@ ROOT-PASSWORD, and USERS."
(define* (choose-services port
#:key
- (desktop-environments '("GNOME"))
+ (choose-desktop-environment? (const #f))
(choose-network-service?
(lambda (service)
(or (string-contains service "SSH")
@@ -220,10 +221,14 @@ ROOT-PASSWORD, and USERS."
(lambda (service)
(string-contains service "DHCP"))))
"Converse over PORT to choose networking services."
+ (define desktop-environments '())
+
(converse port
((checkbox-list (title "Desktop environment") (text _)
- (items _))
- desktop-environments)
+ (items ,services))
+ (let ((services* (filter choose-desktop-environment? services)))
+ (set! desktop-environments services*)
+ services*))
((checkbox-list (title "Network service") (text _)
(items ,services))
(filter choose-network-service? services))
--
2.25.1
[bug#40207] [PATCH 1/2] installer: tests: Use a filter to select desktop-environments., Ludovic Courtès, 2020/03/24