mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 07:26:13 -05:00
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.
This commit is contained in:
parent
7eefff2054
commit
e9bed5e9e7
1 changed files with 3 additions and 16 deletions
|
@ -85,22 +85,9 @@ (define marionette
|
|||
'(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))))
|
||||
|
|
Loading…
Reference in a new issue