Merge branch 'master' into core-updates

 Conflicts:
	gnu/local.mk
	gnu/packages/backup.scm
	gnu/packages/emacs-xyz.scm
	gnu/packages/guile.scm
	gnu/packages/lisp.scm
	gnu/packages/openldap.scm
	gnu/packages/package-management.scm
	gnu/packages/web.scm
	gnu/packages/xorg.scm

2 files changed, 10 insertions, 15 deletions

diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index 1b113602ed..343fdc67f6 100644
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@ -254,7 +254,7 @@ packages defined in installation-os."
               (make-marionette
                `(,(which #$(qemu-command system))
                  "-no-reboot"
-                 "-m" "800"
+                 "-m" "1200"
                  #$@(cond
                      ((string=? "ext4" installation-disk-image-file-system-type)
                       #~("-drive"
@@ -389,6 +389,7 @@ per %test-installed-os, this test is expensive in terms of CPU and storage.")
     (services (cons (service marionette-service-type
                              (marionette-configuration
                               (imported-modules '((gnu services herd)
+                                                  (guix build utils)
                                                   (guix combinators)))))
                     %base-services))))
 
@@ -1060,7 +1061,7 @@ build (current-guix) and then store a couple of full system images.")
 (define* (installation-target-os-for-gui-tests
           #:key (encrypted? #f))
   (operating-system
-    (inherit %minimal-os)
+    (inherit %minimal-os-on-vda)
     (users (append (list (user-account
                           (name "alice")
                           (comment "Bob's sister")
@@ -1076,9 +1077,9 @@ build (current-guix) and then store a couple of full system images.")
                    %base-user-accounts))
     ;; The installer does not create a swap device in guided mode with
     ;; encryption support.
-    (swap-devices (if encrypted? '() '("/dev/vdb2")))
+    (swap-devices (if encrypted? '() '("/dev/vda2")))
     (services (cons (service dhcp-client-service-type)
-                    (operating-system-user-services %minimal-os)))))
+                    (operating-system-user-services %minimal-os-on-vda)))))
 
 (define* (installation-target-desktop-os-for-gui-tests
           #:key (encrypted? #f))
diff --git a/gnu/tests/reconfigure.scm b/gnu/tests/reconfigure.scm
index 8b85920979..928a210a94 100644
--- a/gnu/tests/reconfigure.scm
+++ b/gnu/tests/reconfigure.scm
@@ -136,14 +136,6 @@ Shepherd (PID 1) by unloading obsolete services and loading new services."
                       (stop #~(const #t))
                       (respawn? #f)))
 
-  ;; Return the Shepherd service file for SERVICE, after ensuring that it
-  ;; exists in the store.
-  (define (ensure-service-file service)
-    (let ((file (shepherd-service-file service)))
-      (mlet* %store-monad ((store-object (lower-object file))
-                           (_ (built-derivations (list store-object))))
-        (return file))))
-
   (define (test enable-dummy disable-dummy)
     (with-imported-modules '((gnu build marionette))
       #~(begin
@@ -187,10 +179,12 @@ Shepherd (PID 1) by unloading obsolete services and loading new services."
           (test-end)
           (exit (= (test-runner-fail-count (test-runner-current)) 0)))))
 
-  (mlet* %store-monad ((file (ensure-service-file dummy-service)))
-    (let ((enable (upgrade-services-program (list file) '(dummy) '() '()))
+  (gexp->derivation
+   "upgrade-services"
+   (let* ((file (shepherd-service-file dummy-service))
+          (enable (upgrade-services-program (list file) '(dummy) '() '()))
           (disable (upgrade-services-program '() '() '(dummy) '())))
-      (gexp->derivation "upgrade-services" (test enable disable)))))
+     (test enable disable))))
 
 (define* (run-install-bootloader-test)
   "Run a test of an OS running INSTALL-BOOTLOADER-PROGRAM, which installs a