Merge remote-tracking branch 'origin/master' into flakes

This commit is contained in:
Eelco Dolstra
2019-11-04 22:29:31 +01:00
39 changed files with 995 additions and 923 deletions
+4
View File
@@ -9,6 +9,7 @@
#include "function-trace.hh"
#include <map>
#include <optional>
#include <unordered_map>
@@ -207,6 +208,9 @@ public:
set with attribute `type = "derivation"'). */
bool isDerivation(Value & v);
std::optional<string> tryAttrsToString(const Pos & pos, Value & v,
PathSet & context, bool coerceMore = false, bool copyToStore = true);
/* String coercion. Converts strings, paths and derivations to a
string. If `coerceMore' is set, also converts nulls, integers,
booleans and lists to a string. If `copyToStore' is set,