the-distro/channel-scripts
1
0
Fork 1
Code Issues 8 Pull requests Packages Projects Releases Wiki Activity

* Enable xz compression of NARs.

Browse source 
git-svn-id: https://nixos.org/repos/nix/release/trunk/channels@34727 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb
This commit is contained in:
Eelco Dolstra 2013-05-23 20:23:58 +00:00
parent 0ddda8e433
commit e9f69209fc
1 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
mirror-channel.pl
View file

@ -95,31 +95,34 @@ foreach my $storePath (permute(keys %narFiles)) {
foreach my $nar (@{$nars}) { foreach my $nar (@{$nars}) {
if (! -e $narInfoFile) { if (! -e $narInfoFile) {
my $dstFileTmp = "$narDir/.tmp.$$.nar.$nar->{narHash}"; my $dstFileTmp = "$narDir/.tmp.$$.nar.$nar->{narHash}";
my $ext;
if (isValidPath($storePath) && queryPathHash16($storePath) eq $nar->{narHash}) { if (isValidPath($storePath) && queryPathHash16($storePath) eq $nar->{narHash}) {
print STDERR "copying $storePath instead of downloading $nar->{url}\n"; print STDERR "copying $storePath instead of downloading $nar->{url}\n";
# Verify that $storePath hasn't been corrupted. # Verify that $storePath hasn't been corrupted and compress it at the same time.
my $narHash = `bash -c 'exec 4>&1; nix-store --dump $storePath | tee >(nix-hash --type sha256 --flat /dev/stdin >&4) | bzip2 > $dstFileTmp'`; $ext = "xz";
chomp $narHash; my $narHash = `bash -c 'exec 4>&1; nix-store --dump $storePath | tee >(nix-hash --type sha256 --flat /dev/stdin >&4) | xz -7 > $dstFileTmp'`;
die "hash mismatch in `$storePath'" if "sha256:$narHash" ne $nar->{narHash}; chomp $narHash;
} else { die "hash mismatch in `$storePath'" if "sha256:$narHash" ne $nar->{narHash};
print STDERR "downloading $nar->{url}\n"; } else {
system("$curl '$nar->{url}' > $dstFileTmp") == 0 or die "failed to download `$nar->{url}'"; print STDERR "downloading $nar->{url}\n";
system("$curl '$nar->{url}' > $dstFileTmp") == 0 or die "failed to download `$nar->{url}'";
# Verify whether the downloaded file is a bzipped NAR file # Verify whether the downloaded file is a bzipped NAR file
# that matches the NAR hash given in the manifest. # that matches the NAR hash given in the manifest.
my $narHash = `bunzip2 < $dstFileTmp | nix-hash --type sha256 --flat /dev/stdin` or die; $ext = "bz2";
chomp $narHash; my $narHash = `bunzip2 < $dstFileTmp | nix-hash --type sha256 --flat /dev/stdin` or die;
die "hash mismatch in downloaded file `$nar->{url}'" if "sha256:$narHash" ne $nar->{narHash}; chomp $narHash;
} die "hash mismatch in downloaded file `$nar->{url}'" if "sha256:$narHash" ne $nar->{narHash};
}
# Compute the hash of the compressed NAR (Hydra doesn't provide one). # Compute the hash of the compressed NAR (Hydra doesn't provide one).
my $fileHash = `nix-hash --flat --type sha256 --base32 '$dstFileTmp'` or die; my $fileHash = `nix-hash --flat --type sha256 --base32 '$dstFileTmp'` or die;
chomp $fileHash; chomp $fileHash;
$nar->{hash} = "sha256:$fileHash"; $nar->{hash} = "sha256:$fileHash";
my $dstFile = "$narDir/$fileHash.nar.bz2"; my $dstFile = "$narDir/$fileHash.nar.$ext";
if (-e $dstFile) { if (-e $dstFile) {
unlink($dstFileTmp) or die; unlink($dstFileTmp) or die;
} else { } else {
@ -131,8 +134,8 @@ foreach my $storePath (permute(keys %narFiles)) {
# Write the .narinfo. # Write the .narinfo.
my $info; my $info;
$info .= "StorePath: $storePath\n"; $info .= "StorePath: $storePath\n";
$info .= "URL: nar/$fileHash.nar.bz2\n"; $info .= "URL: nar/$fileHash.nar.$ext\n";
$info .= "Compression: bzip2\n"; $info .= "Compression: " . ($ext eq "xz" ? "xz" : "bzip2") . "\n";
$info .= "FileHash: $nar->{hash}\n"; $info .= "FileHash: $nar->{hash}\n";
$info .= "FileSize: $nar->{size}\n"; $info .= "FileSize: $nar->{size}\n";
$info .= "NarHash: $nar->{narHash}\n"; $info .= "NarHash: $nar->{narHash}\n";
@ -155,7 +158,7 @@ foreach my $storePath (permute(keys %narFiles)) {
$nar->{narSize} = $narInfo->{narSize}; $nar->{narSize} = $narInfo->{narSize};
$nar->{url} = "$cacheURL/$narInfo->{url}"; $nar->{url} = "$cacheURL/$narInfo->{url}";
warn "archive `$cacheDir/$narInfo->{url}' has gone missing!\n" unless -f "$cacheDir/$narInfo->{url}"; warn "archive `$cacheDir/$narInfo->{url}' has gone missing!\n" unless -f "$cacheDir/$narInfo->{url}";
} }
} }