Revert "Merge pull request #14382 from NixOS/backport-14364-to-2.32-maintenance"

This reverts commit 5c9481de19,
reversing changes made to
291e8ab6bd. This is a behaviour change
that should be avoided on maintenance branches.

src/libfetchers/git-utils.cc

@@ -9,7 +9,6 @@
 #include "nix/util/users.hh"
 #include "nix/util/fs-sink.hh"
 #include "nix/util/sync.hh"
-#include "nix/util/util.hh"
 
 #include <git2/attr.h>
 #include <git2/blob.h>
@@ -531,12 +530,12 @@ struct GitRepoImpl : GitRepo, std::enable_shared_from_this<GitRepoImpl>
         auto act = (Activity *) payload;
         act->result(
             resFetchStatus,
-            fmt("%d/%d objects received, %d/%d deltas indexed, %s",
+            fmt("%d/%d objects received, %d/%d deltas indexed, %.1f MiB",
                 stats->received_objects,
                 stats->total_objects,
                 stats->indexed_deltas,
                 stats->total_deltas,
-                renderSize(stats->received_bytes)));
+                stats->received_bytes / (1024.0 * 1024.0)));
         return getInterrupted() ? -1 : 0;
     }
 

src/libflake/flakeref.cc

@@ -80,7 +80,8 @@ std::pair<FlakeRef, std::string> parsePathFlakeRefWithFragment(
 
     std::smatch match;
     auto succeeds = std::regex_match(url, match, pathFlakeRegex);
-    assert(succeeds);
+    if (!succeeds)
+        throw Error("invalid flakeref '%s'", url);
     auto path = match[1].str();
     auto query = decodeQuery(match[3].str(), /*lenient=*/true);
     auto fragment = percentDecode(match[5].str());

src/libmain/include/nix/main/shared.hh

@@ -89,6 +89,8 @@ extern volatile ::sig_atomic_t blockInt;
 
 /* GC helpers. */
 
+std::string showBytes(uint64_t bytes);
+
 struct GCResults;
 
 struct PrintFreed

src/libmain/shared.cc

@@ -6,7 +6,6 @@
 #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>
@@ -65,19 +64,18 @@ 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 (%s download, %s unpacked):",
-                renderSize(missing.downloadSize),
-                renderSize(missing.narSize));
+                lvl, "this path will be fetched (%.2f MiB download, %.2f MiB unpacked):", downloadSizeMiB, narSizeMiB);
         } else {
             printMsg(
                 lvl,
-                "these %d paths will be fetched (%s download, %s unpacked):",
+                "these %d paths will be fetched (%.2f MiB download, %.2f MiB unpacked):",
                 missing.willSubstitute.size(),
-                renderSize(missing.downloadSize),
-                renderSize(missing.narSize));
+                downloadSizeMiB,
+                narSizeMiB);
         }
         std::vector<const StorePath *> willSubstituteSorted = {};
         std::for_each(missing.willSubstitute.begin(), missing.willSubstitute.end(), [&](const StorePath & p) {
@@ -408,7 +406,7 @@ RunPager::~RunPager()
 PrintFreed::~PrintFreed()
 {
     if (show)
-        std::cout << fmt("%d store paths deleted, %s freed\n", results.paths.size(), renderSize(results.bytesFreed));
+        std::cout << fmt("%d store paths deleted, %s freed\n", results.paths.size(), showBytes(results.bytesFreed));
 }
 
 } // namespace nix

src/libstore/gc.cc

@@ -5,7 +5,6 @@
 #include "nix/util/finally.hh"
 #include "nix/util/unix-domain-socket.hh"
 #include "nix/util/signals.hh"
-#include "nix/util/util.hh"
 #include "nix/store/posix-fs-canonicalise.hh"
 
 #include "store-config-private.hh"
@@ -907,7 +906,9 @@ void LocalStore::collectGarbage(const GCOptions & options, GCResults & results)
 #endif
             ;
 
-        printInfo("note: currently hard linking saves %s", renderSize(unsharedSize - actualSize - overhead));
+        printInfo(
+            "note: currently hard linking saves %.2f MiB",
+            ((unsharedSize - actualSize - overhead) / (1024.0 * 1024.0)));
     }
 
     /* While we're at it, vacuum the database. */

src/libstore/optimise-store.cc

@@ -312,7 +312,7 @@ void LocalStore::optimiseStore()
 
     optimiseStore(stats);
 
-    printInfo("%s freed by hard-linking %d files", renderSize(stats.bytesFreed), stats.filesLinked);
+    printInfo("%s freed by hard-linking %d files", showBytes(stats.bytesFreed), stats.filesLinked);
 }
 
 void LocalStore::optimisePath(const Path & path, RepairFlag repair)

src/libutil-tests/util.cc

@@ -158,7 +158,6 @@ TEST(renderSize, misc)
     ASSERT_EQ(renderSize(972, true), "   0.9 KiB");
     ASSERT_EQ(renderSize(973, true), "   1.0 KiB"); // FIXME: should round down
     ASSERT_EQ(renderSize(1024, true), "   1.0 KiB");
-    ASSERT_EQ(renderSize(-1024, true), "  -1.0 KiB");
     ASSERT_EQ(renderSize(1024 * 1024, true), "1024.0 KiB");
     ASSERT_EQ(renderSize(1100 * 1024, true), "   1.1 MiB");
     ASSERT_EQ(renderSize(2ULL * 1024 * 1024 * 1024, true), "   2.0 GiB");

src/libutil/include/nix/util/util.hh

@@ -104,7 +104,7 @@ N string2IntWithUnitPrefix(std::string_view s)
  * GiB`. If `align` is set, the number will be right-justified by
  * padding with spaces on the left.
  */
-std::string renderSize(int64_t value, bool align = false);
+std::string renderSize(uint64_t value, bool align = false);
 
 /**
  * Parse a string into a float.
@@ -333,6 +333,8 @@ struct overloaded : Ts...
 template<class... Ts>
 overloaded(Ts...) -> overloaded<Ts...>;
 
+std::string showBytes(uint64_t bytes);
+
 /**
  * Provide an addition operator between strings and string_views
  * inexplicably omitted from the standard library.

src/libutil/util.cc

@@ -132,16 +132,15 @@ std::optional<N> string2Float(const std::string_view s)
 template std::optional<double> string2Float<double>(const std::string_view s);
 template std::optional<float> string2Float<float>(const std::string_view s);
 
-std::string renderSize(int64_t value, bool align)
+std::string renderSize(uint64_t value, bool align)
 {
     static const std::array<char, 9> prefixes{{'K', 'K', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y'}};
     size_t power = 0;
-    double abs_value = std::abs(value);
-    while (abs_value > 1024 && power < prefixes.size()) {
+    double res = value;
+    while (res > 1024 && power < prefixes.size()) {
         ++power;
-        abs_value /= 1024;
+        res /= 1024;
     }
-    double res = (double) value / std::pow(1024.0, power);
     return fmt(align ? "%6.1f %ciB" : "%.1f %ciB", power == 0 ? res / 1024 : res, prefixes.at(power));
 }
 
@@ -257,4 +256,9 @@ std::pair<std::string_view, std::string_view> getLine(std::string_view s)
     }
 }
 
+std::string showBytes(uint64_t bytes)
+{
+    return fmt("%.2f MiB", bytes / (1024.0 * 1024.0));
+}
+
 } // namespace nix

src/nix/diff-closures.cc

@@ -107,7 +107,8 @@ void printClosureDiff(
             if (!removed.empty() || !added.empty())
                 items.push_back(fmt("%s → %s", showVersions(removed), showVersions(added)));
             if (showDelta)
-                items.push_back(fmt("%s%s" ANSI_NORMAL, sizeDelta > 0 ? ANSI_RED : ANSI_GREEN, renderSize(sizeDelta)));
+                items.push_back(
+                    fmt("%s%+.1f KiB" ANSI_NORMAL, sizeDelta > 0 ? ANSI_RED : ANSI_GREEN, sizeDelta / 1024.0));
             logger->cout("%s%s: %s", indent, name, concatStringsSep(", ", items));
         }
     }

src/nix/path-info.cc

@@ -141,7 +141,7 @@ struct CmdPathInfo : StorePathsCommand, MixJSON
     void printSize(std::ostream & str, uint64_t value)
     {
         if (humanReadable)
-            str << fmt("\t%s", renderSize((int64_t) value, true));
+            str << fmt("\t%s", renderSize(value, true));
         else
             str << fmt("\t%11d", value);
     }