wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 05:21:16 +02:00
Code Activity

Merge remote-tracking branch 'origin/master' into source-path

Browse source
This commit is contained in:
Eelco Dolstra 2023-04-24 13:20:36 +02:00
commit 01232358ff
101 changed files with 1785 additions and 834 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libexpr/value.hh
View file

@ -101,7 +101,7 @@ class ExternalValueBase
* Coerce the value to a string. Defaults to uncoercable, i.e. throws an
* error.
*/
virtual std::string coerceToString(const Pos & pos, PathSet & context, bool copyMore, bool copyToStore) const;
virtual std::string coerceToString(const Pos & pos, NixStringContext & context, bool copyMore, bool copyToStore) const;
/**
* Compare to another value of the same type. Defaults to uncomparable,
@ -113,13 +113,13 @@ class ExternalValueBase
* Print the value as JSON. Defaults to unconvertable, i.e. throws an error
*/
virtual nlohmann::json printValueAsJSON(EvalState & state, bool strict,
PathSet & context, bool copyToStore = true) const;
NixStringContext & context, bool copyToStore = true) const;
/**
* Print the value as XML. Defaults to unevaluated
*/
virtual void printValueAsXML(EvalState & state, bool strict, bool location,
XMLWriter & doc, PathSet & context, PathSet & drvsSeen,
XMLWriter & doc, NixStringContext & context, PathSet & drvsSeen,
const PosIdx pos) const;
virtual ~ExternalValueBase()
@ -269,9 +269,9 @@ public:
void mkString(std::string_view s);
void mkString(std::string_view s, const PathSet & context);
void mkString(std::string_view s, const NixStringContext & context);
void mkStringMove(const char * s, const PathSet & context);
void mkStringMove(const char * s, const NixStringContext & context);
inline void mkString(const Symbol & s)
{
@ -400,8 +400,6 @@ public:
*/
bool isTrivial() const;
NixStringContext getContext(const Store &);
auto listItems()
{
struct ListIterable