diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2006-10-16 15:55:34 +0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2006-10-16 15:55:34 +0000 |
| commit | d7efd7639420f4c840cbfdfcbbb3c45292f3ac54 (patch) | |
| tree | d48871893e6d3446b6298b0e5e612086233e3947 /src/nix-instantiate/main.cc | |
| parent | 4c9aa821b985b8e334790a03497a56af3a021f3b (diff) | |
* Big cleanup of the semantics of paths, strings, contexts, string
concatenation and string coercion. This was a big mess (see
e.g. NIX-67). Contexts are now folded into strings, so that they
don't cause evaluation errors when they're not expected. The
semantics of paths has been clarified (see nixexpr-ast.def).
toString() and coerceToString() have been merged.
Semantic change: paths are now copied to the store when they're in a
concatenation (and in most other situations - that's the
formalisation of the meaning of a path). So
"foo " + ./bla
evaluates to "foo /nix/store/hash...-bla", not "foo
/path/to/current-dir/bla". This prevents accidental impurities, and
is more consistent with the treatment of derivation outputs, e.g.,
`"foo " + bla' where `bla' is a derivation. (Here `bla' would be
replaced by the output path of `bla'.)
Diffstat (limited to 'src/nix-instantiate/main.cc')
| -rw-r--r-- | src/nix-instantiate/main.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nix-instantiate/main.cc b/src/nix-instantiate/main.cc index 93b7c03be..3eb6d3031 100644 --- a/src/nix-instantiate/main.cc +++ b/src/nix-instantiate/main.cc @@ -41,7 +41,7 @@ static bool indirectRoot = false; static void printResult(EvalState & state, Expr e, bool evalOnly, bool xmlOutput, const ATermMap & autoArgs) { - ATermList context; + PathSet context; if (evalOnly) if (xmlOutput) |