aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/nix-push.in12
1 files changed, 5 insertions, 7 deletions
diff --git a/scripts/nix-push.in b/scripts/nix-push.in
index 38097f740..c7da528b5 100644
--- a/scripts/nix-push.in
+++ b/scripts/nix-push.in
@@ -172,12 +172,6 @@ for (my $n = 0; $n < scalar @storePaths; $n++) {
$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 @@ for (my $n = 0; $n < scalar @storePaths; $n++) {
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 @@ for (my $n = 0; $n < scalar @storePaths; $n++) {
{ url => $url
, hash => "$hashAlgo:$narbz2Hash"
, size => $narbz2Size
- , narHash => "$hashAlgo:$narHash"
+ , narHash => "$narHash"
, references => $references
, deriver => $deriver
}