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

Merge branch 'master' into make

Browse source 
Conflicts:
	src/libexpr/eval.cc
This commit is contained in:
Eelco Dolstra 2014-01-21 15:30:01 +01:00
commit 81628a6ccc
34 changed files with 473 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libexpr/primops.cc
View file

@ -582,8 +582,8 @@ static void prim_storePath(EvalState & state, Value * * args, Value & v)
if (!isInStore(path))
throw EvalError(format("path `%1%' is not in the Nix store") % path);
Path path2 = toStorePath(path);
if (!store->isValidPath(path2))
throw EvalError(format("store path `%1%' is not valid") % path2);
if (!settings.readOnlyMode)
store->ensurePath(path2);
context.insert(path2);
mkString(v, path, context);
}
@ -1242,7 +1242,7 @@ void EvalState::createBaseEnv()
language feature gets added. It's not necessary to increase it
when primops get added, because you can just use `builtins ?
primOp' to check. */
mkInt(v, 1);
mkInt(v, 2);
addConstant("__langVersion", v);
// Miscellaneous