about summary refs log tree commit diff
path: root/tests/nix-pull.sh
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2006-03-01T12·51+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2006-03-01T12·51+0000
commit84c4631221bc65643830173b4affe58b0dc58202 (patch)
tree19093aff12bbb33e1b377a2fdec688965e42029e /tests/nix-pull.sh
parenta4c63c6e8e161d55778b797e566d9eca7c47f34f (diff)
* Simplification.
Diffstat (limited to 'tests/nix-pull.sh')
-rw-r--r--tests/nix-pull.sh14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/nix-pull.sh b/tests/nix-pull.sh
index a8dca8feaa42..146227b71aac 100644
--- a/tests/nix-pull.sh
+++ b/tests/nix-pull.sh
@@ -7,7 +7,7 @@ clearStore () {
     mkdir "$NIX_STORE_DIR"
     rm -rf "$NIX_DB_DIR"
     mkdir "$NIX_DB_DIR"
-    $TOP/src/nix-store/nix-store --init
+    $nixstore --init
 }
 
 pullCache () {
@@ -18,11 +18,11 @@ pullCache () {
 clearStore
 pullCache
 
-drvPath=$($TOP/src/nix-instantiate/nix-instantiate dependencies.nix)
-outPath=$($TOP/src/nix-store/nix-store -q $drvPath)
+drvPath=$($nixinstantiate dependencies.nix)
+outPath=$($nixstore -q $drvPath)
 
 echo "building $outPath using substitutes..."
-$TOP/src/nix-store/nix-store -r $outPath
+$nixstore -r $outPath
 
 cat $outPath/input-2/bar
 
@@ -30,10 +30,10 @@ clearStore
 pullCache
 
 echo "building $drvPath using substitutes..."
-$TOP/src/nix-store/nix-store -r $drvPath
+$nixstore -r $drvPath
 
 cat $outPath/input-2/bar
 
 # Check that the derivers are set properly.
-test $($TOP/src/nix-store/nix-store -q --deriver "$outPath") = "$drvPath"
-$TOP/src/nix-store/nix-store -q --deriver $(/bin/ls -l $outPath/input-2 | sed 's/.*->\ //') | grep -q -- "-input-2.drv" 
+test $($nixstore -q --deriver "$outPath") = "$drvPath"
+$nixstore -q --deriver $(/bin/ls -l $outPath/input-2 | sed 's/.*->\ //') | grep -q -- "-input-2.drv"