max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-15 02:36:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename import-derivation -> import-from-derivation

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
maintainers/flake-module.nix
View file

@ -508,7 +508,7 @@
''^tests/functional/ca/concurrent-builds\.sh$'' ''^tests/functional/ca/concurrent-builds\.sh$''
''^tests/functional/ca/eval-store\.sh$'' ''^tests/functional/ca/eval-store\.sh$''
''^tests/functional/ca/gc\.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/new-build-cmd\.sh$''
''^tests/functional/ca/nix-shell\.sh$'' ''^tests/functional/ca/nix-shell\.sh$''
''^tests/functional/ca/post-hook\.sh$'' ''^tests/functional/ca/post-hook\.sh$''

2
tests/functional/ca/import-derivation.sh → tests/functional/ca/import-from-derivation.sh
View file

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

2
tests/functional/ca/local.mk
View file

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

2
tests/functional/ca/meson.build
View file

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

0
tests/functional/import-derivation.nix → tests/functional/import-from-derivation.nix
View file

4
tests/functional/import-derivation.sh → tests/functional/import-from-derivation.sh
View file

@ -4,11 +4,11 @@ source common.sh
clearStoreIfPossible 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" echo "read-only evaluation of an imported derivation unexpectedly failed"
exit 1 exit 1
fi fi
outPath=$(nix-build ./import-derivation.nix --no-out-link) outPath=$(nix-build ./import-from-derivation.nix --no-out-link)
[ "$(cat "$outPath")" = FOO579 ] [ "$(cat "$outPath")" = FOO579 ]

2
tests/functional/local.mk
View file

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

2
tests/functional/meson.build
View file

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