diff options
Diffstat (limited to 'third_party/nix/src/libexpr')
26 files changed, 50 insertions, 12 deletions
diff --git a/third_party/nix/src/libexpr/attr-path.cc b/third_party/nix/src/libexpr/attr-path.cc index 4eb44ec3357d..584f49d124ef 100644 --- a/third_party/nix/src/libexpr/attr-path.cc +++ b/third_party/nix/src/libexpr/attr-path.cc @@ -1,4 +1,5 @@ #include "attr-path.hh" + #include "eval-inline.hh" #include "util.hh" diff --git a/third_party/nix/src/libexpr/attr-path.hh b/third_party/nix/src/libexpr/attr-path.hh index 9c38cdde049f..6b22df622486 100644 --- a/third_party/nix/src/libexpr/attr-path.hh +++ b/third_party/nix/src/libexpr/attr-path.hh @@ -2,6 +2,7 @@ #include <map> #include <string> + #include "eval.hh" namespace nix { diff --git a/third_party/nix/src/libexpr/attr-set.cc b/third_party/nix/src/libexpr/attr-set.cc index cdca3953e653..d5bedbae434e 100644 --- a/third_party/nix/src/libexpr/attr-set.cc +++ b/third_party/nix/src/libexpr/attr-set.cc @@ -1,5 +1,7 @@ #include "attr-set.hh" + #include <algorithm> + #include "eval-inline.hh" namespace nix { diff --git a/third_party/nix/src/libexpr/attr-set.hh b/third_party/nix/src/libexpr/attr-set.hh index f56261ad6a5a..e5a888d7e981 100644 --- a/third_party/nix/src/libexpr/attr-set.hh +++ b/third_party/nix/src/libexpr/attr-set.hh @@ -1,6 +1,7 @@ #pragma once #include <algorithm> + #include "nixexpr.hh" #include "symbol-table.hh" diff --git a/third_party/nix/src/libexpr/common-eval-args.cc b/third_party/nix/src/libexpr/common-eval-args.cc index 1e2fe891f544..8cd4bc56e592 100644 --- a/third_party/nix/src/libexpr/common-eval-args.cc +++ b/third_party/nix/src/libexpr/common-eval-args.cc @@ -1,4 +1,5 @@ #include "common-eval-args.hh" + #include "download.hh" #include "eval.hh" #include "shared.hh" diff --git a/third_party/nix/src/libexpr/eval.cc b/third_party/nix/src/libexpr/eval.cc index f33735cc585d..2a9e18db2802 100644 --- a/third_party/nix/src/libexpr/eval.cc +++ b/third_party/nix/src/libexpr/eval.cc @@ -1,13 +1,16 @@ #include "eval.hh" -#include <glog/logging.h> -#include <sys/resource.h> -#include <sys/time.h> -#include <unistd.h> + #include <algorithm> #include <chrono> #include <cstring> #include <fstream> #include <iostream> + +#include <glog/logging.h> +#include <sys/resource.h> +#include <sys/time.h> +#include <unistd.h> + #include "derivations.hh" #include "download.hh" #include "eval-inline.hh" diff --git a/third_party/nix/src/libexpr/eval.hh b/third_party/nix/src/libexpr/eval.hh index 74777e48fa95..b50142926bff 100644 --- a/third_party/nix/src/libexpr/eval.hh +++ b/third_party/nix/src/libexpr/eval.hh @@ -3,6 +3,7 @@ #include <map> #include <optional> #include <unordered_map> + #include "attr-set.hh" #include "config.hh" #include "hash.hh" diff --git a/third_party/nix/src/libexpr/function-trace.cc b/third_party/nix/src/libexpr/function-trace.cc index 4f164e6c4498..8b0d60fab8be 100644 --- a/third_party/nix/src/libexpr/function-trace.cc +++ b/third_party/nix/src/libexpr/function-trace.cc @@ -1,4 +1,5 @@ #include "function-trace.hh" + #include <glog/logging.h> namespace nix { diff --git a/third_party/nix/src/libexpr/function-trace.hh b/third_party/nix/src/libexpr/function-trace.hh index bd27b8aebc7c..93d70862eda1 100644 --- a/third_party/nix/src/libexpr/function-trace.hh +++ b/third_party/nix/src/libexpr/function-trace.hh @@ -1,6 +1,7 @@ #pragma once #include <chrono> + #include "eval.hh" namespace nix { diff --git a/third_party/nix/src/libexpr/get-drvs.cc b/third_party/nix/src/libexpr/get-drvs.cc index fdf3494ed26a..77b6ee2014e9 100644 --- a/third_party/nix/src/libexpr/get-drvs.cc +++ b/third_party/nix/src/libexpr/get-drvs.cc @@ -1,7 +1,10 @@ #include "get-drvs.hh" -#include <glog/logging.h> + #include <cstring> #include <regex> + +#include <glog/logging.h> + #include "derivations.hh" #include "eval-inline.hh" #include "util.hh" diff --git a/third_party/nix/src/libexpr/get-drvs.hh b/third_party/nix/src/libexpr/get-drvs.hh index 0dca12cafc4e..deb0a6d647a9 100644 --- a/third_party/nix/src/libexpr/get-drvs.hh +++ b/third_party/nix/src/libexpr/get-drvs.hh @@ -2,6 +2,7 @@ #include <map> #include <string> + #include "eval.hh" namespace nix { diff --git a/third_party/nix/src/libexpr/json-to-value.cc b/third_party/nix/src/libexpr/json-to-value.cc index 8615d9797fa8..a6c12fd8244c 100644 --- a/third_party/nix/src/libexpr/json-to-value.cc +++ b/third_party/nix/src/libexpr/json-to-value.cc @@ -1,4 +1,5 @@ #include "json-to-value.hh" + #include <cstring> namespace nix { diff --git a/third_party/nix/src/libexpr/json-to-value.hh b/third_party/nix/src/libexpr/json-to-value.hh index eb555c643fab..5b67b350646e 100644 --- a/third_party/nix/src/libexpr/json-to-value.hh +++ b/third_party/nix/src/libexpr/json-to-value.hh @@ -1,6 +1,7 @@ #pragma once #include <string> + #include "eval.hh" namespace nix { diff --git a/third_party/nix/src/libexpr/names.cc b/third_party/nix/src/libexpr/names.cc index c3dd2a9bd1ed..8e198f0925ca 100644 --- a/third_party/nix/src/libexpr/names.cc +++ b/third_party/nix/src/libexpr/names.cc @@ -1,4 +1,5 @@ #include "names.hh" + #include "util.hh" namespace nix { diff --git a/third_party/nix/src/libexpr/names.hh b/third_party/nix/src/libexpr/names.hh index 219a595d15e2..bd2aa1a11552 100644 --- a/third_party/nix/src/libexpr/names.hh +++ b/third_party/nix/src/libexpr/names.hh @@ -2,6 +2,7 @@ #include <memory> #include <regex> + #include "types.hh" namespace nix { diff --git a/third_party/nix/src/libexpr/nixexpr.cc b/third_party/nix/src/libexpr/nixexpr.cc index 4147cbbf532b..8f1dbbb6db05 100644 --- a/third_party/nix/src/libexpr/nixexpr.cc +++ b/third_party/nix/src/libexpr/nixexpr.cc @@ -1,5 +1,7 @@ #include "nixexpr.hh" + #include <cstdlib> + #include "derivations.hh" #include "util.hh" diff --git a/third_party/nix/src/libexpr/nixexpr.hh b/third_party/nix/src/libexpr/nixexpr.hh index efc4398c2371..349e633ede73 100644 --- a/third_party/nix/src/libexpr/nixexpr.hh +++ b/third_party/nix/src/libexpr/nixexpr.hh @@ -1,6 +1,7 @@ #pragma once #include <map> + #include "symbol-table.hh" #include "value.hh" diff --git a/third_party/nix/src/libexpr/primops.cc b/third_party/nix/src/libexpr/primops.cc index 23eaba57972d..e7778ed32a1c 100644 --- a/third_party/nix/src/libexpr/primops.cc +++ b/third_party/nix/src/libexpr/primops.cc @@ -1,12 +1,15 @@ #include "primops.hh" + +#include <algorithm> +#include <cstring> +#include <regex> + #include <dlfcn.h> #include <glog/logging.h> #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> -#include <algorithm> -#include <cstring> -#include <regex> + #include "archive.hh" #include "derivations.hh" #include "download.hh" diff --git a/third_party/nix/src/libexpr/primops.hh b/third_party/nix/src/libexpr/primops.hh index 60326323b2e0..8e674509c7c4 100644 --- a/third_party/nix/src/libexpr/primops.hh +++ b/third_party/nix/src/libexpr/primops.hh @@ -1,5 +1,6 @@ #include <tuple> #include <vector> + #include "eval.hh" namespace nix { diff --git a/third_party/nix/src/libexpr/primops/fetchGit.cc b/third_party/nix/src/libexpr/primops/fetchGit.cc index 21994db07616..b707202c9085 100644 --- a/third_party/nix/src/libexpr/primops/fetchGit.cc +++ b/third_party/nix/src/libexpr/primops/fetchGit.cc @@ -1,7 +1,9 @@ -#include <glog/logging.h> -#include <sys/time.h> #include <nlohmann/json.hpp> #include <regex> + +#include <glog/logging.h> +#include <sys/time.h> + #include "download.hh" #include "eval-inline.hh" #include "hash.hh" diff --git a/third_party/nix/src/libexpr/primops/fetchMercurial.cc b/third_party/nix/src/libexpr/primops/fetchMercurial.cc index 17fdb2b31897..dad2d597ecc7 100644 --- a/third_party/nix/src/libexpr/primops/fetchMercurial.cc +++ b/third_party/nix/src/libexpr/primops/fetchMercurial.cc @@ -1,7 +1,9 @@ -#include <glog/logging.h> -#include <sys/time.h> #include <nlohmann/json.hpp> #include <regex> + +#include <glog/logging.h> +#include <sys/time.h> + #include "download.hh" #include "eval-inline.hh" #include "pathlocks.hh" diff --git a/third_party/nix/src/libexpr/symbol-table.hh b/third_party/nix/src/libexpr/symbol-table.hh index 932bff5b46fb..61a43ab978f4 100644 --- a/third_party/nix/src/libexpr/symbol-table.hh +++ b/third_party/nix/src/libexpr/symbol-table.hh @@ -2,6 +2,7 @@ #include <map> #include <unordered_set> + #include "types.hh" namespace nix { diff --git a/third_party/nix/src/libexpr/value-to-json.cc b/third_party/nix/src/libexpr/value-to-json.cc index d96575e734dc..e9a39b8aaad6 100644 --- a/third_party/nix/src/libexpr/value-to-json.cc +++ b/third_party/nix/src/libexpr/value-to-json.cc @@ -1,6 +1,8 @@ #include "value-to-json.hh" + #include <cstdlib> #include <iomanip> + #include "eval-inline.hh" #include "json.hh" #include "util.hh" diff --git a/third_party/nix/src/libexpr/value-to-json.hh b/third_party/nix/src/libexpr/value-to-json.hh index 62708e4751dd..6ec36c829d37 100644 --- a/third_party/nix/src/libexpr/value-to-json.hh +++ b/third_party/nix/src/libexpr/value-to-json.hh @@ -2,6 +2,7 @@ #include <map> #include <string> + #include "eval.hh" #include "nixexpr.hh" diff --git a/third_party/nix/src/libexpr/value-to-xml.cc b/third_party/nix/src/libexpr/value-to-xml.cc index d9fddaafbbec..80c4adb78ff9 100644 --- a/third_party/nix/src/libexpr/value-to-xml.cc +++ b/third_party/nix/src/libexpr/value-to-xml.cc @@ -1,5 +1,7 @@ #include "value-to-xml.hh" + #include <cstdlib> + #include "eval-inline.hh" #include "util.hh" #include "xml-writer.hh" diff --git a/third_party/nix/src/libexpr/value-to-xml.hh b/third_party/nix/src/libexpr/value-to-xml.hh index e456b4921b24..e7749dd7ae30 100644 --- a/third_party/nix/src/libexpr/value-to-xml.hh +++ b/third_party/nix/src/libexpr/value-to-xml.hh @@ -2,6 +2,7 @@ #include <map> #include <string> + #include "eval.hh" #include "nixexpr.hh" |