Rename nixPath to __nixPath
The name ‘nixPath’ breaks existing code.
This commit is contained in:
		
							parent
							
								
									2ea2703fe9
								
							
						
					
					
						commit
						3d221a7bb1
					
				
					 3 changed files with 7 additions and 7 deletions
				
			
		|  | @ -388,7 +388,7 @@ expr_simple | |||
|       string path($1 + 1, strlen($1) - 2); | ||||
|       $$ = new ExprApp(CUR_POS, | ||||
|           new ExprApp(new ExprVar(data->symbols.create("__findFile")), | ||||
|               new ExprVar(data->symbols.create("nixPath"))), | ||||
|               new ExprVar(data->symbols.create("__nixPath"))), | ||||
|           new ExprString(data->symbols.create(path))); | ||||
|   } | ||||
|   | URI { $$ = new ExprString(data->symbols.create($1)); } | ||||
|  |  | |||
|  | @ -710,7 +710,7 @@ static void prim_readFile(EvalState & state, const Pos & pos, Value * * args, Va | |||
| 
 | ||||
| 
 | ||||
| /* Find a file in the Nix search path. Used to implement <x> paths,
 | ||||
|    which are desugared to ‘findFile nixPath "x"’. */ | ||||
|    which are desugared to ‘findFile __nixPath "x"’. */ | ||||
| static void prim_findFile(EvalState & state, const Pos & pos, Value * * args, Value & v) | ||||
| { | ||||
|     state.forceList(*args[0], pos); | ||||
|  | @ -1472,7 +1472,7 @@ void EvalState::createBaseEnv() | |||
|         mkString(*allocAttr(*v2, symbols.create("prefix")), i.first); | ||||
|         v2->attrs->sort(); | ||||
|     } | ||||
|     addConstant("nixPath", v); | ||||
|     addConstant("__nixPath", v); | ||||
| 
 | ||||
|     /* Now that we've added all primops, sort the `builtins' set,
 | ||||
|        because attribute lookups expect it to be sorted. */ | ||||
|  |  | |||
|  | @ -3,9 +3,9 @@ with builtins; | |||
| 
 | ||||
| assert pathExists <nix/buildenv.nix>; | ||||
| 
 | ||||
| assert length nixPath == 6; | ||||
| assert length (filter (x: x.prefix == "nix") nixPath) == 1; | ||||
| assert length (filter (x: baseNameOf x.path == "dir4") nixPath) == 1; | ||||
| assert length __nixPath == 6; | ||||
| assert length (filter (x: x.prefix == "nix") __nixPath) == 1; | ||||
| assert length (filter (x: baseNameOf x.path == "dir4") __nixPath) == 1; | ||||
| 
 | ||||
| import <a.nix> + import <b.nix> + import <c.nix> + import <dir5/c.nix> | ||||
|   + (let nixPath = [ { path = ./dir2; } { path = ./dir1; } ]; in import <a.nix>) | ||||
|   + (let __nixPath = [ { path = ./dir2; } { path = ./dir1; } ]; in import <a.nix>) | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue