diff options
| author | Shea Levy <shea@shealevy.com> | 2011-11-06T00·13+0000 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2011-11-06T00·13+0000 |
| commit | 2721e9f56f92f5bd630dcbb0104fc56159cb28d4 (patch) | |
| tree | f46ac1a8807b81cc54d176e8fb72915aa057f0ac /tests/nix-push.sh | |
| parent | bffe35acedafcd7c7237cb1415798362bff8a180 (diff) | |
| parent | a6a3f3a8c26fdd6900880c13e924e6879d6c714c (diff) | |
Merge from trunk
Diffstat (limited to 'tests/nix-push.sh')
| -rw-r--r-- | tests/nix-push.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/nix-push.sh b/tests/nix-push.sh index 0a35e3b97ab7..69f05141af69 100644 --- a/tests/nix-push.sh +++ b/tests/nix-push.sh @@ -1,11 +1,10 @@ source common.sh -drvPath=$($nixinstantiate dependencies.nix) -outPath=$($nixstore -r $drvPath) +drvPath=$(nix-instantiate dependencies.nix) +outPath=$(nix-store -r $drvPath) echo "pushing $drvPath" mkdir -p $TEST_ROOT/cache -$NIX_BIN_DIR/nix-push \ - --copy $TEST_ROOT/cache $TEST_ROOT/manifest $drvPath +nix-push --copy $TEST_ROOT/cache $TEST_ROOT/manifest $drvPath |