1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-05 20:41:47 +02:00
nix/src/libutil
John Ericson 0c67777396 Expose the nix component in header include paths
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

(cherry picked from commit cc24766fa6)
2025-04-02 11:37:17 -04:00
..
include/nix/util Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
linux Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
signature Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
unix Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
widecharwidth try to calculate character width 2024-12-28 12:01:32 +01:00
windows Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
.version Build nix-util with Meson 2024-06-12 18:31:02 -04:00
archive.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
args.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
canon-path.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
compression.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
compute-levels.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
config-global.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
configuration.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
current-process.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
english.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
environment-variables.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
error.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
executable-path.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
exit.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
experimental-features.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
file-content-address.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
file-descriptor.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
file-system.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
fs-sink.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
git.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
hash.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
hilite.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
json-utils.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
logging.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
memory-source-accessor.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
meson.build Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
meson.options Build nix-util with Meson 2024-06-12 18:31:02 -04:00
mounted-source-accessor.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
nix-meson-build-support rename: build-utils-meson -> nix-meson-build-support 2024-12-09 16:54:42 +01:00
package.nix Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
pos-table.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
position.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
posix-source-accessor.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
references.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
serialise.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
source-accessor.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
source-path.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
strings.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
suggestions.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
tarfile.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
terminal.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
thread-pool.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
union-source-accessor.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
unix-domain-socket.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
url.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
users.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
util.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00
xml-writer.cc Expose the nix component in header include paths 2025-04-02 11:37:17 -04:00