aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libexpr/eval.cc11
-rw-r--r--src/libexpr/json-to-value.cc244
-rw-r--r--src/libexpr/primops.cc2
-rw-r--r--src/libstore/build.cc38
-rw-r--r--src/libstore/derivations.cc32
-rw-r--r--src/libstore/gc.cc2
-rw-r--r--src/libstore/globals.cc1
-rw-r--r--src/libstore/nar-info.cc2
-rw-r--r--src/libstore/path.cc5
-rw-r--r--src/libstore/path.hh2
-rw-r--r--src/nix-prefetch-url/nix-prefetch-url.cc2
11 files changed, 179 insertions, 162 deletions
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 427a6f299..852e8aa11 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -566,9 +566,9 @@ LocalNoInlineNoReturn(void throwTypeError(const char * s, const ExprLambda & fun
throw TypeError(format(s) % fun.showNamePos() % s2 % pos);
}
-LocalNoInlineNoReturn(void throwAssertionError(const char * s, const Pos & pos))
+LocalNoInlineNoReturn(void throwAssertionError(const char * s, const string & s1, const Pos & pos))
{
- throw AssertionError(format(s) % pos);
+ throw AssertionError(format(s) % s1 % pos);
}
LocalNoInlineNoReturn(void throwUndefinedVarError(const char * s, const string & s1, const Pos & pos))
@@ -1302,8 +1302,11 @@ void ExprIf::eval(EvalState & state, Env & env, Value & v)
void ExprAssert::eval(EvalState & state, Env & env, Value & v)
{
- if (!state.evalBool(env, cond, pos))
- throwAssertionError("assertion failed at %1%", pos);
+ if (!state.evalBool(env, cond, pos)) {
+ std::ostringstream out;
+ cond->show(out);
+ throwAssertionError("assertion '%1%' failed at %2%", out.str(), pos);
+ }
body->eval(state, env, v);
}
diff --git a/src/libexpr/json-to-value.cc b/src/libexpr/json-to-value.cc
index 8bae986f9..1fdce1983 100644
--- a/src/libexpr/json-to-value.cc
+++ b/src/libexpr/json-to-value.cc
@@ -1,149 +1,161 @@
#include "json-to-value.hh"
-#include <cstring>
+#include <variant>
+#include <nlohmann/json.hpp>
-namespace nix {
+using json = nlohmann::json;
+using std::unique_ptr;
+namespace nix {
-static void skipWhitespace(const char * & s)
-{
- while (*s == ' ' || *s == '\t' || *s == '\n' || *s == '\r') s++;
-}
+// for more information, refer to
+// https://github.com/nlohmann/json/blob/master/include/nlohmann/detail/input/json_sax.hpp
+class JSONSax : nlohmann::json_sax<json> {
+ class JSONState {
+ protected:
+ unique_ptr<JSONState> parent;
+ Value * v;
+ public:
+ virtual unique_ptr<JSONState> resolve(EvalState &)
+ {
+ throw std::logic_error("tried to close toplevel json parser state");
+ };
+ explicit JSONState(unique_ptr<JSONState>&& p) : parent(std::move(p)), v(nullptr) {};
+ explicit JSONState(Value* v) : v(v) {};
+ JSONState(JSONState& p) = delete;
+ Value& value(EvalState & state)
+ {
+ if (v == nullptr)
+ v = state.allocValue();
+ return *v;
+ };
+ virtual ~JSONState() {};
+ virtual void add() {};
+ };
+
+ class JSONObjectState : public JSONState {
+ using JSONState::JSONState;
+ ValueMap attrs = ValueMap();
+ virtual unique_ptr<JSONState> resolve(EvalState & state) override
+ {
+ Value& v = parent->value(state);
+ state.mkAttrs(v, attrs.size());
+ for (auto & i : attrs)
+ v.attrs->push_back(Attr(i.first, i.second));
+ return std::move(parent);
+ }
+ virtual void add() override { v = nullptr; };
+ public:
+ void key(string_t& name, EvalState & state)
+ {
+ attrs[state.symbols.create(name)] = &value(state);
+ }
+ };
+
+ class JSONListState : public JSONState {
+ ValueVector values = ValueVector();
+ virtual unique_ptr<JSONState> resolve(EvalState & state) override
+ {
+ Value& v = parent->value(state);
+ state.mkList(v, values.size());
+ for (size_t n = 0; n < values.size(); ++n) {
+ v.listElems()[n] = values[n];
+ }
+ return std::move(parent);
+ }
+ virtual void add() override {
+ values.push_back(v);
+ v = nullptr;
+ };
+ public:
+ JSONListState(unique_ptr<JSONState>&& p, std::size_t reserve) : JSONState(std::move(p))
+ {
+ values.reserve(reserve);
+ }
+ };
+ EvalState & state;
+ unique_ptr<JSONState> rs;
-static string parseJSONString(const char * & s)
-{
- string res;
- if (*s++ != '"') throw JSONParseError("expected JSON string");
- while (*s != '"') {
- if (!*s) throw JSONParseError("got end-of-string in JSON string");
- if (*s == '\\') {
- s++;
- if (*s == '"') res += '"';
- else if (*s == '\\') res += '\\';
- else if (*s == '/') res += '/';
- else if (*s == '/') res += '/';
- else if (*s == 'b') res += '\b';
- else if (*s == 'f') res += '\f';
- else if (*s == 'n') res += '\n';
- else if (*s == 'r') res += '\r';
- else if (*s == 't') res += '\t';
- else if (*s == 'u') throw JSONParseError("\\u characters in JSON strings are currently not supported");
- else throw JSONParseError("invalid escaped character in JSON string");
- s++;
- } else
- res += *s++;
+ template<typename T, typename... Args> inline bool handle_value(T f, Args... args)
+ {
+ f(rs->value(state), args...);
+ rs->add();
+ return true;
}
- s++;
- return res;
-}
+public:
+ JSONSax(EvalState & state, Value & v) : state(state), rs(new JSONState(&v)) {};
-static void parseJSON(EvalState & state, const char * & s, Value & v)
-{
- skipWhitespace(s);
-
- if (!*s) throw JSONParseError("expected JSON value");
-
- if (*s == '[') {
- s++;
- ValueVector values;
- values.reserve(128);
- skipWhitespace(s);
- while (1) {
- if (values.empty() && *s == ']') break;
- Value * v2 = state.allocValue();
- parseJSON(state, s, *v2);
- values.push_back(v2);
- skipWhitespace(s);
- if (*s == ']') break;
- if (*s != ',') throw JSONParseError("expected ',' or ']' after JSON array element");
- s++;
- }
- s++;
- state.mkList(v, values.size());
- for (size_t n = 0; n < values.size(); ++n)
- v.listElems()[n] = values[n];
+ bool null()
+ {
+ return handle_value(mkNull);
}
- else if (*s == '{') {
- s++;
- ValueMap attrs;
- while (1) {
- skipWhitespace(s);
- if (attrs.empty() && *s == '}') break;
- string name = parseJSONString(s);
- skipWhitespace(s);
- if (*s != ':') throw JSONParseError("expected ':' in JSON object");
- s++;
- Value * v2 = state.allocValue();
- parseJSON(state, s, *v2);
- attrs[state.symbols.create(name)] = v2;
- skipWhitespace(s);
- if (*s == '}') break;
- if (*s != ',') throw JSONParseError("expected ',' or '}' after JSON member");
- s++;
- }
- state.mkAttrs(v, attrs.size());
- for (auto & i : attrs)
- v.attrs->push_back(Attr(i.first, i.second));
- v.attrs->sort();
- s++;
+ bool boolean(bool val)
+ {
+ return handle_value(mkBool, val);
}
- else if (*s == '"') {
- mkString(v, parseJSONString(s));
+ bool number_integer(number_integer_t val)
+ {
+ return handle_value(mkInt, val);
}
- else if (isdigit(*s) || *s == '-' || *s == '.' ) {
- // Buffer into a string first, then use built-in C++ conversions
- std::string tmp_number;
- ValueType number_type = tInt;
+ bool number_unsigned(number_unsigned_t val)
+ {
+ return handle_value(mkInt, val);
+ }
- while (isdigit(*s) || *s == '-' || *s == '.' || *s == 'e' || *s == 'E') {
- if (*s == '.' || *s == 'e' || *s == 'E')
- number_type = tFloat;
- tmp_number += *s++;
- }
+ bool number_float(number_float_t val, const string_t& s)
+ {
+ return handle_value(mkFloat, val);
+ }
- try {
- if (number_type == tFloat)
- mkFloat(v, stod(tmp_number));
- else
- mkInt(v, stol(tmp_number));
- } catch (std::invalid_argument & e) {
- throw JSONParseError("invalid JSON number");
- } catch (std::out_of_range & e) {
- throw JSONParseError("out-of-range JSON number");
- }
+ bool string(string_t& val)
+ {
+ return handle_value<void(Value&, const char*)>(mkString, val.c_str());
}
- else if (strncmp(s, "true", 4) == 0) {
- s += 4;
- mkBool(v, true);
+ bool start_object(std::size_t len)
+ {
+ rs = std::make_unique<JSONObjectState>(std::move(rs));
+ return true;
}
- else if (strncmp(s, "false", 5) == 0) {
- s += 5;
- mkBool(v, false);
+ bool key(string_t& name)
+ {
+ dynamic_cast<JSONObjectState*>(rs.get())->key(name, state);
+ return true;
}
- else if (strncmp(s, "null", 4) == 0) {
- s += 4;
- mkNull(v);
+ bool end_object() {
+ rs = rs->resolve(state);
+ rs->add();
+ return true;
}
- else throw JSONParseError("unrecognised JSON value");
-}
+ bool end_array() {
+ return end_object();
+ }
+ bool start_array(size_t len) {
+ rs = std::make_unique<JSONListState>(std::move(rs),
+ len != std::numeric_limits<size_t>::max() ? len : 128);
+ return true;
+ }
+
+ bool parse_error(std::size_t, const std::string&, const nlohmann::detail::exception& ex) {
+ throw JSONParseError(ex.what());
+ }
+};
void parseJSON(EvalState & state, const string & s_, Value & v)
{
- const char * s = s_.c_str();
- parseJSON(state, s, v);
- skipWhitespace(s);
- if (*s) throw JSONParseError(format("expected end-of-string while parsing JSON value: %1%") % s);
+ JSONSax parser(state, v);
+ bool res = json::sax_parse(s_, &parser);
+ if (!res)
+ throw JSONParseError("Invalid JSON Value");
}
-
}
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 2df9277c9..af6c91954 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -732,6 +732,8 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
the hash. */
for (auto & i : outputs) {
if (!jsonObject) drv.env[i] = "";
+ drv.outputs.insert_or_assign(i,
+ DerivationOutput(StorePath::dummy.clone(), "", ""));
}
Hash h = hashDerivationModulo(*state.store, Derivation(drv), true);
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index f1085cae1..4137c47e5 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -1017,7 +1017,7 @@ DerivationGoal::DerivationGoal(StorePath && drvPath, const StringSet & wantedOut
, buildMode(buildMode)
{
state = &DerivationGoal::getDerivation;
- name = fmt("building of '%s'", worker.store.printStorePath(drvPath));
+ name = fmt("building of '%s'", worker.store.printStorePath(this->drvPath));
trace("created");
mcExpectedBuilds = std::make_unique<MaintainCount<uint64_t>>(worker.expectedBuilds);
@@ -1042,7 +1042,7 @@ DerivationGoal::DerivationGoal(StorePath && drvPath, const BasicDerivation & drv
/* Prevent the .chroot directory from being
garbage-collected. (See isActiveTempFile() in gc.cc.) */
- worker.store.addTempRoot(drvPath);
+ worker.store.addTempRoot(this->drvPath);
}
@@ -3341,7 +3341,7 @@ void DerivationGoal::runChild()
;
}
#if __APPLE__
- else if (getEnv("_NIX_TEST_NO_SANDBOX") == "") {
+ else {
/* This has to appear before import statements. */
std::string sandboxProfile = "(version 1)\n";
@@ -3450,25 +3450,31 @@ void DerivationGoal::runChild()
/* They don't like trailing slashes on subpath directives */
if (globalTmpDir.back() == '/') globalTmpDir.pop_back();
- builder = "/usr/bin/sandbox-exec";
- args.push_back("sandbox-exec");
- args.push_back("-f");
- args.push_back(sandboxFile);
- args.push_back("-D");
- args.push_back("_GLOBAL_TMP_DIR=" + globalTmpDir);
- args.push_back("-D");
- args.push_back("IMPORT_DIR=" + settings.nixDataDir + "/nix/sandbox/");
- if (allowLocalNetworking) {
+ if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") {
+ builder = "/usr/bin/sandbox-exec";
+ args.push_back("sandbox-exec");
+ args.push_back("-f");
+ args.push_back(sandboxFile);
args.push_back("-D");
- args.push_back(string("_ALLOW_LOCAL_NETWORKING=1"));
+ args.push_back("_GLOBAL_TMP_DIR=" + globalTmpDir);
+ args.push_back("-D");
+ args.push_back("IMPORT_DIR=" + settings.nixDataDir + "/nix/sandbox/");
+ if (allowLocalNetworking) {
+ args.push_back("-D");
+ args.push_back(string("_ALLOW_LOCAL_NETWORKING=1"));
+ }
+ args.push_back(drv->builder);
+ } else {
+ builder = drv->builder.c_str();
+ args.push_back(std::string(baseNameOf(drv->builder)));
}
- args.push_back(drv->builder);
}
-#endif
+#else
else {
builder = drv->builder.c_str();
args.push_back(std::string(baseNameOf(drv->builder)));
}
+#endif
for (auto & i : drv->args)
args.push_back(rewriteStrings(i, inputRewrites));
@@ -4253,7 +4259,7 @@ SubstitutionGoal::SubstitutionGoal(StorePath && storePath, Worker & worker, Repa
, repair(repair)
{
state = &SubstitutionGoal::init;
- name = fmt("substitution of '%s'", worker.store.printStorePath(storePath));
+ name = fmt("substitution of '%s'", worker.store.printStorePath(this->storePath));
trace("created");
maintainExpectedSubstitutions = std::make_unique<MaintainCount<uint64_t>>(worker.expectedSubstitutions);
}
diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc
index 1a061149a..d9da8769c 100644
--- a/src/libstore/derivations.cc
+++ b/src/libstore/derivations.cc
@@ -246,30 +246,18 @@ string Derivation::unparse(const Store & store, bool maskOutputs,
s.reserve(65536);
s += "Derive([";
- StringSet maskedOutputs;
-
- if (maskOutputs) {
- bool first = true;
- maskedOutputs = tokenizeString<StringSet>(get(env, "outputs").value_or("out"), " ");
- for (auto & i : maskedOutputs) {
- if (first) first = false; else s += ',';
- s += '('; printString(s, i);
- s += ",\"\",\"\",\"\")";
- }
- } else {
- bool first = true;
- for (auto & i : outputs) {
- if (first) first = false; else s += ',';
- s += '('; printString(s, i.first);
- s += ','; printString(s, store.printStorePath(i.second.path));
- s += ','; printString(s, i.second.hashAlgo);
- s += ','; printString(s, i.second.hash);
- s += ')';
- }
+ bool first = true;
+ for (auto & i : outputs) {
+ if (first) first = false; else s += ',';
+ s += '('; printString(s, i.first);
+ s += ','; printString(s, maskOutputs ? "" : store.printStorePath(i.second.path));
+ s += ','; printString(s, i.second.hashAlgo);
+ s += ','; printString(s, i.second.hash);
+ s += ')';
}
s += "],[";
- bool first = true;
+ first = true;
if (actualInputs) {
for (auto & i : *actualInputs) {
if (first) first = false; else s += ',';
@@ -299,7 +287,7 @@ string Derivation::unparse(const Store & store, bool maskOutputs,
for (auto & i : env) {
if (first) first = false; else s += ',';
s += '('; printString(s, i.first);
- s += ','; printString(s, maskOutputs && maskedOutputs.count(i.first) ? "" : i.second);
+ s += ','; printString(s, maskOutputs && outputs.count(i.first) ? "" : i.second);
s += ')';
}
diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc
index ed81186af..690febc5b 100644
--- a/src/libstore/gc.cc
+++ b/src/libstore/gc.cc
@@ -443,7 +443,7 @@ void LocalStore::findRuntimeRoots(Roots & roots, bool censor)
// lsof is really slow on OS X. This actually causes the gc-concurrent.sh test to fail.
// See: https://github.com/NixOS/nix/issues/3011
// Because of this we disable lsof when running the tests.
- if (getEnv("_NIX_TEST_NO_LSOF") == "") {
+ if (getEnv("_NIX_TEST_NO_LSOF") != "1") {
try {
std::regex lsofRegex(R"(^n(/.*)$)");
auto lsofLines =
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc
index 5f1ae5ab5..a8945996e 100644
--- a/src/libstore/globals.cc
+++ b/src/libstore/globals.cc
@@ -7,6 +7,7 @@
#include <map>
#include <thread>
#include <dlfcn.h>
+#include <sys/utsname.h>
namespace nix {
diff --git a/src/libstore/nar-info.cc b/src/libstore/nar-info.cc
index fb02cf3fd..1375094b5 100644
--- a/src/libstore/nar-info.cc
+++ b/src/libstore/nar-info.cc
@@ -4,7 +4,7 @@
namespace nix {
NarInfo::NarInfo(const Store & store, const std::string & s, const std::string & whence)
- : ValidPathInfo(StorePath::make((unsigned char *) "xxxxxxxxxxxxxxxxxxxx", "x")) // FIXME: hack
+ : ValidPathInfo(StorePath::dummy.clone()) // FIXME: hack
{
auto corrupt = [&]() {
throw Error(format("NAR info file '%1%' is corrupt") % whence);
diff --git a/src/libstore/path.cc b/src/libstore/path.cc
index cda5f9968..a33bec3ed 100644
--- a/src/libstore/path.cc
+++ b/src/libstore/path.cc
@@ -46,12 +46,15 @@ std::string_view StorePath::name() const
return ffi_StorePath_name(*this);
}
+StorePath StorePath::dummy(
+ StorePath::make(
+ (unsigned char *) "xxxxxxxxxxxxxxxxxxxx", "x"));
+
StorePath Store::parseStorePath(std::string_view path) const
{
return StorePath::make(path, storeDir);
}
-
StorePathSet Store::parseStorePathSet(const PathSet & paths) const
{
StorePathSet res;
diff --git a/src/libstore/path.hh b/src/libstore/path.hh
index 5ebb57480..6b29c3566 100644
--- a/src/libstore/path.hh
+++ b/src/libstore/path.hh
@@ -53,6 +53,8 @@ struct StorePath : rust::Value<3 * sizeof(void *) + 24, ffi_StorePath_drop>
{
return ffi_StorePath_hash_data(*this);
}
+
+ static StorePath dummy;
};
typedef std::set<StorePath> StorePathSet;
diff --git a/src/nix-prefetch-url/nix-prefetch-url.cc b/src/nix-prefetch-url/nix-prefetch-url.cc
index 2ec0b07ac..cc0891811 100644
--- a/src/nix-prefetch-url/nix-prefetch-url.cc
+++ b/src/nix-prefetch-url/nix-prefetch-url.cc
@@ -53,7 +53,7 @@ static int _main(int argc, char * * argv)
{
HashType ht = htSHA256;
std::vector<string> args;
- bool printPath = getEnv("PRINT_PATH") != "";
+ bool printPath = getEnv("PRINT_PATH") == "1";
bool fromExpr = false;
string attrPath;
bool unpack = false;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 05:12:22 +0000