nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 03:56:01 +01:00
Code Activity

treewide: replace manual MiB calculations with renderSize

Browse source 
(cherry picked from commit 584a8e8a00)
This commit is contained in:
Marcel 2025-10-27 01:21:02 +01:00 • committed by github-actions[bot]
parent 0c6585707a
commit 6275de367f
3 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libmain/shared.cc
View file

@ -6,6 +6,7 @@
#include "nix/main/loggers.hh"
#include "nix/main/progress-bar.hh"
#include "nix/util/signals.hh"
#include "nix/util/util.hh"
#include <algorithm>
#include <exception>
@ -64,18 +65,19 @@ void printMissing(ref<Store> store, const MissingPaths & missing, Verbosity lvl)
}
if (!missing.willSubstitute.empty()) {
const float downloadSizeMiB = missing.downloadSize / (1024.f * 1024.f);
const float narSizeMiB = missing.narSize / (1024.f * 1024.f);
if (missing.willSubstitute.size() == 1) {
printMsg(
lvl, "this path will be fetched (%.2f MiB download, %.2f MiB unpacked):", downloadSizeMiB, narSizeMiB);
lvl,
"this path will be fetched (%s download, %s unpacked):",
renderSize(missing.downloadSize),
renderSize(missing.narSize));
} else {
printMsg(
lvl,
"these %d paths will be fetched (%.2f MiB download, %.2f MiB unpacked):",
"these %d paths will be fetched (%s download, %s unpacked):",
missing.willSubstitute.size(),
downloadSizeMiB,
narSizeMiB);
renderSize(missing.downloadSize),
renderSize(missing.narSize));
}
std::vector<const StorePath *> willSubstituteSorted = {};
std::for_each(missing.willSubstitute.begin(), missing.willSubstitute.end(), [&](const StorePath & p) {