diff options
author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2006-07-28 16:03:28 +0000 |
---|---|---|
committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2006-07-28 16:03:28 +0000 |
commit | 4661282fde9f37780877fbeeb34b06b0c221e6bf (patch) | |
tree | 234537580ad8a9f51b0738cd990aa35c31247b54 /src/nix-env/main.cc | |
parent | c11839d7b24993f9639d59f9fa3420e8ccc22e02 (diff) |
* `nix-instantiate ... --arg NAME VALUE': allow arguments to be passed
to functions from the command line.
* nix-build: started removing backticks.
Diffstat (limited to 'src/nix-env/main.cc')
-rw-r--r-- | src/nix-env/main.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nix-env/main.cc b/src/nix-env/main.cc index 3fcaaff42..0eb3fe4d3 100644 --- a/src/nix-env/main.cc +++ b/src/nix-env/main.cc @@ -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; } } |