Rename import-derivation -> import-from-derivation

This commit is contained in:
Eelco Dolstra 2024-09-17 16:55:44 +02:00
parent 3fb6605d3d
commit ee3f0b7a8b
8 changed files with 8 additions and 8 deletions

View file

@ -508,7 +508,7 @@
''^tests/functional/ca/concurrent-builds\.sh$''
''^tests/functional/ca/eval-store\.sh$''
''^tests/functional/ca/gc\.sh$''
''^tests/functional/ca/import-derivation\.sh$''
''^tests/functional/ca/import-from-derivation\.sh$''
''^tests/functional/ca/new-build-cmd\.sh$''
''^tests/functional/ca/nix-shell\.sh$''
''^tests/functional/ca/post-hook\.sh$''

View file

@ -2,5 +2,5 @@ source common.sh
export NIX_TESTS_CA_BY_DEFAULT=1
cd .. && source import-derivation.sh
cd .. && source import-from-derivation.sh

View file

@ -7,7 +7,7 @@ ca-tests := \
$(d)/duplicate-realisation-in-closure.sh \
$(d)/eval-store.sh \
$(d)/gc.sh \
$(d)/import-derivation.sh \
$(d)/import-from-derivation.sh \
$(d)/new-build-cmd.sh \
$(d)/nix-copy.sh \
$(d)/nix-run.sh \

View file

@ -16,7 +16,7 @@ suites += {
'duplicate-realisation-in-closure.sh',
'eval-store.sh',
'gc.sh',
'import-derivation.sh',
'import-from-derivation.sh',
'new-build-cmd.sh',
'nix-copy.sh',
'nix-run.sh',

View file

@ -4,11 +4,11 @@ source common.sh
clearStoreIfPossible
if nix-instantiate --readonly-mode ./import-derivation.nix; then
if nix-instantiate --readonly-mode ./import-from-derivation.nix; then
echo "read-only evaluation of an imported derivation unexpectedly failed"
exit 1
fi
outPath=$(nix-build ./import-derivation.nix --no-out-link)
outPath=$(nix-build ./import-from-derivation.nix --no-out-link)
[ "$(cat "$outPath")" = FOO579 ]

View file

@ -88,7 +88,7 @@ nix_tests = \
why-depends.sh \
derivation-json.sh \
derivation-advanced-attributes.sh \
import-derivation.sh \
import-from-derivation.sh \
nix_path.sh \
nars.sh \
placeholders.sh \

View file

@ -157,7 +157,7 @@ suites = [
'why-depends.sh',
'derivation-json.sh',
'derivation-advanced-attributes.sh',
'import-derivation.sh',
'import-from-derivation.sh',
'nix_path.sh',
'nars.sh',
'placeholders.sh',