* Synchronous nix-pull' with nix-push'.

* Use curl instead of wget.

scripts/nix-pull.in

@@ -64,7 +64,7 @@ $fullexpr .= "]";
 
 
 # Instantiate store expressions from the Nix expressions we created above.
-print STDERR "instantiating Nix expression...\n";
+print STDERR "instantiating store expressions...\n";
 my $pid = open2(\*READ, \*WRITE, "nix-instantiate -") or die "cannot run nix-instantiate";
 
 print WRITE $fullexpr;

scripts/nix-push.in

@@ -159,7 +159,7 @@ foreach my $nararchive (@nararchives) {
 
     if (system("$curl --head $archives_get_url/$basename > /dev/null") != 0) {
         print STDERR "  $nararchive\n";
-        system("$curl  --show-error --upload-file " .
+        system("$curl --show-error --upload-file " .
                "'$nararchive' '$archives_put_url/$basename' > /dev/null") == 0 or
             die "curl failed on $nararchive: $?";
     }