aboutsummaryrefslogtreecommitdiff
path: root/src/libstore
diff options
context:
space:
mode:
Diffstat (limited to 'src/libstore')
-rw-r--r--src/libstore/binary-cache-store.cc1
-rw-r--r--src/libstore/build/local-derivation-goal.cc5
-rw-r--r--src/libstore/daemon.cc2
-rw-r--r--src/libstore/filetransfer.cc1
-rw-r--r--src/libstore/machines.cc2
5 files changed, 8 insertions, 3 deletions
diff --git a/src/libstore/binary-cache-store.cc b/src/libstore/binary-cache-store.cc
index e9413cf99..ea643fd31 100644
--- a/src/libstore/binary-cache-store.cc
+++ b/src/libstore/binary-cache-store.cc
@@ -16,6 +16,7 @@
#include <future>
#include <regex>
#include <fstream>
+#include <sstream>
#include <nlohmann/json.hpp>
diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc
index 479b4ffeb..99468d420 100644
--- a/src/libstore/build/local-derivation-goal.cc
+++ b/src/libstore/build/local-derivation-goal.cc
@@ -64,10 +64,13 @@ extern "C" int sandbox_init_with_parameters(const char *profile, uint64_t flags,
namespace nix {
+namespace {
/**
* The system for which Nix is compiled.
*/
-constexpr std::string_view nativeSystem = SYSTEM;
+[[gnu::unused]]
+constexpr const std::string_view nativeSystem = SYSTEM;
+}
void handleDiffHook(
uid_t uid, uid_t gid,
diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc
index 420fc8bfe..641910bd7 100644
--- a/src/libstore/daemon.cc
+++ b/src/libstore/daemon.cc
@@ -14,6 +14,8 @@
#include "derivations.hh"
#include "args.hh"
+#include <sstream>
+
namespace nix::daemon {
Sink & operator << (Sink & sink, const Logger::Fields & fields)
diff --git a/src/libstore/filetransfer.cc b/src/libstore/filetransfer.cc
index 76da8e415..fd341b2f0 100644
--- a/src/libstore/filetransfer.cc
+++ b/src/libstore/filetransfer.cc
@@ -196,7 +196,6 @@ struct curlFileTransfer : public FileTransfer
result.immutableUrl = match.str(1);
else
debug("got invalid link header '%s'", value);
- warn("foo %s", value);
}
}
}
diff --git a/src/libstore/machines.cc b/src/libstore/machines.cc
index cdd1e1c2c..833482815 100644
--- a/src/libstore/machines.cc
+++ b/src/libstore/machines.cc
@@ -140,7 +140,7 @@ static Machine parseBuilderLine(const std::string & line)
};
auto parseFloatField = [&](size_t fieldIndex) {
- const auto result = string2Int<float>(tokens[fieldIndex]);
+ const auto result = string2Float<float>(tokens[fieldIndex]);
if (!result) {
throw FormatError("bad machine specification: failed to convert column #%lu in a row: '%s' to 'float'", fieldIndex, line);
}