* Propagate the deriver of a path through the substitute mechanism.
* Removed some dead code (successor stuff) from nix-push. * Updated terminology in the tests (store expr -> drv path). * Check that the deriver is set properly in the tests.
This commit is contained in:
parent
582e01c06f
commit
98df735b51
18 changed files with 86 additions and 74 deletions
|
|
@ -1,14 +1,14 @@
|
|||
storeExpr=$($TOP/src/nix-instantiate/nix-instantiate fallback.nix)
|
||||
echo "store expr is $storeExpr"
|
||||
drvPath=$($TOP/src/nix-instantiate/nix-instantiate fallback.nix)
|
||||
echo "derivation is $drvPath"
|
||||
|
||||
outPath=$($TOP/src/nix-store/nix-store -q --fallback "$storeExpr")
|
||||
outPath=$($TOP/src/nix-store/nix-store -q --fallback "$drvPath")
|
||||
echo "output path is $outPath"
|
||||
|
||||
# Register a non-existant substitute
|
||||
(echo $outPath && echo $TOP/no-such-program && echo 0 && echo 0) | $TOP/src/nix-store/nix-store --substitute
|
||||
(echo $outPath && echo "" && echo $TOP/no-such-program && echo 0 && echo 0) | $TOP/src/nix-store/nix-store --substitute
|
||||
|
||||
# Build the derivation
|
||||
$TOP/src/nix-store/nix-store -r --fallback "$storeExpr"
|
||||
$TOP/src/nix-store/nix-store -r --fallback "$drvPath"
|
||||
|
||||
text=$(cat "$outPath"/hello)
|
||||
if test "$text" != "Hello World!"; then exit 1; fi
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue