Merge branch 'master' into ca-nar-cache

Author: Ericson2314

flake.lock

@@ -6,7 +6,7 @@
   inputs.nixpkgs-regression.url = "github:NixOS/nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2";
   inputs.nixpkgs-23-11.url = "github:NixOS/nixpkgs/a62e6edd6d5e1fa0329b8653c801147986f8d446";
   inputs.flake-compat = {
-    url = "github:edolstra/flake-compat";
+    url = "github:NixOS/flake-compat";
     flake = false;
   };
 

flake.nix

@@ -165,7 +165,6 @@ struct PathInputScheme : InputScheme
 
         // To prevent `fetchToStore()` copying the path again to Nix
         // store, pre-create an entry in the fetcher cache.
-        auto info = store.queryPathInfo(*storePath);
         accessor->fingerprint =
             fmt("path:%s", store.queryPathInfo(*storePath)->narHash.to_string(HashFormat::SRI, true));
         settings.getCache()->upsert(

src/libfetchers/path.cc

@@ -377,6 +377,7 @@ TEST_F(nix_api_store_test, nix_api_load_flake_with_flags)
     assert_ctx_ok();
     ASSERT_EQ("Claire", helloStr);
 
+    nix_locked_flake_free(lockedFlake);
     nix_flake_reference_parse_flags_free(parseFlags);
     nix_flake_lock_flags_free(lockFlags);
     nix_flake_reference_free(flakeReference);

src/libflake-tests/nix_api_flake.cc

@@ -0,0 +1,48 @@
+#include "nix/store/build/build-log.hh"
+
+namespace nix {
+
+BuildLog::BuildLog(size_t maxTailLines, std::unique_ptr<Activity> act)
+    : maxTailLines(maxTailLines)
+    , act(std::move(act))
+{
+}
+
+void BuildLog::operator()(std::string_view data)
+{
+    for (auto c : data)
+        if (c == '\r')
+            currentLogLinePos = 0;
+        else if (c == '\n')
+            flushLine();
+        else {
+            if (currentLogLinePos >= currentLogLine.size())
+                currentLogLine.resize(currentLogLinePos + 1);
+            currentLogLine[currentLogLinePos++] = c;
+        }
+}
+
+void BuildLog::flush()
+{
+    if (!currentLogLine.empty())
+        flushLine();
+}
+
+void BuildLog::flushLine()
+{
+    // Truncate to actual content (currentLogLinePos may be less than size due to \r)
+    currentLogLine.resize(currentLogLinePos);
+
+    if (!handleJSONLogMessage(currentLogLine, *act, builderActivities, "the derivation builder", false)) {
+        // Line was not handled as JSON, emit and add to tail
+        act->result(resBuildLogLine, currentLogLine);
+        logTail.push_back(currentLogLine);
+        if (logTail.size() > maxTailLines)
+            logTail.pop_front();
+    }
+
+    currentLogLine.clear();
+    currentLogLinePos = 0;
+}
+
+} // namespace nix