diff options
| -rw-r--r-- | src/libstore/local-store.cc | 5 | ||||
| -rw-r--r-- | src/libstore/misc.cc | 6 | ||||
| -rw-r--r-- | src/libstore/misc.hh | 3 | ||||
| -rw-r--r-- | src/nix-env/nix-env.cc | 6 |
4 files changed, 15 insertions, 5 deletions
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc index 6926c4937..141c7a852 100644 --- a/src/libstore/local-store.cc +++ b/src/libstore/local-store.cc @@ -565,7 +565,10 @@ bool LocalStore::querySubstitutablePathInfo(const Path & path, Path p; getline(*run.from, p); info.references.insert(p); } - info.downloadSize = 0; + getline(*run.from, s); + long long size; + if (!string2Int(s, size)) abort(); + info.downloadSize = size; return true; } } diff --git a/src/libstore/misc.cc b/src/libstore/misc.cc index 1759f521c..85197adcf 100644 --- a/src/libstore/misc.cc +++ b/src/libstore/misc.cc @@ -46,8 +46,11 @@ Path findOutput(const Derivation & drv, string id) void queryMissing(const PathSet & targets, - PathSet & willBuild, PathSet & willSubstitute, PathSet & unknown) + PathSet & willBuild, PathSet & willSubstitute, PathSet & unknown, + unsigned long long & downloadSize) { + downloadSize = 0; + PathSet todo(targets.begin(), targets.end()), done; while (!todo.empty()) { @@ -86,6 +89,7 @@ void queryMissing(const PathSet & targets, SubstitutablePathInfo info; if (store->querySubstitutablePathInfo(p, info)) { willSubstitute.insert(p); + downloadSize += info.downloadSize; todo.insert(info.references.begin(), info.references.end()); } else unknown.insert(p); diff --git a/src/libstore/misc.hh b/src/libstore/misc.hh index 33d81ed4a..f3aa34076 100644 --- a/src/libstore/misc.hh +++ b/src/libstore/misc.hh @@ -29,7 +29,8 @@ Path findOutput(const Derivation & drv, string id); derivations that will be built, and the set of output paths that will be substituted. */ void queryMissing(const PathSet & targets, - PathSet & willBuild, PathSet & willSubstitute, PathSet & unknown); + PathSet & willBuild, PathSet & willSubstitute, PathSet & unknown, + unsigned long long & downloadSize); } diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc index ee870f690..085d83a5b 100644 --- a/src/nix-env/nix-env.cc +++ b/src/nix-env/nix-env.cc @@ -540,7 +540,8 @@ static void printMissing(EvalState & state, const DrvInfos & elems) targets.insert(i->queryOutPath(state)); } - queryMissing(targets, willBuild, willSubstitute, unknown); + unsigned long long downloadSize; + queryMissing(targets, willBuild, willSubstitute, unknown, downloadSize); if (!willBuild.empty()) { printMsg(lvlInfo, format("the following derivations will be built:")); @@ -549,7 +550,8 @@ static void printMissing(EvalState & state, const DrvInfos & elems) } if (!willSubstitute.empty()) { - printMsg(lvlInfo, format("the following paths will be downloaded/copied:")); + printMsg(lvlInfo, format("the following paths will be downloaded/copied (%.2f MiB):") % + (downloadSize / (1024.0 * 1024.0))); foreach (PathSet::iterator, i, willSubstitute) printMsg(lvlInfo, format(" %1%") % *i); } |