Author: eelco
Date: Wed Nov 17 12:51:54 2010
New Revision: 24730
URL: https://svn.nixos.org/websvn/nix/?rev=24730&sc=1
Log:
* nix-push: no need to compute the NAR hash, since the Nix database
already has it (`nix-store -q --hash').
Modified:
nix/branches/sqlite/corepkgs/nar/nar.sh.in
nix/branches/sqlite/scripts/nix-push.in
Modified: nix/branches/sqlite/corepkgs/nar/nar.sh.in
==============================================================================
--- nix/branches/sqlite/corepkgs/nar/nar.sh.in Wed Nov 17 12:45:14 2010
(r24729)
+++ nix/branches/sqlite/corepkgs/nar/nar.sh.in Wed Nov 17 12:51:54 2010
(r24730)
@@ -7,8 +7,6 @@
@bzip2@ < tmp > $dst
-...@bindir@/nix-hash -vvvvv --flat --type $hashAlgo --base32 tmp >
$out/nar-hash
-
@bindir@/nix-hash --flat --type $hashAlgo --base32 $dst > $out/narbz2-hash
@coreutils@/mv $out/tmp.nar.bz2 $out/$(@coreutils@/cat
$out/narbz2-hash).nar.bz2
Modified: nix/branches/sqlite/scripts/nix-push.in
==============================================================================
--- nix/branches/sqlite/scripts/nix-push.in Wed Nov 17 12:45:14 2010
(r24729)
+++ nix/branches/sqlite/scripts/nix-push.in Wed Nov 17 12:51:54 2010
(r24730)
@@ -172,12 +172,6 @@
$narbz2Hash =~ /^[0-9a-z]+$/ or die "invalid hash";
close HASH;
- open HASH, "$narDir/nar-hash" or die "cannot open nar-hash";
- my $narHash = <HASH>;
- chomp $narHash;
- $narHash =~ /^[0-9a-z]+$/ or die "invalid hash";
- close HASH;
-
my $narName = "$narbz2Hash.nar.bz2";
my $narFile = "$narDir/$narName";
@@ -195,6 +189,10 @@
chomp $deriver;
$deriver = "" if $deriver eq "unknown-deriver";
+ my $narHash = `$binDir/nix-store --query --hash '$storePath'`;
+ die "cannot query hash for `$storePath'" if $? != 0;
+ chomp $narHash;
+
my $url;
if ($localCopy) {
$url = "$targetArchivesUrl/$narName";
@@ -205,7 +203,7 @@
{ url => $url
, hash => "$hashAlgo:$narbz2Hash"
, size => $narbz2Size
- , narHash => "$hashAlgo:$narHash"
+ , narHash => "$narHash"
, references => $references
, deriver => $deriver
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
