diff --git a/src/libexpr/include/nix/expr/eval.hh b/src/libexpr/include/nix/expr/eval.hh index b87c45ce3..76ce62b87 100644 --- a/src/libexpr/include/nix/expr/eval.hh +++ b/src/libexpr/include/nix/expr/eval.hh @@ -508,8 +508,15 @@ private: public: + /** + * @param lookupPath Only used during construction. + * @param store The store to use for instantiation + * @param fetchSettings Must outlive the lifetime of this EvalState! + * @param settings Must outlive the lifetime of this EvalState! + * @param buildStore The store to use for builds ("import from derivation", C API `nix_string_realise`) + */ EvalState( - const LookupPath & _lookupPath, + const LookupPath & lookupPath, ref store, const fetchers::Settings & fetchSettings, const EvalSettings & settings, diff --git a/src/libutil/include/nix/util/error.hh b/src/libutil/include/nix/util/error.hh index 49dd75991..cc8460592 100644 --- a/src/libutil/include/nix/util/error.hh +++ b/src/libutil/include/nix/util/error.hh @@ -193,7 +193,9 @@ public: } /** - * @param pos Nullable `shared_ptr` + * Prepends an item to the error trace, as is usual for extra context. + * + * @param pos Nullable source position to put in trace item * @param fs Format string, see `HintFmt` * @param args... Format string arguments. */ @@ -204,9 +206,11 @@ public: } /** - * @param pos Nullable `shared_ptr` + * Prepends an item to the error trace, as is usual for extra context. + * + * @param pos Nullable source position to put in trace item * @param hint Formatted error message - * @param print Optional, whether to always print (e.g. `addErrorContext`) + * @param print Optional, whether to always print (used by `addErrorContext`) */ void addTrace(std::shared_ptr && pos, HintFmt hint, TracePrint print = TracePrint::Default);