Merge branch 'fixed-output-remote-builder-test' of github.com:obsidiansystems/nix into trustless-remote-builder-simple

This commit is contained in:
John Ericson 2020-08-18 13:56:00 +00:00
commit 7c4f383b37

View file

@ -37,9 +37,9 @@ nix_tests = \
recursive.sh \ recursive.sh \
flakes.sh flakes.sh
# parallel.sh # parallel.sh
# build-remote-content-addressed-fixed.sh \ # build-remote-content-addressed-fixed.sh # problem with fixed output derivations
# build-remote-trustless-should-pass-3.sh \
# build-remote-trustless-should-pass-0.sh # problem with legacy ssh-store only # build-remote-trustless-should-pass-0.sh # problem with legacy ssh-store only
# build-remote-trustless-should-pass-3.sh # problem with fixed output derivations
install-tests += $(foreach x, $(nix_tests), tests/$(x)) install-tests += $(foreach x, $(nix_tests), tests/$(x))