TakeV
/
guix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* nix-pull: update the Nix manifest cache if necessary. Also, don't 

read the manifest just to check the version and print the number of
  paths.  This makes nix-pull very fast for the cached cache (speeding
  up nixos-rebuild without the ‘--no-pull’ or ‘--fast’ options).
This commit is contained in:
Eelco Dolstra 2011-11-16 16:41:48 +00:00
parent d7d7910ba4
commit f8e609c341
2 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
perl/lib/Nix/Manifest.pm
View File

@ -305,8 +305,8 @@ EOF
# unless we've already done so on a previous run.
my %seen;
for my $manifest (glob "$manifestDir/*.nixmanifest") {
$manifest = Cwd::abs_path($manifest);
for my $manifestLink (glob "$manifestDir/*.nixmanifest") {
my $manifest = Cwd::abs_path($manifestLink);
my $timestamp = lstat($manifest)->mtime;
$seen{$manifest} = 1;
@ -342,10 +342,10 @@ EOF
my $version = readManifest_($manifest, \&addNARToDB, \&addPatchToDB);
if ($version < 3) {
die "you have an old-style manifest `$manifest'; please delete it";
die "you have an old-style or corrupt manifest `$manifestLink'; please delete it";
}
if ($version >= 10) {
die "manifest `$manifest' is too new; please delete it or upgrade Nix";
die "manifest `$manifestLink' is too new; please delete it or upgrade Nix";
}
}

24
scripts/nix-pull.in
View File

@ -33,10 +33,6 @@ if (! -l $manifestDirLink) {
# Process the URLs specified on the command line.
my %narFiles;
my %patches;
my $skipWrongStore = 0;
sub downloadFile {
my $url = shift;
@ -68,20 +64,6 @@ sub processURL {
$manifest = downloadFile $url;
}
my $version = readManifest($manifest, \%narFiles, \%patches);
die "`$url' is not a manifest or it is too old (i.e., for Nix <= 0.7)\n" if $version < 3;
die "manifest `$url' is too new\n" if $version >= 5;
if ($skipWrongStore) {
foreach my $path (keys %narFiles) {
if (substr($path, 0, length($storeDir) + 1) ne "$storeDir/") {
print STDERR "warning: manifest `$url' assumes a Nix store at a different location than $storeDir, skipping...\n";
exit 0;
}
}
}
my $baseName = "unnamed";
if ($url =~ /\/([^\/]+)\/[^\/]+$/) { # get the forelast component
$baseName = $1;
@ -120,12 +102,12 @@ sub processURL {
while (@ARGV) {
my $url = shift @ARGV;
if ($url eq "--skip-wrong-store") {
$skipWrongStore = 1;
# No-op, no longer supported.
} else {
processURL $url;
}
}
my $size = scalar (keys %narFiles);
print "$size store paths in manifest\n";
# Update the cache.
updateManifestDB();