diff options
| -rw-r--r-- | src/libexpr/attr-path.hh | 4 | ||||
| -rw-r--r-- | src/libexpr/eval.hh | 4 | ||||
| -rw-r--r-- | src/libexpr/get-drvs.hh | 4 | ||||
| -rw-r--r-- | src/libexpr/nixexpr.hh | 4 | ||||
| -rw-r--r-- | src/libexpr/parser.y | 10 | ||||
| -rw-r--r-- | src/libexpr/primops.cc | 2 | ||||
| -rw-r--r-- | src/libexpr/value-to-xml.hh | 6 | ||||
| -rw-r--r-- | src/libstore/store-api.hh | 6 | ||||
| -rw-r--r-- | src/libutil/types.hh | 2 | ||||
| -rw-r--r-- | src/nix-hash/nix-hash.cc | 4 | ||||
| -rw-r--r-- | src/nix-instantiate/nix-instantiate.cc | 6 | ||||
| -rw-r--r-- | src/nix-store/nix-store.cc | 6 |
12 files changed, 29 insertions, 29 deletions
diff --git a/src/libexpr/attr-path.hh b/src/libexpr/attr-path.hh index 33587e5ed..b4f5c29d2 100644 --- a/src/libexpr/attr-path.hh +++ b/src/libexpr/attr-path.hh @@ -1,11 +1,11 @@ #ifndef __ATTR_PATH_H #define __ATTR_PATH_H +#include "eval.hh" + #include <string> #include <map> -#include "eval.hh" - namespace nix { diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh index 8eec94fcb..501ac93d0 100644 --- a/src/libexpr/eval.hh +++ b/src/libexpr/eval.hh @@ -1,12 +1,12 @@ #ifndef __EVAL_H #define __EVAL_H -#include <map> - #include "nixexpr.hh" #include "symbol-table.hh" #include "hash.hh" +#include <map> + namespace nix { diff --git a/src/libexpr/get-drvs.hh b/src/libexpr/get-drvs.hh index ca7d98002..7b96decf4 100644 --- a/src/libexpr/get-drvs.hh +++ b/src/libexpr/get-drvs.hh @@ -1,13 +1,13 @@ #ifndef __GET_DRVS_H #define __GET_DRVS_H +#include "eval.hh" + #include <string> #include <map> #include <boost/shared_ptr.hpp> -#include "eval.hh" - namespace nix { diff --git a/src/libexpr/nixexpr.hh b/src/libexpr/nixexpr.hh index b1043a326..1d03220f6 100644 --- a/src/libexpr/nixexpr.hh +++ b/src/libexpr/nixexpr.hh @@ -1,10 +1,10 @@ #ifndef __NIXEXPR_H #define __NIXEXPR_H -#include <map> - #include "symbol-table.hh" +#include <map> + namespace nix { diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y index 7236bab19..b0c54339b 100644 --- a/src/libexpr/parser.y +++ b/src/libexpr/parser.y @@ -15,10 +15,6 @@ stuff. So allow it to be excluded. */ #ifndef BISON_HEADER_HACK #define BISON_HEADER_HACK - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include "util.hh" @@ -28,6 +24,10 @@ #include "lexer-tab.hh" #define YYSTYPE YYSTYPE // workaround a bug in Bison 2.4 +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + using namespace nix; @@ -480,8 +480,6 @@ Expr * parseExprFromFile(EvalState & state, Path path) } /* If `path' refers to a directory, append `/default.nix'. */ - if (stat(path.c_str(), &st)) - throw SysError(format("getting status of `%1%'") % path); if (S_ISDIR(st.st_mode)) path = canonPath(path + "/default.nix"); diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index 68f66acc7..973670e68 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -1,5 +1,5 @@ -#include "misc.hh" #include "eval.hh" +#include "misc.hh" #include "globals.hh" #include "store-api.hh" #include "util.hh" diff --git a/src/libexpr/value-to-xml.hh b/src/libexpr/value-to-xml.hh index 0c6de3a8b..3ebc989ff 100644 --- a/src/libexpr/value-to-xml.hh +++ b/src/libexpr/value-to-xml.hh @@ -1,12 +1,12 @@ #ifndef __VALUE_TO_XML_H #define __VALUE_TO_XML_H -#include <string> -#include <map> - #include "nixexpr.hh" #include "eval.hh" +#include <string> +#include <map> + namespace nix { void printValueAsXML(EvalState & state, bool strict, bool location, diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh index 0590f448c..6fc0689ba 100644 --- a/src/libstore/store-api.hh +++ b/src/libstore/store-api.hh @@ -1,14 +1,14 @@ #ifndef __STOREAPI_H #define __STOREAPI_H +#include "hash.hh" +#include "serialise.hh" + #include <string> #include <map> #include <boost/shared_ptr.hpp> -#include "hash.hh" -#include "serialise.hh" - namespace nix { diff --git a/src/libutil/types.hh b/src/libutil/types.hh index f110188da..fd61746e3 100644 --- a/src/libutil/types.hh +++ b/src/libutil/types.hh @@ -1,6 +1,8 @@ #ifndef __TYPES_H #define __TYPES_H +#include "config.h" + #include <string> #include <list> #include <set> diff --git a/src/nix-hash/nix-hash.cc b/src/nix-hash/nix-hash.cc index 1282af070..f268e4986 100644 --- a/src/nix-hash/nix-hash.cc +++ b/src/nix-hash/nix-hash.cc @@ -1,9 +1,9 @@ -#include <iostream> - #include "hash.hh" #include "shared.hh" #include "help.txt.hh" +#include <iostream> + using namespace nix; diff --git a/src/nix-instantiate/nix-instantiate.cc b/src/nix-instantiate/nix-instantiate.cc index 4d629ea1b..2925f9c5e 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; diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc index e22ef7efc..ff6538137 100644 --- a/src/nix-store/nix-store.cc +++ b/src/nix-store/nix-store.cc @@ -1,6 +1,3 @@ -#include <iostream> -#include <algorithm> - #include "globals.hh" #include "misc.hh" #include "archive.hh" @@ -11,6 +8,9 @@ #include "util.hh" #include "help.txt.hh" +#include <iostream> +#include <algorithm> + using namespace nix; using std::cin; |