[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: installer: tests: Use a filter to select desktop-environments.
From: |
guix-commits |
Subject: |
01/02: installer: tests: Use a filter to select desktop-environments. |
Date: |
Thu, 26 Mar 2020 06:54:08 -0400 (EDT) |
mothacehe pushed a commit to branch master
in repository guix.
commit 7a1a10dbd4ef2989ea1cac111849a36c567430e3
Author: Mathieu Othacehe <address@hidden>
AuthorDate: Tue Mar 24 09:21:02 2020 +0100
installer: tests: Use a filter to select desktop-environments.
* 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 6f5393e..8ae80e4 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 ((desktops (filter choose-desktop-environment? services)))
+ (set! desktop-environments desktops)
+ desktops))
((checkbox-list (title "Network service") (text _)
(items ,services))
(filter choose-network-service? services))