guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/02: tests: xvnc: Do not use specification->package in OS definition.


From: guix-commits
Subject: 02/02: tests: xvnc: Do not use specification->package in OS definition.
Date: Fri, 7 Oct 2022 15:16:35 -0400 (EDT)

apteryx pushed a commit to branch master
in repository guix.

commit 0169aee33e154c1fa8b299c7f126f3e94a8dc9a4
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Oct 7 15:07:36 2022 -0400

    tests: xvnc: Do not use specification->package in OS definition.
    
    Doing so would cause the extra package dependencies to not be
    correctly registered as dependencies, which would lead to a silent
    failure when attempting to load or byte compile the module at the time
    guix build itself (e.g., when running 'guix pull').
    
    * gnu/tests/vnc.scm (%xvnc-os) [packages]: Turn the the
    specification->package declaration into a list of package objects.
---
 gnu/tests/vnc.scm | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/gnu/tests/vnc.scm b/gnu/tests/vnc.scm
index 34c2db1203..5c4bd43fa3 100644
--- a/gnu/tests/vnc.scm
+++ b/gnu/tests/vnc.scm
@@ -22,6 +22,10 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages ocr)
   #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages ratpoison)
+  #:use-module (gnu packages vnc)
+  #:use-module (gnu packages xorg)
   #:use-module (gnu services)
   #:use-module (gnu services dbus)
   #:use-module (gnu services desktop)
@@ -59,16 +63,15 @@
                   (supplementary-groups '("wheel" "netdev"
                                           "audio" "video")))
                  %base-user-accounts))
-    (packages (append (map specification->package
-                           '("dbus"     ;for dbus-run-session
-                             "dconf"
-                             "gnome-settings-daemon" ;for schemas
-                             "ratpoison"
-                             "tigervnc-client"
-                             "xterm"))
-                      %base-packages
-                      (list `(,glib "bin")
-                            glib)))
+    (packages (cons* dbus               ;for dbus-run-session
+                     dconf
+                     `(,glib "bin")
+                     glib
+                     gnome-settings-daemon ;for schemas
+                     ratpoison
+                     tigervnc-client
+                     xterm
+                     %base-packages))
     (services (cons*
                (service openssh-service-type (openssh-configuration
                                               (permit-root-login #t)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]