mothacehe pushed a commit to branch master
in repository guix.
commit e9bed5e9e7e4f9e6d92794fd159164cc0936a911
Author: Mathieu Othacehe <[email protected]>
AuthorDate: Mon Feb 21 13:34:38 2022 +0100
tests: nix: Fix it.
The <nix/config.nix> support has been removed in Nix 2.4:
https://github.com/NixOS/nix/pull/4025. Rely on the store ping command
instead
to check that we can communicate with the daemon.
* gnu/tests/package-management.scm (run-nix-test): Use the store ping
command
instead of building a dummy derivation.
---
gnu/tests/package-management.scm | 19 +++----------------
1 file changed, 3 insertions(+), 16 deletions(-)
diff --git a/gnu/tests/package-management.scm b/gnu/tests/package-management.scm
index fe897944d0..57c20291b4 100644
--- a/gnu/tests/package-management.scm
+++ b/gnu/tests/package-management.scm
@@ -85,22 +85,9 @@
'(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))))
