maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* `nix-instantiate ... --arg NAME VALUE': allow arguments to be passed

Browse source 
to functions from the command line.
* nix-build: started removing backticks.
This commit is contained in:
Eelco Dolstra 2006-07-28 16:03:28 +00:00
parent c11839d7b2
commit 4661282fde
8 changed files with 58 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/nix-env/main.cc
View file

@ -65,7 +65,7 @@ static void loadDerivations(EvalState & state, Path nixExprPath,
string systemFilter, DrvInfos & elems)
{
getDerivations(state,
parseExprFromFile(state, absPath(nixExprPath)), "", elems);
parseExprFromFile(state, absPath(nixExprPath)), "", ATermMap(1), elems);
/* Filter out all derivations not applicable to the current
system. */
@ -119,7 +119,7 @@ static DrvInfos queryInstalled(EvalState & state, const Path & userEnv)
e = bottomupRewrite(addPos, e);
DrvInfos elems;
getDerivations(state, e, "", elems);
getDerivations(state, e, "", ATermMap(1), elems);
return elems;
}
@ -334,7 +334,7 @@ static void queryInstSources(EvalState & state,
{
Expr e2 = parseExprFromString(state, *i, absPath("."));
Expr call = makeCall(e2, e1);
getDerivations(state, call, "", elems);
getDerivations(state, call, "", ATermMap(1), elems);
}
break;
@ -390,7 +390,7 @@ static void queryInstSources(EvalState & state,
getDerivations(state,
findAlongAttrPath(state, *i,
parseExprFromFile(state, instSource.nixExprPath)),
"", elems);
"", ATermMap(1), elems);
break;
}
}