wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 19:01:16 +02:00
Code Activity

Expose the nix component in header include paths

Browse source 
For example, instead of doing

    #include "nix/store-config.hh"
    #include "nix/derived-path.hh"

Now do

    #include "nix/store/config.hh"
    #include "nix/store/derived-path.hh"

This was originally planned in the issue, and also recent requested by
Eelco.

Most of the change is purely mechanical. There is just one small
additional issue. See how, in the example above, we took this
opportunity to also turn `<comp>-config.hh` into `<comp>/config.hh`.
Well, there was already a `nix/util/config.{cc,hh}`. Even though there
is not a public configuration header for libutil (which also would be
called `nix/util/config.{cc,hh}`) that's still confusing, To avoid any
such confusion, we renamed that to `nix/util/configuration.{cc,hh}`.

Finally, note that the libflake headers already did this, so we didn't
need to do anything to them. We wouldn't want to mistakenly get
`nix/flake/flake/flake.hh`!

Progress on #7876
This commit is contained in:
John Ericson 2025-03-31 16:38:20 -04:00
parent 4de73df8bf
commit cc24766fa6
647 changed files with 2566 additions and 2568 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libexpr-c/nix_api_expr.cc
View file

@ -2,11 +2,11 @@
#include <stdexcept>
#include <string>
#include "nix/eval.hh"
#include "nix/eval-gc.hh"
#include "nix/globals.hh"
#include "nix/eval-settings.hh"
#include "nix/ref.hh"
#include "nix/expr/eval.hh"
#include "nix/expr/eval-gc.hh"
#include "nix/store/globals.hh"
#include "nix/expr/eval-settings.hh"
#include "nix/util/ref.hh"
#include "nix_api_expr.h"
#include "nix_api_expr_internal.h"

10
src/libexpr-c/nix_api_expr_internal.h
View file

@ -1,12 +1,12 @@
#ifndef NIX_API_EXPR_INTERNAL_H
#define NIX_API_EXPR_INTERNAL_H
#include "nix/fetch-settings.hh"
#include "nix/eval.hh"
#include "nix/eval-settings.hh"
#include "nix/attr-set.hh"
#include "nix/fetchers/fetch-settings.hh"
#include "nix/expr/eval.hh"
#include "nix/expr/eval-settings.hh"
#include "nix/expr/attr-set.hh"
#include "nix_api_value.h"
#include "nix/search-path.hh"
#include "nix/expr/search-path.hh"
struct nix_eval_state_builder
{

12
src/libexpr-c/nix_api_external.cc
View file

@ -1,8 +1,8 @@
#include "nix/attr-set.hh"
#include "nix/config.hh"
#include "nix/eval.hh"
#include "nix/globals.hh"
#include "nix/value.hh"
#include "nix/expr/attr-set.hh"
#include "nix/util/configuration.hh"
#include "nix/expr/eval.hh"
#include "nix/store/globals.hh"
#include "nix/expr/value.hh"
#include "nix_api_expr.h"
#include "nix_api_expr_internal.h"
@ -10,7 +10,7 @@
#include "nix_api_util.h"
#include "nix_api_util_internal.h"
#include "nix_api_value.h"
#include "nix/value/context.hh"
#include "nix/expr/value/context.hh"
#include <nlohmann/json.hpp>

16
src/libexpr-c/nix_api_value.cc
View file

@ -1,10 +1,10 @@
#include "nix/attr-set.hh"
#include "nix/config.hh"
#include "nix/eval.hh"
#include "nix/globals.hh"
#include "nix/path.hh"
#include "nix/primops.hh"
#include "nix/value.hh"
#include "nix/expr/attr-set.hh"
#include "nix/util/configuration.hh"
#include "nix/expr/eval.hh"
#include "nix/store/globals.hh"
#include "nix/store/path.hh"
#include "nix/expr/primops.hh"
#include "nix/expr/value.hh"
#include "nix_api_expr.h"
#include "nix_api_expr_internal.h"
@ -12,7 +12,7 @@
#include "nix_api_util_internal.h"
#include "nix_api_store_internal.h"
#include "nix_api_value.h"
#include "nix/value/context.hh"
#include "nix/expr/value/context.hh"
// Internal helper functions to check [in] and [out] `Value *` parameters
static const nix::Value & check_value_not_null(const nix_value * value)