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/install-package.sh | |
| parent | bffe35acedafcd7c7237cb1415798362bff8a180 (diff) | |
| parent | a6a3f3a8c26fdd6900880c13e924e6879d6c714c (diff) | |
Merge from trunk
Diffstat (limited to 'tests/install-package.sh')
| -rw-r--r-- | tests/install-package.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/install-package.sh b/tests/install-package.sh index 89d1d71f3286..b818eda121cf 100644 --- a/tests/install-package.sh +++ b/tests/install-package.sh @@ -2,8 +2,8 @@ source common.sh # Note: this test expects to be run *after* nix-push.sh. -drvPath=$($nixinstantiate ./dependencies.nix) -outPath=$($nixstore -q $drvPath) +drvPath=$(nix-instantiate ./dependencies.nix) +outPath=$(nix-store -q $drvPath) clearStore clearProfiles @@ -12,10 +12,10 @@ cat > $TEST_ROOT/foo.nixpkg <<EOF NIXPKG1 file://$TEST_ROOT/manifest simple $system $drvPath $outPath EOF -$NIX_BIN_DIR/nix-install-package --non-interactive -p $profiles/test $TEST_ROOT/foo.nixpkg -test "$($nixenv -p $profiles/test -q '*' | wc -l)" -eq 1 +nix-install-package --non-interactive -p $profiles/test $TEST_ROOT/foo.nixpkg +test "$(nix-env -p $profiles/test -q '*' | wc -l)" -eq 1 clearProfiles -$NIX_BIN_DIR/nix-install-package --non-interactive -p $profiles/test --url file://$TEST_ROOT/foo.nixpkg -test "$($nixenv -p $profiles/test -q '*' | wc -l)" -eq 1 +nix-install-package --non-interactive -p $profiles/test --url file://$TEST_ROOT/foo.nixpkg +test "$(nix-env -p $profiles/test -q '*' | wc -l)" -eq 1 |