Fix tests

https://hydra.nixos.org/eval/1521131
This commit is contained in:
Eelco Dolstra 2019-05-23 16:36:12 +02:00
parent 2f162feb0f
commit 013f4928c8

View file

@ -105,9 +105,9 @@ EOF
nix flake info --flake-registry $registry flake1 | grep -q 'ID: *flake1' nix flake info --flake-registry $registry flake1 | grep -q 'ID: *flake1'
# Test 'nix flake info' on a local flake. # Test 'nix flake info' on a local flake.
(cd $flake1Dir && nix flake info) | grep -q 'ID: *flake1' (cd $flake1Dir && nix flake info --flake-registry $registry) | grep -q 'ID: *flake1'
(cd $flake1Dir && nix flake info .) | grep -q 'ID: *flake1' (cd $flake1Dir && nix flake info --flake-registry $registry .) | grep -q 'ID: *flake1'
nix flake info $flake1Dir | grep -q 'ID: *flake1' nix flake info --flake-registry $registry $flake1Dir | grep -q 'ID: *flake1'
# Test 'nix flake info --json'. # Test 'nix flake info --json'.
json=$(nix flake info --flake-registry $registry flake1 --json | jq .) json=$(nix flake info --flake-registry $registry flake1 --json | jq .)
@ -141,7 +141,8 @@ nix build -o $TEST_ROOT/result --flake-registry $registry $flake2Dir:bar
nix build -o $TEST_ROOT/result --flake-registry $registry flake2:bar nix build -o $TEST_ROOT/result --flake-registry $registry flake2:bar
# Or without a registry. # Or without a registry.
nix build -o $TEST_ROOT/result file://$flake2Dir:bar # FIXME: shouldn't need '--flake-registry /no-registry'?
nix build -o $TEST_ROOT/result --flake-registry /no-registry file://$flake2Dir:bar
# Test whether indirect dependencies work. # Test whether indirect dependencies work.
nix build -o $TEST_ROOT/result --flake-registry $registry $flake3Dir:xyzzy nix build -o $TEST_ROOT/result --flake-registry $registry $flake3Dir:xyzzy