From 3652326ed281f5f753423acef51103fb8df62a6d Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 27 May 2020 21:56:34 +0100 Subject: refactor(3p/nix): Anchor local includes at src/ Previously all includes were anchored in one global mess of header files. This moves the includes into filesystem "namespaces" (if you will) for each sub-package of Nix. Note: This commit does not introduce the relevant build system changes. --- third_party/nix/src/libexpr/primops/context.cc | 6 +++--- third_party/nix/src/libexpr/primops/fetchGit.cc | 12 ++++++------ third_party/nix/src/libexpr/primops/fetchMercurial.cc | 10 +++++----- third_party/nix/src/libexpr/primops/fromTOML.cc | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) (limited to 'third_party/nix/src/libexpr/primops') diff --git a/third_party/nix/src/libexpr/primops/context.cc b/third_party/nix/src/libexpr/primops/context.cc index 481a2910bf84..3a39e03eabc7 100644 --- a/third_party/nix/src/libexpr/primops/context.cc +++ b/third_party/nix/src/libexpr/primops/context.cc @@ -1,6 +1,6 @@ -#include "derivations.hh" -#include "eval-inline.hh" -#include "primops.hh" +#include "libexpr/eval-inline.hh" +#include "libexpr/primops.hh" +#include "libstore/derivations.hh" namespace nix { diff --git a/third_party/nix/src/libexpr/primops/fetchGit.cc b/third_party/nix/src/libexpr/primops/fetchGit.cc index 2cfdefe7abfd..7262a291559f 100644 --- a/third_party/nix/src/libexpr/primops/fetchGit.cc +++ b/third_party/nix/src/libexpr/primops/fetchGit.cc @@ -7,12 +7,12 @@ #include #include -#include "download.hh" -#include "eval-inline.hh" -#include "hash.hh" -#include "pathlocks.hh" -#include "primops.hh" -#include "store-api.hh" +#include "libexpr/eval-inline.hh" +#include "libexpr/primops.hh" +#include "libstore/download.hh" +#include "libstore/pathlocks.hh" +#include "libstore/store-api.hh" +#include "libutil/hash.hh" using namespace std::string_literals; diff --git a/third_party/nix/src/libexpr/primops/fetchMercurial.cc b/third_party/nix/src/libexpr/primops/fetchMercurial.cc index 71722faedf11..3ece094e6a8d 100644 --- a/third_party/nix/src/libexpr/primops/fetchMercurial.cc +++ b/third_party/nix/src/libexpr/primops/fetchMercurial.cc @@ -7,11 +7,11 @@ #include #include -#include "download.hh" -#include "eval-inline.hh" -#include "pathlocks.hh" -#include "primops.hh" -#include "store-api.hh" +#include "libexpr/eval-inline.hh" +#include "libexpr/primops.hh" +#include "libstore/download.hh" +#include "libstore/pathlocks.hh" +#include "libstore/store-api.hh" using namespace std::string_literals; diff --git a/third_party/nix/src/libexpr/primops/fromTOML.cc b/third_party/nix/src/libexpr/primops/fromTOML.cc index cc7b3cfcc33e..66e2e1b4094f 100644 --- a/third_party/nix/src/libexpr/primops/fromTOML.cc +++ b/third_party/nix/src/libexpr/primops/fromTOML.cc @@ -1,6 +1,6 @@ #include "cpptoml/cpptoml.h" -#include "eval-inline.hh" -#include "primops.hh" +#include "libexpr/eval-inline.hh" +#include "libexpr/primops.hh" namespace nix { -- cgit 1.4.1