diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-11-16T12·49+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-11-16T12·49+0000 |
| commit | fb9368b5a0b2457b28f19d4902bc0790123338a2 (patch) | |
| tree | 8e0d68ccc2951c44cfd442b3dad261e190127013 /src/nix-instantiate/nix-instantiate.cc | |
| parent | 64fd29855a8ae49cacdaff424679821b4fd3bf57 (diff) | |
| parent | 4aced7f8d0d5d2c1057b0f46a70a37a577f81fa5 (diff) | |
* Sync with the trunk.
Diffstat (limited to 'src/nix-instantiate/nix-instantiate.cc')
| -rw-r--r-- | src/nix-instantiate/nix-instantiate.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nix-instantiate/nix-instantiate.cc b/src/nix-instantiate/nix-instantiate.cc index 38c62880b88f..3d3b643cfd6e 100644 --- a/src/nix-instantiate/nix-instantiate.cc +++ b/src/nix-instantiate/nix-instantiate.cc @@ -1,6 +1,3 @@ -#include <map> -#include <iostream> - #include "globals.hh" #include "shared.hh" #include "eval.hh" @@ -13,6 +10,9 @@ #include "common-opts.hh" #include "help.txt.hh" +#include <map> +#include <iostream> + using namespace nix; @@ -38,7 +38,7 @@ static bool indirectRoot = false; void processExpr(EvalState & state, const Strings & attrPaths, - bool parseOnly, bool strict, const Bindings & autoArgs, + bool parseOnly, bool strict, Bindings & autoArgs, bool evalOnly, bool xmlOutput, bool location, Expr * e) { if (parseOnly) |