lix-project/lix
20
55
Fork 31
Code Issues 345 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge remote-tracking branch 'shlevy/baseNameOf-no-copy'

Browse source 
baseNameOf: Don't copy paths to the store first
This commit is contained in:
Shea Levy 2015-01-29 03:29:09 -05:00
parent de91a42c6e c9bd6a1de4
commit 73bf32ce94
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/primops.cc
View file

@ -710,7 +710,7 @@ static void prim_pathExists(EvalState & state, const Pos & pos, Value * * args,
static void prim_baseNameOf(EvalState & state, const Pos & pos, Value * * args, Value & v) static void prim_baseNameOf(EvalState & state, const Pos & pos, Value * * args, Value & v)
{ {
PathSet context; PathSet context;
mkString(v, baseNameOf(state.coerceToString(pos, *args[0], context)), context); mkString(v, baseNameOf(state.coerceToString(pos, *args[0], context, false, false)), context);
} }

2
tests/lang/eval-okay-context.nix
View file

@ -1,4 +1,4 @@
let s = "foo ${builtins.substring 33 100 (baseNameOf ./eval-okay-context.nix)} bar"; let s = "foo ${builtins.substring 33 100 (baseNameOf "${./eval-okay-context.nix}")} bar";
in in
if s != "foo eval-okay-context.nix bar" if s != "foo eval-okay-context.nix bar"
then abort "context not discarded" then abort "context not discarded"