* New command `nix-copy-closure' to copy a closure to a Nix store on
another machine through ssh. E.g., $ nix-copy-closure xyzzy $(which svn) copies the closure of Subversion to machine `xyzzy'. This is like `nix-pack-closure $(which svn) | ssh xyzzy', but it's much more efficient since it only copies those paths that are missing on the target machine.
This commit is contained in:
parent
7f6161ab3a
commit
024a8ed382
|
@ -1,7 +1,8 @@
|
||||||
bin_SCRIPTS = nix-collect-garbage \
|
bin_SCRIPTS = nix-collect-garbage \
|
||||||
nix-pull nix-push nix-prefetch-url \
|
nix-pull nix-push nix-prefetch-url \
|
||||||
nix-install-package nix-channel nix-build \
|
nix-install-package nix-channel nix-build \
|
||||||
nix-pack-closure nix-unpack-closure
|
nix-pack-closure nix-unpack-closure \
|
||||||
|
nix-copy-closure
|
||||||
|
|
||||||
noinst_SCRIPTS = nix-profile.sh generate-patches.pl find-runtime-roots.pl
|
noinst_SCRIPTS = nix-profile.sh generate-patches.pl find-runtime-roots.pl
|
||||||
|
|
||||||
|
@ -30,4 +31,5 @@ EXTRA_DIST = nix-collect-garbage.in \
|
||||||
download-using-manifests.pl.in \
|
download-using-manifests.pl.in \
|
||||||
generate-patches.pl.in \
|
generate-patches.pl.in \
|
||||||
nix-pack-closure.in nix-unpack-closure.in \
|
nix-pack-closure.in nix-unpack-closure.in \
|
||||||
|
nix-copy-closure.in \
|
||||||
find-runtime-roots.pl.in
|
find-runtime-roots.pl.in
|
||||||
|
|
55
scripts/nix-copy-closure.in
Normal file
55
scripts/nix-copy-closure.in
Normal file
|
@ -0,0 +1,55 @@
|
||||||
|
#! @perl@ -w
|
||||||
|
|
||||||
|
my $binDir = $ENV{"NIX_BIN_DIR"};
|
||||||
|
$binDir = "@bindir@" unless defined $binDir;
|
||||||
|
|
||||||
|
|
||||||
|
# Get the target host.
|
||||||
|
my $sshHost = shift @ARGV;
|
||||||
|
|
||||||
|
|
||||||
|
# !!! Copied from nix-pack-closure, should put this in a module.
|
||||||
|
my %storePathsSeen;
|
||||||
|
my @storePaths = ();
|
||||||
|
|
||||||
|
while (@ARGV) {
|
||||||
|
my $storePath = shift @ARGV;
|
||||||
|
|
||||||
|
# $storePath might be a symlink to the store, so resolve it.
|
||||||
|
$storePath = (`$binDir/nix-store --query --resolve '$storePath'`
|
||||||
|
or die "cannot resolve `$storePath'");
|
||||||
|
chomp $storePath;
|
||||||
|
|
||||||
|
# Get the closure of this path.
|
||||||
|
my $pid = open(READ,
|
||||||
|
"$binDir/nix-store --query --requisites '$storePath'|") or die;
|
||||||
|
|
||||||
|
while (<READ>) {
|
||||||
|
chomp;
|
||||||
|
die "bad: $_" unless /^\//;
|
||||||
|
if (!defined $storePathsSeen{$_}) {
|
||||||
|
push @storePaths, $_;
|
||||||
|
$storePathsSeen{$_} = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
close READ or die "nix-store failed: $?";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# Ask the remote host which paths are invalid.
|
||||||
|
open(READ, "-|", "ssh", $sshHost, "nix-store", "--check-validity", "--print-invalid", @storePaths);
|
||||||
|
my @missing = ();
|
||||||
|
while (<READ>) {
|
||||||
|
chomp;
|
||||||
|
print STDERR "target needs $_\n";
|
||||||
|
push @missing, $_;
|
||||||
|
}
|
||||||
|
close READ or die;
|
||||||
|
|
||||||
|
|
||||||
|
# Export the store paths and import them on the remote machine.
|
||||||
|
if (scalar @missing > 0) {
|
||||||
|
system("nix-store --export @missing | ssh $sshHost nix-store --import") == 0
|
||||||
|
or die "copying store paths to remote machine failed: $?";
|
||||||
|
}
|
Loading…
Reference in a new issue