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

* Pass various options to the worker so that flags like -K or -j work

Browse source 
in multi-user Nix (NIX-72).
* Client/worker: exchange a protocol version number for future
  compatibility.
This commit is contained in:
Eelco Dolstra 2007-09-18 09:11:20 +00:00
parent 26f981c2e5
commit f3441e6122
5 changed files with 49 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libexpr/primops.cc
View file

@ -773,7 +773,6 @@ static Expr prim_listToAttrs(EvalState & state, const ATermVector & args)
if (matchAttrs(evaledExpr, attrs)){
Expr e = evalExpr(state, makeSelect(evaledExpr, toATerm("attr")));
string attr = evalStringNoCtx(state,e);
ATerm value;
Expr r = makeSelect(evaledExpr, toATerm("value"));
res.set(toATerm(attr), makeAttrRHS(r, makeNoPos()));
}
@ -783,7 +782,7 @@ static Expr prim_listToAttrs(EvalState & state, const ATermVector & args)
} // for
return makeAttrs(res);
} catch (Error & e) {
e.addPrefix(format("while calling listToAttrs "));
e.addPrefix(format("in `listToAttrs':\n"));
throw;
}
}