diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-07-21 13:43:20 +0000 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-07-21 13:43:20 +0000 |
commit | cdb3f39b64fa9e1d1c85bd3ba3a4b8b1c480bb2c (patch) | |
tree | 464053f8d7942ed931e342f0576e85f5586bb0f7 /tests/flakes.sh | |
parent | c58c6165c554d671f87b463c9ab1d47a5d75bbbb (diff) | |
parent | 0835447eaacacdb4c1241971c584c88acd274b99 (diff) |
Merge remote-tracking branch 'upstream/master' into better-ca-parse-errors
Diffstat (limited to 'tests/flakes.sh')
-rw-r--r-- | tests/flakes.sh | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/flakes.sh b/tests/flakes.sh index 25e1847e1..5aec563ac 100644 --- a/tests/flakes.sh +++ b/tests/flakes.sh @@ -18,7 +18,6 @@ registry=$TEST_ROOT/registry.json flake1Dir=$TEST_ROOT/flake1 flake2Dir=$TEST_ROOT/flake2 flake3Dir=$TEST_ROOT/flake3 -flake4Dir=$TEST_ROOT/flake4 flake5Dir=$TEST_ROOT/flake5 flake6Dir=$TEST_ROOT/flake6 flake7Dir=$TEST_ROOT/flake7 @@ -390,14 +389,12 @@ cat > $flake3Dir/flake.nix <<EOF }; } EOF -git -C $flake3Dir add flake.nix +nix flake update $flake3Dir +git -C $flake3Dir add flake.nix flake.lock git -C $flake3Dir commit -m 'Remove packages.xyzzy' git -C $flake3Dir checkout master -# Test whether fuzzy-matching works for IsAlias -(! nix build -o $TEST_ROOT/result flake4/removeXyzzy#xyzzy) - -# Test whether fuzzy-matching works for IsGit +# Test whether fuzzy-matching works for registry entries. (! nix build -o $TEST_ROOT/result flake4/removeXyzzy#xyzzy) nix build -o $TEST_ROOT/result flake4/removeXyzzy#sth |