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

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

Browse source
This commit is contained in:
Eelco Dolstra 2019-12-11 14:53:30 +01:00
commit ecb3a1afa2
119 changed files with 3905 additions and 2250 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libexpr/eval.hh
View file

@ -17,6 +17,7 @@ namespace nix {
class Store;
class EvalState;
struct StorePath;
enum RepairFlag : bool;
namespace flake {
@ -46,14 +47,14 @@ struct Env
};
Value & mkString(Value & v, const string & s, const PathSet & context = PathSet());
Value & mkString(Value & v, std::string_view s, const PathSet & context = PathSet());
void copyContext(const Value & v, PathSet & context);
/* Cache for calls to addToStore(); maps source paths to the store
paths. */
typedef std::map<Path, Path> SrcToStore;
typedef std::map<Path, StorePath> SrcToStore;
std::ostream & operator << (std::ostream & str, const Value & v);