From 06699d4219019182d9e45ebc613ae1a1df23f257 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed, 17 Nov 2010 12:57:52 +0000
Subject: [PATCH] * Store the NAR size in the manifest.

---
 scripts/nix-push.in        | 5 +++++
 scripts/readmanifest.pm.in | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/nix-push.in b/scripts/nix-push.in
index c7da528b56..6760baa7e9 100644
--- a/scripts/nix-push.in
+++ b/scripts/nix-push.in
@@ -193,6 +193,10 @@ for (my $n = 0; $n < scalar @storePaths; $n++) {
     die "cannot query hash for `$storePath'" if $? != 0;
     chomp $narHash;
 
+    my $narSize = `$binDir/nix-store --query --size '$storePath'`;
+    die "cannot query size for `$storePath'" if $? != 0;
+    chomp $narSize;
+
     my $url;
     if ($localCopy) {
         $url = "$targetArchivesUrl/$narName";
@@ -204,6 +208,7 @@ for (my $n = 0; $n < scalar @storePaths; $n++) {
         , hash => "$hashAlgo:$narbz2Hash"
         , size => $narbz2Size
         , narHash => "$narHash"
+        , narSize => $narSize
         , references => $references
         , deriver => $deriver
         }
diff --git a/scripts/readmanifest.pm.in b/scripts/readmanifest.pm.in
index 7244984ead..2e6968c7d0 100644
--- a/scripts/readmanifest.pm.in
+++ b/scripts/readmanifest.pm.in
@@ -165,8 +165,9 @@ sub writeManifest {
             print MANIFEST "  StorePath: $storePath\n";
             print MANIFEST "  NarURL: $narFile->{url}\n";
             print MANIFEST "  Hash: $narFile->{hash}\n" if defined $narFile->{hash};
-            print MANIFEST "  NarHash: $narFile->{narHash}\n";
             print MANIFEST "  Size: $narFile->{size}\n" if defined $narFile->{size};
+            print MANIFEST "  NarHash: $narFile->{narHash}\n";
+            print MANIFEST "  NarSize: $narFile->{narSize}\n" if $narFile->{narSize};
             print MANIFEST "  References: $narFile->{references}\n"
                 if defined $narFile->{references} && $narFile->{references} ne "";
             print MANIFEST "  Deriver: $narFile->{deriver}\n"