Implement nix-copy-closure --from via nix-store --serve

4 files changed, 23 insertions, 30 deletions

diff --git a/scripts/build-remote.pl.in b/scripts/build-remote.pl.in
index 337374c214b5..a55d758252ea 100755
--- a/scripts/build-remote.pl.in
+++ b/scripts/build-remote.pl.in
@@ -272,7 +272,8 @@ if ($res != 0) {
 # Copy the output from the build machine.
 my @outputs2 = grep { !isValidPath($_) } @outputs;
 if (scalar @outputs2 > 0) {
-    writeInt(5, $to) or die; # == cmdExportPaths
+    writeInt(5, $to); # == cmdExportPaths
+    writeInt(0, $to); # don't sign
     writeStrings(\@outputs2, $to);
     $ENV{'NIX_HELD_LOCKS'} = "@outputs2"; # FIXME: ugly
     importPaths(fileno($from));
diff --git a/scripts/nix-copy-closure.in b/scripts/nix-copy-closure.in
index 05faa63917da..3dde6e1574ad 100755
--- a/scripts/nix-copy-closure.in
+++ b/scripts/nix-copy-closure.in
@@ -89,42 +89,22 @@ if ($toMode) { # Copy TO the remote machine.
 
 else { # Copy FROM the remote machine.
 
-    openSSHConnection $sshHost or die "$0: unable to start SSH\n";
+    my ($from, $to) = connectToRemoteNix($sshHost, [ @sshOpts ]);
 
     # Query the closure of the given store paths on the remote
     # machine.  Paths are assumed to be store paths; there is no
     # resolution (following of symlinks).
-    my $extraOpts = $includeOutputs ? "--include-outputs" : "";
-    my $pid = open(READ,
-        "set -f; ssh @sshOpts $sshHost nix-store --query --requisites $extraOpts @storePaths|") or die;
-
-    while (<READ>) {
-        chomp;
-        die "bad: $_" unless /^\//;
-        push @missing, $_ unless isValidPath($_);
-    }
-
-    close READ or die "nix-store on remote machine `$sshHost' failed: $?";
-
-    my $missingSize = 0;
-    if ($progressViewer ne "") {
-        $missingSize = sum (split ' ', `set -f; ssh @sshOpts $sshHost nix-store -q --size @missing`) or die;
-    }
+    syswrite($to, pack("L<x4L<x4", 7, $includeOutputs ? 1 : 0)) or die;
+    writeStrings(\@storePaths, $to);
+    my @missing = grep { !isValidPath($_) } readStrings($from);
 
     # Export the store paths on the remote machine and import them locally.
     if (scalar @missing > 0) {
         print STDERR "copying ", scalar @missing, " missing paths from ‘$sshHost’...\n";
-        unless ($dryRun) {
-            if ($useSubstitutes) {
-                system "$Nix::Config::binDir/nix-store -r --ignore-unknown @missing";
-            }
-            $compressor = "| $compressor" if $compressor ne "";
-            $decompressor = "$decompressor |" if $decompressor ne "";
-            $progressViewer = "$progressViewer -s $missingSize |" if $progressViewer ne "";
-            my $extraOpts = $sign ? "--sign" : "";
-            system("set -f; ssh $sshHost @sshOpts 'nix-store --export $extraOpts @missing $compressor' | $decompressor $progressViewer $Nix::Config::binDir/nix-store --import > /dev/null") == 0
-                or die "copying store paths from remote machine `$sshHost' failed: $?";
-        }
+        writeInt(5, $to); # == cmdExportPaths
+        writeInt($sign ? 1 : 0, $to);
+        writeStrings(\@missing, $to);
+        importPaths(fileno($from));
     }
 
 }
diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc
index f874ffeadc3e..f2621a9954bf 100644
--- a/src/nix-store/nix-store.cc
+++ b/src/nix-store/nix-store.cc
@@ -993,9 +993,10 @@ static void opServe(Strings opFlags, Strings opArgs)
             }
 
             case cmdExportPaths: {
+                bool sign = readInt(in);
                 Paths sorted = topoSortPaths(*store, readStorePaths<PathSet>(in));
                 reverse(sorted.begin(), sorted.end());
-                exportPaths(*store, sorted, false, out);
+                exportPaths(*store, sorted, sign, out);
                 break;
             }
 
@@ -1025,6 +1026,16 @@ static void opServe(Strings opFlags, Strings opArgs)
                 break;
             }
 
+            case cmdQueryClosure: {
+                bool includeOutputs = readInt(in);
+                PathSet paths = readStorePaths<PathSet>(in);
+                PathSet closure;
+                for (auto & i : paths)
+                    computeFSClosure(*store, i, closure, false, includeOutputs);
+                writeStrings(closure, out);
+                break;
+            }
+
             default:
                 throw Error(format("unknown serve command %1%") % cmd);
         }
diff --git a/src/nix-store/serve-protocol.hh b/src/nix-store/serve-protocol.hh
index eb13b46e51bd..741b622beb17 100644
--- a/src/nix-store/serve-protocol.hh
+++ b/src/nix-store/serve-protocol.hh
@@ -16,6 +16,7 @@ typedef enum {
     cmdImportPaths = 4,
     cmdExportPaths = 5,
     cmdBuildPaths = 6,
+    cmdQueryClosure = 7,
 } ServeCommand;
 
 }