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

13
mirror-channel.pl
View file

@ -95,12 +95,14 @@ foreach my $storePath (permute(keys %narFiles)) {
foreach my $nar (@{$nars}) {
if (! -e $narInfoFile) {
my $dstFileTmp = "$narDir/.tmp.$$.nar.$nar->{narHash}";
my $ext;
if (isValidPath($storePath) && queryPathHash16($storePath) eq $nar->{narHash}) {
print STDERR "copying $storePath instead of downloading $nar->{url}\n";
# Verify that $storePath hasn't been corrupted.
my $narHash = `bash -c 'exec 4>&1; nix-store --dump $storePath | tee >(nix-hash --type sha256 --flat /dev/stdin >&4) | bzip2 > $dstFileTmp'`;
# Verify that $storePath hasn't been corrupted and compress it at the same time.
$ext = "xz";
my $narHash = `bash -c 'exec 4>&1; nix-store --dump $storePath | tee >(nix-hash --type sha256 --flat /dev/stdin >&4) | xz -7 > $dstFileTmp'`;
chomp $narHash;
die "hash mismatch in `$storePath'" if "sha256:$narHash" ne $nar->{narHash};
} else {
@ -109,6 +111,7 @@ foreach my $storePath (permute(keys %narFiles)) {
# Verify whether the downloaded file is a bzipped NAR file
# that matches the NAR hash given in the manifest.
$ext = "bz2";
my $narHash = `bunzip2 < $dstFileTmp | nix-hash --type sha256 --flat /dev/stdin` or die;
chomp $narHash;
die "hash mismatch in downloaded file `$nar->{url}'" if "sha256:$narHash" ne $nar->{narHash};
@ -119,7 +122,7 @@ foreach my $storePath (permute(keys %narFiles)) {
chomp $fileHash;
$nar->{hash} = "sha256:$fileHash";
my $dstFile = "$narDir/$fileHash.nar.bz2";
my $dstFile = "$narDir/$fileHash.nar.$ext";
if (-e $dstFile) {
unlink($dstFileTmp) or die;
} else {
@ -131,8 +134,8 @@ foreach my $storePath (permute(keys %narFiles)) {
# Write the .narinfo.
my $info;
$info .= "StorePath: $storePath\n";
$info .= "URL: nar/$fileHash.nar.bz2\n";
$info .= "Compression: bzip2\n";
$info .= "URL: nar/$fileHash.nar.$ext\n";
$info .= "Compression: " . ($ext eq "xz" ? "xz" : "bzip2") . "\n";
$info .= "FileHash: $nar->{hash}\n";
$info .= "FileSize: $nar->{size}\n";
$info .= "NarHash: $nar->{narHash}\n";