* Maintain integrity of the substitute and successor mappings when
deleting a path in the store. * Allow absolute paths in Nix expressions. * Get nix-prefetch-url to work again. * Various other fixes.
This commit is contained in:
		
							parent
							
								
									40d9eb14df
								
							
						
					
					
						commit
						ab0bc4999a
					
				
					 15 changed files with 152 additions and 199 deletions
				
			
		| 
						 | 
				
			
			@ -5,6 +5,7 @@
 | 
			
		|||
#include "normalise.hh"
 | 
			
		||||
#include "shared.hh"
 | 
			
		||||
#include "eval.hh"
 | 
			
		||||
#include "parser.hh"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#if 0
 | 
			
		||||
| 
						 | 
				
			
			@ -29,9 +30,9 @@ static Path searchPath(const Paths & searchDirs, const Path & relPath)
 | 
			
		|||
static Expr evalStdin(EvalState & state)
 | 
			
		||||
{
 | 
			
		||||
    startNest(nest, lvlTalkative, format("evaluating standard input"));
 | 
			
		||||
    Expr e = ATreadFromFile(stdin);
 | 
			
		||||
    if (!e) 
 | 
			
		||||
        throw Error(format("unable to read a term from stdin"));
 | 
			
		||||
    string s, s2;
 | 
			
		||||
    while (getline(cin, s2)) s += s2 + "\n";
 | 
			
		||||
    Expr e = parseExprFromString(s, absPath("."));
 | 
			
		||||
    return evalExpr(state, e);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue