maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(3p/nix): Anchor local includes at src/

Browse source 
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.
This commit is contained in:
Vincent Ambo 2020-05-27 21:56:34 +01:00
parent 86a35d963d
commit 3652326ed2
159 changed files with 659 additions and 654 deletions
Download patch file Download diff file Expand all files Collapse all files

32
third_party/nix/src/nix-env/nix-env.cc vendored
View file

@ -11,22 +11,22 @@
#include <sys/types.h>
#include <unistd.h>
#include "attr-path.hh"
#include "common-eval-args.hh"
#include "derivations.hh"
#include "eval.hh"
#include "get-drvs.hh"
#include "globals.hh"
#include "json.hh"
#include "legacy.hh"
#include "names.hh"
#include "profiles.hh"
#include "shared.hh"
#include "store-api.hh"
#include "user-env.hh"
#include "util.hh"
#include "value-to-json.hh"
#include "xml-writer.hh"
#include "libexpr/attr-path.hh"
#include "libexpr/common-eval-args.hh"
#include "libexpr/eval.hh"
#include "libexpr/get-drvs.hh"
#include "libexpr/names.hh"
#include "libexpr/value-to-json.hh"
#include "libmain/shared.hh"
#include "libstore/derivations.hh"
#include "libstore/globals.hh"
#include "libstore/profiles.hh"
#include "libstore/store-api.hh"
#include "libutil/json.hh"
#include "libutil/util.hh"
#include "libutil/xml-writer.hh"
#include "nix-env/user-env.hh"
#include "nix/legacy.hh"
using namespace nix;
using std::cout;

18
third_party/nix/src/nix-env/user-env.cc vendored
View file

@ -1,15 +1,15 @@
#include "user-env.hh"
#include "nix-env/user-env.hh"
#include <glog/logging.h>
#include "derivations.hh"
#include "eval-inline.hh"
#include "eval.hh"
#include "globals.hh"
#include "profiles.hh"
#include "shared.hh"
#include "store-api.hh"
#include "util.hh"
#include "libexpr/eval-inline.hh"
#include "libexpr/eval.hh"
#include "libmain/shared.hh"
#include "libstore/derivations.hh"
#include "libstore/globals.hh"
#include "libstore/profiles.hh"
#include "libstore/store-api.hh"
#include "libutil/util.hh"
namespace nix {

2
third_party/nix/src/nix-env/user-env.hh vendored
View file

@ -1,6 +1,6 @@
#pragma once
#include "get-drvs.hh"
#include "libexpr/get-drvs.hh"
namespace nix {