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

a few merge fixes

Browse source
This commit is contained in:
Ben Burdette 2022-02-04 17:35:56 -07:00
parent dbe3fd3735
commit 195db83148
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libexpr/eval.hh
View file

@ -195,7 +195,7 @@ public:
Expr * parseExprFromFile(const Path & path, std::shared_ptr<StaticEnv> & staticEnv);
/* Parse a Nix expression from the specified string. */
Expr * parseExprFromString(std::string s, const Path & basePath, , std::shared_ptr<StaticEnv> & staticEnv);
Expr * parseExprFromString(std::string s, const Path & basePath, std::shared_ptr<StaticEnv> & staticEnv);
Expr * parseExprFromString(std::string s, const Path & basePath);
Expr * parseStdin();
@ -331,7 +331,7 @@ private:
friend struct ExprLet;
Expr * parse(char * text, size_t length, FileOrigin origin, const PathView path,
const Path & basePath, std::shared_ptr<StaticEnv> & staticEnv);
const PathView basePath, std::shared_ptr<StaticEnv> & staticEnv);
public: