maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update the other substituters

Browse source
This commit is contained in:
Eelco Dolstra 2012-07-11 18:52:09 -04:00
parent 15c15da482
commit f2bdc87595
3 changed files with 66 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

21
scripts/copy-from-other-stores.pl.in
View file

@ -36,21 +36,20 @@ sub findStorePath {
if ($ARGV[0] eq "--query") { if ($ARGV[0] eq "--query") {
while (<STDIN>) { while (<STDIN>) {
my $cmd = $_; chomp $cmd; chomp;
my ($cmd, @args) = split " ", $_;
if ($cmd eq "have") { if ($cmd eq "have") {
my $storePath = <STDIN>; chomp $storePath; foreach my $storePath (@args) {
print STDOUT (defined findStorePath($storePath) ? "1\n" : "0\n"); print "$storePath\n" if defined findStorePath($storePath);
}
print "\n";
} }
elsif ($cmd eq "info") { elsif ($cmd eq "info") {
my $storePath = <STDIN>; chomp $storePath; foreach my $storePath (@args) {
my ($store, $sourcePath) = findStorePath($storePath); my ($store, $sourcePath) = findStorePath($storePath);
if (!defined $store) { next unless defined $store;
print "0\n";
next; # not an error
}
print "1\n";
$ENV{"NIX_DB_DIR"} = "$store/var/nix/db"; $ENV{"NIX_DB_DIR"} = "$store/var/nix/db";
@ -67,6 +66,7 @@ if ($ARGV[0] eq "--query") {
die "cannot query size of `$storePath'" if $? != 0; die "cannot query size of `$storePath'" if $? != 0;
chomp $narSize; chomp $narSize;
print "$storePath\n";
print "$deriver\n"; print "$deriver\n";
print scalar @references, "\n"; print scalar @references, "\n";
print "$_\n" foreach @references; print "$_\n" foreach @references;
@ -74,6 +74,9 @@ if ($ARGV[0] eq "--query") {
print "$narSize\n"; print "$narSize\n";
} }
print "\n";
}
else { die "unknown command `$cmd'"; } else { die "unknown command `$cmd'"; }
} }
} }

28
scripts/download-using-manifests.pl.in
View file

@ -173,32 +173,27 @@ sub computeSmallestDownload {
if ($ARGV[0] eq "--query") { if ($ARGV[0] eq "--query") {
while (<STDIN>) { while (<STDIN>) {
my $cmd = $_; chomp $cmd; chomp;
my ($cmd, @args) = split " ", $_;
if ($cmd eq "have") { if ($cmd eq "have") {
my $storePath = <STDIN>; chomp $storePath; foreach my $storePath (@args) {
print STDOUT ( print "$storePath\n" if scalar @{$dbh->selectcol_arrayref("select 1 from NARs where storePath = ?", {}, $storePath)} > 0;
scalar @{$dbh->selectcol_arrayref("select 1 from NARs where storePath = ?", {}, $storePath)} > 0 }
? "1\n" : "0\n"); print "\n";
} }
elsif ($cmd eq "info") { elsif ($cmd eq "info") {
my $storePath = <STDIN>; chomp $storePath; foreach my $storePath (@args) {
my $infos = $dbh->selectall_arrayref( my $infos = $dbh->selectall_arrayref(
"select * from NARs where storePath = ?", "select * from NARs where storePath = ?",
{ Slice => {} }, $storePath); { Slice => {} }, $storePath);
my $info; next unless scalar @{$infos} > 0;
if (scalar @{$infos} > 0) { my $info = @{$infos}[0];
$info = @{$infos}[0];
}
else {
print "0\n";
next; # not an error
}
print "1\n"; print "$storePath\n";
print "$info->{deriver}\n"; print "$info->{deriver}\n";
my @references = split " ", $info->{refs}; my @references = split " ", $info->{refs};
print scalar @references, "\n"; print scalar @references, "\n";
@ -225,6 +220,9 @@ if ($ARGV[0] eq "--query") {
print "$narSize\n"; print "$narSize\n";
} }
print "\n";
}
else { die "unknown command `$cmd'"; } else { die "unknown command `$cmd'"; }
} }

4
src/libstore/globals.cc
View file

@ -155,8 +155,8 @@ void setDefaultsFromEnvironment()
string subs = getEnv("NIX_SUBSTITUTERS", "default"); string subs = getEnv("NIX_SUBSTITUTERS", "default");
if (subs == "default") { if (subs == "default") {
//substituters.push_back(nixLibexecDir + "/nix/substituters/copy-from-other-stores.pl"); substituters.push_back(nixLibexecDir + "/nix/substituters/copy-from-other-stores.pl");
//substituters.push_back(nixLibexecDir + "/nix/substituters/download-using-manifests.pl"); substituters.push_back(nixLibexecDir + "/nix/substituters/download-using-manifests.pl");
substituters.push_back(nixLibexecDir + "/nix/substituters/download-from-binary-cache.pl"); substituters.push_back(nixLibexecDir + "/nix/substituters/download-from-binary-cache.pl");
} else } else
substituters = tokenizeString(subs, ":"); substituters = tokenizeString(subs, ":");