Merge branch 'staging' into core-updates.

1 files changed, 5 insertions, 18 deletions

diff --git a/gnu/tests/package-management.scm b/gnu/tests/package-management.scm
index fe897944d0..6d61dea4f8 100644
--- a/gnu/tests/package-management.scm
+++ b/gnu/tests/package-management.scm
@@ -85,25 +85,12 @@
              '(begin
                 ;; Wait for nix-daemon to be up and running.
                 (start-service 'nix-daemon)
-                (with-output-to-file "guix-test.nix"
-                  (lambda ()
-                    (display "\
-with import <nix/config.nix>;
-
-derivation {
-  system = builtins.currentSystem;
-  name = \"guix-test\";
-  builder = shell;
-  args = [\"-c\" \"mkdir $out\\necho FOO > $out/foo\"];
-  PATH = coreutils;
-}
-")))
-                (zero? (system* (string-append #$nix "/bin/nix-build")
-                                "--substituters" "" "--debug" "--no-out-link"
-                                "guix-test.nix")))
+                (zero? (system* (string-append #$nix "/bin/nix")
+                                "--experimental-features" "nix-command"
+                                "store" "ping" "--store" "daemon")))
              marionette))
 
-	  (test-end))))
+          (test-end))))
 
   (gexp->derivation (string-append name "-test") test))
 
@@ -112,7 +99,7 @@ derivation {
   (let ((base-os
          (simple-operating-system
           (service nix-service-type)
-	  (service dhcp-client-service-type))))
+          (service dhcp-client-service-type))))
     (operating-system
       (inherit base-os)
       (packages (cons nix (operating-system-packages base-os))))))