diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2005-02-09T12·57+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2005-02-09T12·57+0000 |
| commit | 98df735b5149bc1e39ce6b0bae13fbf7cebcdc05 (patch) | |
| tree | 9a9549e0689400b71e230ba51317a2590969b63d /tests/substitutes2.sh | |
| parent | 582e01c06f9ecee25a31c34562926b41dc2856eb (diff) | |
* 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.
Diffstat (limited to 'tests/substitutes2.sh')
| -rw-r--r-- | tests/substitutes2.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/substitutes2.sh b/tests/substitutes2.sh index e48e12a8f4b7..1a7b848ca3da 100644 --- a/tests/substitutes2.sh +++ b/tests/substitutes2.sh @@ -1,13 +1,13 @@ # Instantiate. -storeExpr=$($TOP/src/nix-instantiate/nix-instantiate substitutes2.nix) -echo "store expr is $storeExpr" +drvPath=$($TOP/src/nix-instantiate/nix-instantiate substitutes2.nix) +echo "derivation is $drvPath" # Find the output path. -outPath=$($TOP/src/nix-store/nix-store -qvvvvv "$storeExpr") +outPath=$($TOP/src/nix-store/nix-store -qvvvvv "$drvPath") echo "output path is $outPath" regSub() { - (echo $1 && echo $2 && echo 3 && echo $outPath && echo Hallo && echo Wereld && echo 0) | $TOP/src/nix-store/nix-store --substitute + (echo $1 && echo "" && echo $2 && echo 3 && echo $outPath && echo Hallo && echo Wereld && echo 0) | $TOP/src/nix-store/nix-store --substitute } # Register a substitute for the output path. @@ -17,7 +17,7 @@ regSub $outPath $(pwd)/substituter.sh # precedence over the previous one. It will fail. regSub $outPath $(pwd)/substituter2.sh -$TOP/src/nix-store/nix-store -rvv "$storeExpr" +$TOP/src/nix-store/nix-store -rvv "$drvPath" text=$(cat "$outPath"/hello) if test "$text" != "Hallo Wereld"; then exit 1; fi |