diff --git a/Cargo.toml b/Cargo.toml index 79bcbe0dd..0fbb1db51 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] resolver = "2" -members = ["src/lix-doc"] +members = ["lix/lix-doc"] [workspace.package] edition = "2021" diff --git a/doc/internal-api/meson.build b/doc/internal-api/meson.build index af93b6943..5521cd51e 100644 --- a/doc/internal-api/meson.build +++ b/doc/internal-api/meson.build @@ -1,25 +1,25 @@ internal_api_sources = [ - 'src/libcmd', - 'src/libexpr', - 'src/libexpr/flake', + 'lix/libcmd', + 'lix/libexpr', + 'lix/libexpr/flake', 'tests/unit/libexpr', 'tests/unit/libexpr/value', 'tests/unit/libexpr/test', 'tests/unit/libexpr/test/value', - 'src/libexpr/value', - 'src/libfetchers', - 'src/libmain', - 'src/libstore', - 'src/libstore/build', - 'src/libstore/builtins', + 'lix/libexpr/value', + 'lix/libfetchers', + 'lix/libmain', + 'lix/libstore', + 'lix/libstore/build', + 'lix/libstore/builtins', 'tests/unit/libstore', 'tests/unit/libstore/test', - 'src/libutil', + 'lix/libutil', 'tests/unit/libutil', 'tests/unit/libutil/test', - 'src/nix', - 'src/nix-env', - 'src/nix-store', + 'lix/nix', + 'lix/nix-env', + 'lix/nix-store', ] # We feed Doxygen absolute paths so it can be invoked from any working directory. diff --git a/doc/manual/rl-next/stack-traces.md b/doc/manual/rl-next/stack-traces.md index e16d6c886..bdaf5e057 100644 --- a/doc/manual/rl-next/stack-traces.md +++ b/doc/manual/rl-next/stack-traces.md @@ -17,10 +17,10 @@ Lix crashed. This is a bug. We would appreciate if you report it along with what Exception: std::runtime_error: test exception Stack trace: - 0# nix::printStackTrace() in /home/jade/lix/lix3/build/src/nix/../libutil/liblixutil.so - 1# 0x000073C9862331F2 in /home/jade/lix/lix3/build/src/nix/../libmain/liblixmain.so + 0# nix::printStackTrace() in /home/jade/lix/lix3/build/lix/nix/../libutil/liblixutil.so + 1# 0x000073C9862331F2 in /home/jade/lix/lix3/build/lix/nix/../libmain/liblixmain.so 2# 0x000073C985F2E21A in /nix/store/p44qan69linp3ii0xrviypsw2j4qdcp2-gcc-13.2.0-lib/lib/libstdc++.so.6 3# 0x000073C985F2E285 in /nix/store/p44qan69linp3ii0xrviypsw2j4qdcp2-gcc-13.2.0-lib/lib/libstdc++.so.6 - 4# nix::handleExceptions(std::__cxx11::basic_string, std::allocator > const&, std::function) in /home/jade/lix/lix3/build/src/nix/../libmain/liblixmain.so + 4# nix::handleExceptions(std::__cxx11::basic_string, std::allocator > const&, std::function) in /home/jade/lix/lix3/build/lix/nix/../libmain/liblixmain.so ... ``` diff --git a/doc/manual/src/command-ref/meson.build b/doc/manual/src/command-ref/meson.build index 67f7261ae..823610a28 100644 --- a/doc/manual/src/command-ref/meson.build +++ b/doc/manual/src/command-ref/meson.build @@ -32,10 +32,10 @@ nix3_cli_files = custom_target( conf_file_md = custom_target( command : [ python.full_path(), - '@SOURCE_ROOT@/src/code-generation/build_settings.py', + '@SOURCE_ROOT@/lix/code-generation/build_settings.py', '--kernel', host_machine.system(), '--docs', '@OUTPUT@', - '--experimental-features', '@SOURCE_ROOT@/src/libutil/experimental-features', + '--experimental-features', '@SOURCE_ROOT@/lix/libutil/experimental-features', '@INPUT@', ], input : [ diff --git a/doc/manual/src/contributing/deprecated-features.md b/doc/manual/src/contributing/deprecated-features.md index ef37a1d98..ff3f4dde2 100644 --- a/doc/manual/src/contributing/deprecated-features.md +++ b/doc/manual/src/contributing/deprecated-features.md @@ -34,4 +34,4 @@ However, we do not live in such an ideal world, and currently this goal is so fa # Currently available deprecated features -{{#include @generated@/../../../src/libutil/deprecated-feature-descriptions.md}} +{{#include @generated@/../../../lix/libutil/deprecated-feature-descriptions.md}} diff --git a/doc/manual/src/contributing/experimental-features.md b/doc/manual/src/contributing/experimental-features.md index d5f6f2526..1a34a8b20 100644 --- a/doc/manual/src/contributing/experimental-features.md +++ b/doc/manual/src/contributing/experimental-features.md @@ -99,4 +99,4 @@ This means that experimental features and RFCs are orthogonal mechanisms, and ca # Currently available experimental features -{{#include @generated@/../../../src/libutil/experimental-feature-descriptions.md}} +{{#include @generated@/../../../lix/libutil/experimental-feature-descriptions.md}} diff --git a/doc/manual/src/contributing/hacking.md b/doc/manual/src/contributing/hacking.md index 60f113cbb..47a789532 100644 --- a/doc/manual/src/contributing/hacking.md +++ b/doc/manual/src/contributing/hacking.md @@ -102,14 +102,14 @@ $ meson compile -C build nixexpr All targets may be addressed as their output, relative to the build directory, e.g.: ```bash -$ meson compile -C build src/libexpr/liblixexpr.so +$ meson compile -C build lix/libexpr/liblixexpr.so ``` But Meson does not consider intermediate files like object files targets. To build a specific object file, use Ninja directly and specify the output file relative to the build directory: ```bash -$ ninja -C build src/libexpr/liblixexpr.so.p/nixexpr.cc.o +$ ninja -C build lix/libexpr/liblixexpr.so.p/nixexpr.cc.o ``` To inspect the canonical source of truth on what the state of the buildsystem configuration is, use: @@ -137,7 +137,7 @@ You can also build Lix for one of the [supported platforms](#platforms). Lix can be built for various platforms, as specified in [`flake.nix`]: -[`flake.nix`]: https://git.lix.systems/lix-project/lix/src/branch/main/flake.nix +[`flake.nix`]: https://git.lix.systems/lix-project/lix/lix/branch/main/flake.nix - `x86_64-linux` - `x86_64-darwin` @@ -413,8 +413,8 @@ Experimental and deprecated features support the following metadata properties: This should also be the stem of the file name (with extension `md`). * `internalName` (required): identifier used to refer to the feature inside the C++ code. -Experimental feature data files should live in `src/libutil/experimental-features`, and deprecated features in `src/libutil/deprecated-features`. -They must be listed in the `experimental_feature_definitions` or `deprecated_feature_definitions` lists in `src/libutil/meson.build` respectively to be considered by the build system. +Experimental feature data files should live in `lix/libutil/experimental-features`, and deprecated features in `lix/libutil/deprecated-features`. +They must be listed in the `experimental_feature_definitions` or `deprecated_feature_definitions` lists in `lix/libutil/meson.build` respectively to be considered by the build system. ### Global settings @@ -441,7 +441,7 @@ Global settings support the following metadata properties: Defaults to false if not specified. Settings are not collected in a single place in the source tree, so an appropriate place needs to be found for the setting to live. -Look for related setting definition files under second-level subdirectories of `src` whose name includes `settings`. +Look for related setting definition files under second-level subdirectories of `lix` whose name includes `settings`. Then add the new file there, and don't forget to register it in the appropriate `meson.build` file. ### Builtin functions @@ -458,7 +458,7 @@ The following metadata properties are supported for builtin functions: * `experimental_feature` (optional): the user-facing name of the experimental feature which needs to be enabled for the bultin function to be available. If not specified, no experimental feature is required. -New builtin function definition files must be added to `src/libexpr/builtins` and registered in the `builtin_definitions` list in `src/libexpr/meson.build`. +New builtin function definition files must be added to `lix/libexpr/builtins` and registered in the `builtin_definitions` list in `lix/libexpr/meson.build`. ### Builtin constants The following metadata properties are supported for builtin constants: @@ -471,4 +471,4 @@ The following metadata properties are supported for builtin constants: Impure constants are not available when pure evaluation mode is activated. Defaults to `false` when not specified. -New builtin constant definition files must be added to `src/libexpr/builtin-constants` and registered in the `builtin_constant_definitions` list in `src/libexpr/meson.build`. +New builtin constant definition files must be added to `lix/libexpr/builtin-constants` and registered in the `builtin_constant_definitions` list in `lix/libexpr/meson.build`. diff --git a/doc/manual/src/contributing/testing.md b/doc/manual/src/contributing/testing.md index 33197b0ba..6e9eb7ccc 100644 --- a/doc/manual/src/contributing/testing.md +++ b/doc/manual/src/contributing/testing.md @@ -13,7 +13,7 @@ The unit tests are defined using the [googletest] and [rapidcheck] frameworks. > > ``` > … -> ├── src +> ├── lix > │   ├── libexpr > │   │   ├── … > │   │   ├── value @@ -46,10 +46,10 @@ The unit tests are defined using the [googletest] and [rapidcheck] frameworks. > … … … … … … > ``` -The unit tests for each Lix library (`liblixexpr`, `liblixstore`, etc..) live inside a directory `src/${library_shortname}/tests` within the directory for the library (`src/${library_shortname}`). +The unit tests for each Lix library (`liblixexpr`, `liblixstore`, etc..) live inside a directory `lix/${library_shortname}/tests` within the directory for the library (`lix/${library_shortname}`). The data is in `tests/unit/LIBNAME/data/LIBNAME`, with one subdir per library, with the same name as where the code goes. -For example, `liblixstore` code is in `src/libstore`, and its test data is in `tests/unit/libstore/data/libstore`. +For example, `liblixstore` code is in `lix/libstore`, and its test data is in `tests/unit/libstore/data/libstore`. The path to the unit test data directory is passed to the unit test executable with the environment variable `_NIX_TEST_UNIT_DATA`. ### Running tests @@ -345,7 +345,7 @@ rg '(?:[^A-Za-z]|^)(_[A-Z][^-\[ }/:");$(]+)' -r '$1' --no-filename --only-matchi rg '\$\{?([A-Z][^-\[ }/:");]+)' -r '$1' --no-filename --only-matching tests | sort -u > vars.txt ``` -I grepped `src/` for `get[eE]nv\("` to find the mentions in Lix code. +I grepped `lix/` for `get[eE]nv\("` to find the mentions in Lix code. ### Used by Lix testing support code @@ -361,8 +361,8 @@ I grepped `src/` for `get[eE]nv\("` to find the mentions in Lix code. - `_NIX_FORCE_HTTP` - Forces file URIs to be treated as remote ones. - Used by `src/libfetchers/git.cc`, `src/libstore/http-binary-cache-store.cc`, - `src/libstore/local-binary-cache-store.cc`. Seems to be for forcing Git + Used by `lix/libfetchers/git.cc`, `lix/libstore/http-binary-cache-store.cc`, + `lix/libstore/local-binary-cache-store.cc`. Seems to be for forcing Git clones of `git+file://` URLs, making the HTTP binary cache store accept `file://` URLs (presumably passing them to curl?), and unknown reasons for the local binary cache. @@ -374,7 +374,7 @@ I grepped `src/` for `get[eE]nv\("` to find the mentions in Lix code. `structuredAttrs` documentation. - `NIX_BIN_DIR`, `NIX_STORE_DIR` (or its inconsistently-used old alias `NIX_STORE`), `NIX_DATA_DIR`, `NIX_LOG_DIR`, `NIX_LOG_DIR`, `NIX_STATE_DIR`, `NIX_CONF_DIR` - - Overrides compile-time configuration of various locations used by Lix. See `src/libstore/globals.cc`. + Overrides compile-time configuration of various locations used by Lix. See `lix/libstore/globals.cc`. **Expected value**: a directory - `NIX_DAEMON_SOCKET_PATH` (optional) - Overrides the daemon socket path from `$NIX_STATE_DIR/daemon-socket/socket`. diff --git a/doc/manual/src/language/builtin-constants.md b/doc/manual/src/language/builtin-constants.md index 6197d1f76..0b7fecf90 100644 --- a/doc/manual/src/language/builtin-constants.md +++ b/doc/manual/src/language/builtin-constants.md @@ -4,7 +4,7 @@ These constants are built into the Nix language evaluator:
-{{#include @generated@/../../../src/libexpr/builtin-constants.md}} +{{#include @generated@/../../../lix/libexpr/builtin-constants.md}}
diff --git a/doc/manual/src/language/builtins.md b/doc/manual/src/language/builtins.md index ae42d8dbd..e4171ba8f 100644 --- a/doc/manual/src/language/builtins.md +++ b/doc/manual/src/language/builtins.md @@ -15,6 +15,6 @@ For convenience, some built-ins can be accessed directly:

derivation is described in its own section.

-{{#include @generated@/../../../src/libexpr/builtins.md}} +{{#include @generated@/../../../lix/libexpr/builtins.md}} diff --git a/src/asan-options/asan-options.cc b/lix/asan-options/asan-options.cc similarity index 100% rename from src/asan-options/asan-options.cc rename to lix/asan-options/asan-options.cc diff --git a/src/code-generation/build_builtin_constants.py b/lix/code-generation/build_builtin_constants.py similarity index 100% rename from src/code-generation/build_builtin_constants.py rename to lix/code-generation/build_builtin_constants.py diff --git a/src/code-generation/build_builtins.py b/lix/code-generation/build_builtins.py similarity index 100% rename from src/code-generation/build_builtins.py rename to lix/code-generation/build_builtins.py diff --git a/src/code-generation/build_experimental_features.py b/lix/code-generation/build_experimental_features.py similarity index 100% rename from src/code-generation/build_experimental_features.py rename to lix/code-generation/build_experimental_features.py diff --git a/src/code-generation/build_settings.py b/lix/code-generation/build_settings.py similarity index 100% rename from src/code-generation/build_settings.py rename to lix/code-generation/build_settings.py diff --git a/src/code-generation/common.py b/lix/code-generation/common.py similarity index 100% rename from src/code-generation/common.py rename to lix/code-generation/common.py diff --git a/src/legacy/build-remote.cc b/lix/legacy/build-remote.cc similarity index 99% rename from src/legacy/build-remote.cc rename to lix/legacy/build-remote.cc index 4b692f4f2..6d0ecaaa2 100644 --- a/src/legacy/build-remote.cc +++ b/lix/legacy/build-remote.cc @@ -309,7 +309,7 @@ connected: }); // See the very large comment in `case WorkerProto::Op::BuildDerivation:` in - // `src/libstore/daemon.cc` that explains the trust model here. + // `lix/libstore/daemon.cc` that explains the trust model here. // // This condition mirrors that: that code enforces the "rules" outlined there; // we do the best we can given those "rules". diff --git a/src/legacy/build-remote.hh b/lix/legacy/build-remote.hh similarity index 100% rename from src/legacy/build-remote.hh rename to lix/legacy/build-remote.hh diff --git a/src/legacy/buildenv.nix b/lix/legacy/buildenv.nix similarity index 100% rename from src/legacy/buildenv.nix rename to lix/legacy/buildenv.nix diff --git a/src/legacy/dotgraph.cc b/lix/legacy/dotgraph.cc similarity index 100% rename from src/legacy/dotgraph.cc rename to lix/legacy/dotgraph.cc diff --git a/src/legacy/dotgraph.hh b/lix/legacy/dotgraph.hh similarity index 100% rename from src/legacy/dotgraph.hh rename to lix/legacy/dotgraph.hh diff --git a/src/legacy/graphml.cc b/lix/legacy/graphml.cc similarity index 100% rename from src/legacy/graphml.cc rename to lix/legacy/graphml.cc diff --git a/src/legacy/graphml.hh b/lix/legacy/graphml.hh similarity index 100% rename from src/legacy/graphml.hh rename to lix/legacy/graphml.hh diff --git a/src/legacy/meson.build b/lix/legacy/meson.build similarity index 100% rename from src/legacy/meson.build rename to lix/legacy/meson.build diff --git a/src/legacy/nix-build.cc b/lix/legacy/nix-build.cc similarity index 100% rename from src/legacy/nix-build.cc rename to lix/legacy/nix-build.cc diff --git a/src/legacy/nix-build.hh b/lix/legacy/nix-build.hh similarity index 100% rename from src/legacy/nix-build.hh rename to lix/legacy/nix-build.hh diff --git a/src/legacy/nix-channel.cc b/lix/legacy/nix-channel.cc similarity index 100% rename from src/legacy/nix-channel.cc rename to lix/legacy/nix-channel.cc diff --git a/src/legacy/nix-channel.hh b/lix/legacy/nix-channel.hh similarity index 100% rename from src/legacy/nix-channel.hh rename to lix/legacy/nix-channel.hh diff --git a/src/legacy/nix-collect-garbage.cc b/lix/legacy/nix-collect-garbage.cc similarity index 100% rename from src/legacy/nix-collect-garbage.cc rename to lix/legacy/nix-collect-garbage.cc diff --git a/src/legacy/nix-collect-garbage.hh b/lix/legacy/nix-collect-garbage.hh similarity index 100% rename from src/legacy/nix-collect-garbage.hh rename to lix/legacy/nix-collect-garbage.hh diff --git a/src/legacy/nix-copy-closure.cc b/lix/legacy/nix-copy-closure.cc similarity index 100% rename from src/legacy/nix-copy-closure.cc rename to lix/legacy/nix-copy-closure.cc diff --git a/src/legacy/nix-copy-closure.hh b/lix/legacy/nix-copy-closure.hh similarity index 100% rename from src/legacy/nix-copy-closure.hh rename to lix/legacy/nix-copy-closure.hh diff --git a/src/legacy/nix-env.cc b/lix/legacy/nix-env.cc similarity index 100% rename from src/legacy/nix-env.cc rename to lix/legacy/nix-env.cc diff --git a/src/legacy/nix-env.hh b/lix/legacy/nix-env.hh similarity index 100% rename from src/legacy/nix-env.hh rename to lix/legacy/nix-env.hh diff --git a/src/legacy/nix-instantiate.cc b/lix/legacy/nix-instantiate.cc similarity index 100% rename from src/legacy/nix-instantiate.cc rename to lix/legacy/nix-instantiate.cc diff --git a/src/legacy/nix-instantiate.hh b/lix/legacy/nix-instantiate.hh similarity index 100% rename from src/legacy/nix-instantiate.hh rename to lix/legacy/nix-instantiate.hh diff --git a/src/legacy/nix-store.cc b/lix/legacy/nix-store.cc similarity index 100% rename from src/legacy/nix-store.cc rename to lix/legacy/nix-store.cc diff --git a/src/legacy/nix-store.hh b/lix/legacy/nix-store.hh similarity index 100% rename from src/legacy/nix-store.hh rename to lix/legacy/nix-store.hh diff --git a/src/legacy/unpack-channel.nix b/lix/legacy/unpack-channel.nix similarity index 100% rename from src/legacy/unpack-channel.nix rename to lix/legacy/unpack-channel.nix diff --git a/src/legacy/user-env.cc b/lix/legacy/user-env.cc similarity index 100% rename from src/legacy/user-env.cc rename to lix/legacy/user-env.cc diff --git a/src/legacy/user-env.hh b/lix/legacy/user-env.hh similarity index 100% rename from src/legacy/user-env.hh rename to lix/legacy/user-env.hh diff --git a/src/libcmd/built-path.cc b/lix/libcmd/built-path.cc similarity index 100% rename from src/libcmd/built-path.cc rename to lix/libcmd/built-path.cc diff --git a/src/libcmd/built-path.hh b/lix/libcmd/built-path.hh similarity index 100% rename from src/libcmd/built-path.hh rename to lix/libcmd/built-path.hh diff --git a/src/libcmd/cmd-profiles.cc b/lix/libcmd/cmd-profiles.cc similarity index 100% rename from src/libcmd/cmd-profiles.cc rename to lix/libcmd/cmd-profiles.cc diff --git a/src/libcmd/cmd-profiles.hh b/lix/libcmd/cmd-profiles.hh similarity index 100% rename from src/libcmd/cmd-profiles.hh rename to lix/libcmd/cmd-profiles.hh diff --git a/src/libcmd/command.cc b/lix/libcmd/command.cc similarity index 100% rename from src/libcmd/command.cc rename to lix/libcmd/command.cc diff --git a/src/libcmd/command.hh b/lix/libcmd/command.hh similarity index 100% rename from src/libcmd/command.hh rename to lix/libcmd/command.hh diff --git a/src/libcmd/common-eval-args.cc b/lix/libcmd/common-eval-args.cc similarity index 100% rename from src/libcmd/common-eval-args.cc rename to lix/libcmd/common-eval-args.cc diff --git a/src/libcmd/common-eval-args.hh b/lix/libcmd/common-eval-args.hh similarity index 100% rename from src/libcmd/common-eval-args.hh rename to lix/libcmd/common-eval-args.hh diff --git a/src/libcmd/editor-for.cc b/lix/libcmd/editor-for.cc similarity index 100% rename from src/libcmd/editor-for.cc rename to lix/libcmd/editor-for.cc diff --git a/src/libcmd/editor-for.hh b/lix/libcmd/editor-for.hh similarity index 100% rename from src/libcmd/editor-for.hh rename to lix/libcmd/editor-for.hh diff --git a/src/libcmd/installable-attr-path.cc b/lix/libcmd/installable-attr-path.cc similarity index 100% rename from src/libcmd/installable-attr-path.cc rename to lix/libcmd/installable-attr-path.cc diff --git a/src/libcmd/installable-attr-path.hh b/lix/libcmd/installable-attr-path.hh similarity index 100% rename from src/libcmd/installable-attr-path.hh rename to lix/libcmd/installable-attr-path.hh diff --git a/src/libcmd/installable-derived-path.cc b/lix/libcmd/installable-derived-path.cc similarity index 100% rename from src/libcmd/installable-derived-path.cc rename to lix/libcmd/installable-derived-path.cc diff --git a/src/libcmd/installable-derived-path.hh b/lix/libcmd/installable-derived-path.hh similarity index 100% rename from src/libcmd/installable-derived-path.hh rename to lix/libcmd/installable-derived-path.hh diff --git a/src/libcmd/installable-flake.cc b/lix/libcmd/installable-flake.cc similarity index 100% rename from src/libcmd/installable-flake.cc rename to lix/libcmd/installable-flake.cc diff --git a/src/libcmd/installable-flake.hh b/lix/libcmd/installable-flake.hh similarity index 100% rename from src/libcmd/installable-flake.hh rename to lix/libcmd/installable-flake.hh diff --git a/src/libcmd/installable-value.cc b/lix/libcmd/installable-value.cc similarity index 100% rename from src/libcmd/installable-value.cc rename to lix/libcmd/installable-value.cc diff --git a/src/libcmd/installable-value.hh b/lix/libcmd/installable-value.hh similarity index 100% rename from src/libcmd/installable-value.hh rename to lix/libcmd/installable-value.hh diff --git a/src/libcmd/installables.cc b/lix/libcmd/installables.cc similarity index 100% rename from src/libcmd/installables.cc rename to lix/libcmd/installables.cc diff --git a/src/libcmd/installables.hh b/lix/libcmd/installables.hh similarity index 100% rename from src/libcmd/installables.hh rename to lix/libcmd/installables.hh diff --git a/src/libcmd/legacy.cc b/lix/libcmd/legacy.cc similarity index 100% rename from src/libcmd/legacy.cc rename to lix/libcmd/legacy.cc diff --git a/src/libcmd/legacy.hh b/lix/libcmd/legacy.hh similarity index 100% rename from src/libcmd/legacy.hh rename to lix/libcmd/legacy.hh diff --git a/src/libcmd/lix-cmd.pc.in b/lix/libcmd/lix-cmd.pc.in similarity index 100% rename from src/libcmd/lix-cmd.pc.in rename to lix/libcmd/lix-cmd.pc.in diff --git a/src/libcmd/markdown.cc b/lix/libcmd/markdown.cc similarity index 100% rename from src/libcmd/markdown.cc rename to lix/libcmd/markdown.cc diff --git a/src/libcmd/markdown.hh b/lix/libcmd/markdown.hh similarity index 100% rename from src/libcmd/markdown.hh rename to lix/libcmd/markdown.hh diff --git a/src/libcmd/meson.build b/lix/libcmd/meson.build similarity index 92% rename from src/libcmd/meson.build rename to lix/libcmd/meson.build index 65d06a9ed..3a178e148 100644 --- a/src/libcmd/meson.build +++ b/lix/libcmd/meson.build @@ -53,8 +53,8 @@ libcmd = library( nlohmann_json, liblix_doc, ], - # '../include' for self references like "lix/libcmd/*.hh" - include_directories : [ '../include' ], + # '../..' for self references like "lix/libcmd/*.hh" + include_directories : [ '../..' ], cpp_pch : cpp_pch, install : true, # FIXME(Qyriad): is this right? @@ -71,7 +71,7 @@ custom_target( ) liblixcmd = declare_dependency( - include_directories : include_directories('../include'), + include_directories : include_directories('../..'), link_with : libcmd, ) diff --git a/src/libcmd/repl-interacter.cc b/lix/libcmd/repl-interacter.cc similarity index 100% rename from src/libcmd/repl-interacter.cc rename to lix/libcmd/repl-interacter.cc diff --git a/src/libcmd/repl-interacter.hh b/lix/libcmd/repl-interacter.hh similarity index 100% rename from src/libcmd/repl-interacter.hh rename to lix/libcmd/repl-interacter.hh diff --git a/src/libcmd/repl-overlays.nix b/lix/libcmd/repl-overlays.nix similarity index 100% rename from src/libcmd/repl-overlays.nix rename to lix/libcmd/repl-overlays.nix diff --git a/src/libcmd/repl.cc b/lix/libcmd/repl.cc similarity index 100% rename from src/libcmd/repl.cc rename to lix/libcmd/repl.cc diff --git a/src/libcmd/repl.hh b/lix/libcmd/repl.hh similarity index 100% rename from src/libcmd/repl.hh rename to lix/libcmd/repl.hh diff --git a/src/libexpr/attr-path.cc b/lix/libexpr/attr-path.cc similarity index 100% rename from src/libexpr/attr-path.cc rename to lix/libexpr/attr-path.cc diff --git a/src/libexpr/attr-path.hh b/lix/libexpr/attr-path.hh similarity index 100% rename from src/libexpr/attr-path.hh rename to lix/libexpr/attr-path.hh diff --git a/src/libexpr/attr-set.cc b/lix/libexpr/attr-set.cc similarity index 100% rename from src/libexpr/attr-set.cc rename to lix/libexpr/attr-set.cc diff --git a/src/libexpr/attr-set.hh b/lix/libexpr/attr-set.hh similarity index 100% rename from src/libexpr/attr-set.hh rename to lix/libexpr/attr-set.hh diff --git a/src/libexpr/builtin-constants/builtins.md b/lix/libexpr/builtin-constants/builtins.md similarity index 100% rename from src/libexpr/builtin-constants/builtins.md rename to lix/libexpr/builtin-constants/builtins.md diff --git a/src/libexpr/builtin-constants/currentSystem.md b/lix/libexpr/builtin-constants/currentSystem.md similarity index 100% rename from src/libexpr/builtin-constants/currentSystem.md rename to lix/libexpr/builtin-constants/currentSystem.md diff --git a/src/libexpr/builtin-constants/currentTime.md b/lix/libexpr/builtin-constants/currentTime.md similarity index 100% rename from src/libexpr/builtin-constants/currentTime.md rename to lix/libexpr/builtin-constants/currentTime.md diff --git a/src/libexpr/builtin-constants/false.md b/lix/libexpr/builtin-constants/false.md similarity index 100% rename from src/libexpr/builtin-constants/false.md rename to lix/libexpr/builtin-constants/false.md diff --git a/src/libexpr/builtin-constants/langVersion.md b/lix/libexpr/builtin-constants/langVersion.md similarity index 100% rename from src/libexpr/builtin-constants/langVersion.md rename to lix/libexpr/builtin-constants/langVersion.md diff --git a/src/libexpr/builtin-constants/nixPath.md b/lix/libexpr/builtin-constants/nixPath.md similarity index 100% rename from src/libexpr/builtin-constants/nixPath.md rename to lix/libexpr/builtin-constants/nixPath.md diff --git a/src/libexpr/builtin-constants/nixVersion.md b/lix/libexpr/builtin-constants/nixVersion.md similarity index 100% rename from src/libexpr/builtin-constants/nixVersion.md rename to lix/libexpr/builtin-constants/nixVersion.md diff --git a/src/libexpr/builtin-constants/null.md b/lix/libexpr/builtin-constants/null.md similarity index 100% rename from src/libexpr/builtin-constants/null.md rename to lix/libexpr/builtin-constants/null.md diff --git a/src/libexpr/builtin-constants/storeDir.md b/lix/libexpr/builtin-constants/storeDir.md similarity index 100% rename from src/libexpr/builtin-constants/storeDir.md rename to lix/libexpr/builtin-constants/storeDir.md diff --git a/src/libexpr/builtin-constants/true.md b/lix/libexpr/builtin-constants/true.md similarity index 100% rename from src/libexpr/builtin-constants/true.md rename to lix/libexpr/builtin-constants/true.md diff --git a/src/libexpr/builtins/abort.md b/lix/libexpr/builtins/abort.md similarity index 100% rename from src/libexpr/builtins/abort.md rename to lix/libexpr/builtins/abort.md diff --git a/src/libexpr/builtins/add.md b/lix/libexpr/builtins/add.md similarity index 100% rename from src/libexpr/builtins/add.md rename to lix/libexpr/builtins/add.md diff --git a/src/libexpr/builtins/addDrvOutputDependencies.md b/lix/libexpr/builtins/addDrvOutputDependencies.md similarity index 100% rename from src/libexpr/builtins/addDrvOutputDependencies.md rename to lix/libexpr/builtins/addDrvOutputDependencies.md diff --git a/src/libexpr/builtins/all.md b/lix/libexpr/builtins/all.md similarity index 100% rename from src/libexpr/builtins/all.md rename to lix/libexpr/builtins/all.md diff --git a/src/libexpr/builtins/any.md b/lix/libexpr/builtins/any.md similarity index 100% rename from src/libexpr/builtins/any.md rename to lix/libexpr/builtins/any.md diff --git a/src/libexpr/builtins/attrNames.md b/lix/libexpr/builtins/attrNames.md similarity index 100% rename from src/libexpr/builtins/attrNames.md rename to lix/libexpr/builtins/attrNames.md diff --git a/src/libexpr/builtins/attrValues.md b/lix/libexpr/builtins/attrValues.md similarity index 100% rename from src/libexpr/builtins/attrValues.md rename to lix/libexpr/builtins/attrValues.md diff --git a/src/libexpr/builtins/baseNameOf.md b/lix/libexpr/builtins/baseNameOf.md similarity index 100% rename from src/libexpr/builtins/baseNameOf.md rename to lix/libexpr/builtins/baseNameOf.md diff --git a/src/libexpr/builtins/bitAnd.md b/lix/libexpr/builtins/bitAnd.md similarity index 100% rename from src/libexpr/builtins/bitAnd.md rename to lix/libexpr/builtins/bitAnd.md diff --git a/src/libexpr/builtins/bitOr.md b/lix/libexpr/builtins/bitOr.md similarity index 100% rename from src/libexpr/builtins/bitOr.md rename to lix/libexpr/builtins/bitOr.md diff --git a/src/libexpr/builtins/bitXor.md b/lix/libexpr/builtins/bitXor.md similarity index 100% rename from src/libexpr/builtins/bitXor.md rename to lix/libexpr/builtins/bitXor.md diff --git a/src/libexpr/builtins/break.md b/lix/libexpr/builtins/break.md similarity index 100% rename from src/libexpr/builtins/break.md rename to lix/libexpr/builtins/break.md diff --git a/src/libexpr/builtins/catAttrs.md b/lix/libexpr/builtins/catAttrs.md similarity index 100% rename from src/libexpr/builtins/catAttrs.md rename to lix/libexpr/builtins/catAttrs.md diff --git a/src/libexpr/builtins/ceil.md b/lix/libexpr/builtins/ceil.md similarity index 100% rename from src/libexpr/builtins/ceil.md rename to lix/libexpr/builtins/ceil.md diff --git a/src/libexpr/builtins/compareVersions.md b/lix/libexpr/builtins/compareVersions.md similarity index 100% rename from src/libexpr/builtins/compareVersions.md rename to lix/libexpr/builtins/compareVersions.md diff --git a/src/libexpr/builtins/concatLists.md b/lix/libexpr/builtins/concatLists.md similarity index 100% rename from src/libexpr/builtins/concatLists.md rename to lix/libexpr/builtins/concatLists.md diff --git a/src/libexpr/builtins/concatMap.md b/lix/libexpr/builtins/concatMap.md similarity index 100% rename from src/libexpr/builtins/concatMap.md rename to lix/libexpr/builtins/concatMap.md diff --git a/src/libexpr/builtins/concatStringsSep.md b/lix/libexpr/builtins/concatStringsSep.md similarity index 100% rename from src/libexpr/builtins/concatStringsSep.md rename to lix/libexpr/builtins/concatStringsSep.md diff --git a/src/libexpr/builtins/deepSeq.md b/lix/libexpr/builtins/deepSeq.md similarity index 100% rename from src/libexpr/builtins/deepSeq.md rename to lix/libexpr/builtins/deepSeq.md diff --git a/src/libexpr/builtins/dirOf.md b/lix/libexpr/builtins/dirOf.md similarity index 100% rename from src/libexpr/builtins/dirOf.md rename to lix/libexpr/builtins/dirOf.md diff --git a/src/libexpr/builtins/div.md b/lix/libexpr/builtins/div.md similarity index 100% rename from src/libexpr/builtins/div.md rename to lix/libexpr/builtins/div.md diff --git a/src/libexpr/builtins/elem.md b/lix/libexpr/builtins/elem.md similarity index 100% rename from src/libexpr/builtins/elem.md rename to lix/libexpr/builtins/elem.md diff --git a/src/libexpr/builtins/elemAt.md b/lix/libexpr/builtins/elemAt.md similarity index 100% rename from src/libexpr/builtins/elemAt.md rename to lix/libexpr/builtins/elemAt.md diff --git a/src/libexpr/builtins/fetchClosure.md b/lix/libexpr/builtins/fetchClosure.md similarity index 100% rename from src/libexpr/builtins/fetchClosure.md rename to lix/libexpr/builtins/fetchClosure.md diff --git a/src/libexpr/builtins/fetchGit.md b/lix/libexpr/builtins/fetchGit.md similarity index 100% rename from src/libexpr/builtins/fetchGit.md rename to lix/libexpr/builtins/fetchGit.md diff --git a/src/libexpr/builtins/fetchTarball.md b/lix/libexpr/builtins/fetchTarball.md similarity index 100% rename from src/libexpr/builtins/fetchTarball.md rename to lix/libexpr/builtins/fetchTarball.md diff --git a/src/libexpr/builtins/fetchurl.md b/lix/libexpr/builtins/fetchurl.md similarity index 100% rename from src/libexpr/builtins/fetchurl.md rename to lix/libexpr/builtins/fetchurl.md diff --git a/src/libexpr/builtins/filter.md b/lix/libexpr/builtins/filter.md similarity index 100% rename from src/libexpr/builtins/filter.md rename to lix/libexpr/builtins/filter.md diff --git a/src/libexpr/builtins/filterSource.md b/lix/libexpr/builtins/filterSource.md similarity index 100% rename from src/libexpr/builtins/filterSource.md rename to lix/libexpr/builtins/filterSource.md diff --git a/src/libexpr/builtins/findFile.md b/lix/libexpr/builtins/findFile.md similarity index 100% rename from src/libexpr/builtins/findFile.md rename to lix/libexpr/builtins/findFile.md diff --git a/src/libexpr/builtins/flakeRefToString.md b/lix/libexpr/builtins/flakeRefToString.md similarity index 100% rename from src/libexpr/builtins/flakeRefToString.md rename to lix/libexpr/builtins/flakeRefToString.md diff --git a/src/libexpr/builtins/floor.md b/lix/libexpr/builtins/floor.md similarity index 100% rename from src/libexpr/builtins/floor.md rename to lix/libexpr/builtins/floor.md diff --git a/src/libexpr/builtins/foldlStrict.md b/lix/libexpr/builtins/foldlStrict.md similarity index 100% rename from src/libexpr/builtins/foldlStrict.md rename to lix/libexpr/builtins/foldlStrict.md diff --git a/src/libexpr/builtins/fromJSON.md b/lix/libexpr/builtins/fromJSON.md similarity index 100% rename from src/libexpr/builtins/fromJSON.md rename to lix/libexpr/builtins/fromJSON.md diff --git a/src/libexpr/builtins/fromTOML.md b/lix/libexpr/builtins/fromTOML.md similarity index 100% rename from src/libexpr/builtins/fromTOML.md rename to lix/libexpr/builtins/fromTOML.md diff --git a/src/libexpr/builtins/functionArgs.md b/lix/libexpr/builtins/functionArgs.md similarity index 100% rename from src/libexpr/builtins/functionArgs.md rename to lix/libexpr/builtins/functionArgs.md diff --git a/src/libexpr/builtins/genList.md b/lix/libexpr/builtins/genList.md similarity index 100% rename from src/libexpr/builtins/genList.md rename to lix/libexpr/builtins/genList.md diff --git a/src/libexpr/builtins/genericClosure.md b/lix/libexpr/builtins/genericClosure.md similarity index 100% rename from src/libexpr/builtins/genericClosure.md rename to lix/libexpr/builtins/genericClosure.md diff --git a/src/libexpr/builtins/getAttr.md b/lix/libexpr/builtins/getAttr.md similarity index 100% rename from src/libexpr/builtins/getAttr.md rename to lix/libexpr/builtins/getAttr.md diff --git a/src/libexpr/builtins/getContext.md b/lix/libexpr/builtins/getContext.md similarity index 100% rename from src/libexpr/builtins/getContext.md rename to lix/libexpr/builtins/getContext.md diff --git a/src/libexpr/builtins/getEnv.md b/lix/libexpr/builtins/getEnv.md similarity index 100% rename from src/libexpr/builtins/getEnv.md rename to lix/libexpr/builtins/getEnv.md diff --git a/src/libexpr/builtins/getFlake.md b/lix/libexpr/builtins/getFlake.md similarity index 100% rename from src/libexpr/builtins/getFlake.md rename to lix/libexpr/builtins/getFlake.md diff --git a/src/libexpr/builtins/groupBy.md b/lix/libexpr/builtins/groupBy.md similarity index 100% rename from src/libexpr/builtins/groupBy.md rename to lix/libexpr/builtins/groupBy.md diff --git a/src/libexpr/builtins/hasAttr.md b/lix/libexpr/builtins/hasAttr.md similarity index 100% rename from src/libexpr/builtins/hasAttr.md rename to lix/libexpr/builtins/hasAttr.md diff --git a/src/libexpr/builtins/hasContext.md b/lix/libexpr/builtins/hasContext.md similarity index 100% rename from src/libexpr/builtins/hasContext.md rename to lix/libexpr/builtins/hasContext.md diff --git a/src/libexpr/builtins/hashFile.md b/lix/libexpr/builtins/hashFile.md similarity index 100% rename from src/libexpr/builtins/hashFile.md rename to lix/libexpr/builtins/hashFile.md diff --git a/src/libexpr/builtins/hashString.md b/lix/libexpr/builtins/hashString.md similarity index 100% rename from src/libexpr/builtins/hashString.md rename to lix/libexpr/builtins/hashString.md diff --git a/src/libexpr/builtins/head.md b/lix/libexpr/builtins/head.md similarity index 100% rename from src/libexpr/builtins/head.md rename to lix/libexpr/builtins/head.md diff --git a/src/libexpr/builtins/import.md b/lix/libexpr/builtins/import.md similarity index 100% rename from src/libexpr/builtins/import.md rename to lix/libexpr/builtins/import.md diff --git a/src/libexpr/builtins/intersectAttrs.md b/lix/libexpr/builtins/intersectAttrs.md similarity index 100% rename from src/libexpr/builtins/intersectAttrs.md rename to lix/libexpr/builtins/intersectAttrs.md diff --git a/src/libexpr/builtins/isAttrs.md b/lix/libexpr/builtins/isAttrs.md similarity index 100% rename from src/libexpr/builtins/isAttrs.md rename to lix/libexpr/builtins/isAttrs.md diff --git a/src/libexpr/builtins/isBool.md b/lix/libexpr/builtins/isBool.md similarity index 100% rename from src/libexpr/builtins/isBool.md rename to lix/libexpr/builtins/isBool.md diff --git a/src/libexpr/builtins/isFloat.md b/lix/libexpr/builtins/isFloat.md similarity index 100% rename from src/libexpr/builtins/isFloat.md rename to lix/libexpr/builtins/isFloat.md diff --git a/src/libexpr/builtins/isFunction.md b/lix/libexpr/builtins/isFunction.md similarity index 100% rename from src/libexpr/builtins/isFunction.md rename to lix/libexpr/builtins/isFunction.md diff --git a/src/libexpr/builtins/isInt.md b/lix/libexpr/builtins/isInt.md similarity index 100% rename from src/libexpr/builtins/isInt.md rename to lix/libexpr/builtins/isInt.md diff --git a/src/libexpr/builtins/isList.md b/lix/libexpr/builtins/isList.md similarity index 100% rename from src/libexpr/builtins/isList.md rename to lix/libexpr/builtins/isList.md diff --git a/src/libexpr/builtins/isNull.md b/lix/libexpr/builtins/isNull.md similarity index 100% rename from src/libexpr/builtins/isNull.md rename to lix/libexpr/builtins/isNull.md diff --git a/src/libexpr/builtins/isPath.md b/lix/libexpr/builtins/isPath.md similarity index 100% rename from src/libexpr/builtins/isPath.md rename to lix/libexpr/builtins/isPath.md diff --git a/src/libexpr/builtins/isString.md b/lix/libexpr/builtins/isString.md similarity index 100% rename from src/libexpr/builtins/isString.md rename to lix/libexpr/builtins/isString.md diff --git a/src/libexpr/builtins/length.md b/lix/libexpr/builtins/length.md similarity index 100% rename from src/libexpr/builtins/length.md rename to lix/libexpr/builtins/length.md diff --git a/src/libexpr/builtins/lessThan.md b/lix/libexpr/builtins/lessThan.md similarity index 100% rename from src/libexpr/builtins/lessThan.md rename to lix/libexpr/builtins/lessThan.md diff --git a/src/libexpr/builtins/listToAttrs.md b/lix/libexpr/builtins/listToAttrs.md similarity index 100% rename from src/libexpr/builtins/listToAttrs.md rename to lix/libexpr/builtins/listToAttrs.md diff --git a/src/libexpr/builtins/map.md b/lix/libexpr/builtins/map.md similarity index 100% rename from src/libexpr/builtins/map.md rename to lix/libexpr/builtins/map.md diff --git a/src/libexpr/builtins/mapAttrs.md b/lix/libexpr/builtins/mapAttrs.md similarity index 100% rename from src/libexpr/builtins/mapAttrs.md rename to lix/libexpr/builtins/mapAttrs.md diff --git a/src/libexpr/builtins/match.md b/lix/libexpr/builtins/match.md similarity index 100% rename from src/libexpr/builtins/match.md rename to lix/libexpr/builtins/match.md diff --git a/src/libexpr/builtins/mul.md b/lix/libexpr/builtins/mul.md similarity index 100% rename from src/libexpr/builtins/mul.md rename to lix/libexpr/builtins/mul.md diff --git a/src/libexpr/builtins/outputOf.md b/lix/libexpr/builtins/outputOf.md similarity index 100% rename from src/libexpr/builtins/outputOf.md rename to lix/libexpr/builtins/outputOf.md diff --git a/src/libexpr/builtins/parseDrvName.md b/lix/libexpr/builtins/parseDrvName.md similarity index 100% rename from src/libexpr/builtins/parseDrvName.md rename to lix/libexpr/builtins/parseDrvName.md diff --git a/src/libexpr/builtins/parseFlakeRef.md b/lix/libexpr/builtins/parseFlakeRef.md similarity index 100% rename from src/libexpr/builtins/parseFlakeRef.md rename to lix/libexpr/builtins/parseFlakeRef.md diff --git a/src/libexpr/builtins/partition.md b/lix/libexpr/builtins/partition.md similarity index 100% rename from src/libexpr/builtins/partition.md rename to lix/libexpr/builtins/partition.md diff --git a/src/libexpr/builtins/path.md b/lix/libexpr/builtins/path.md similarity index 100% rename from src/libexpr/builtins/path.md rename to lix/libexpr/builtins/path.md diff --git a/src/libexpr/builtins/pathExists.md b/lix/libexpr/builtins/pathExists.md similarity index 100% rename from src/libexpr/builtins/pathExists.md rename to lix/libexpr/builtins/pathExists.md diff --git a/src/libexpr/builtins/placeholder.md b/lix/libexpr/builtins/placeholder.md similarity index 100% rename from src/libexpr/builtins/placeholder.md rename to lix/libexpr/builtins/placeholder.md diff --git a/src/libexpr/builtins/readDir.md b/lix/libexpr/builtins/readDir.md similarity index 100% rename from src/libexpr/builtins/readDir.md rename to lix/libexpr/builtins/readDir.md diff --git a/src/libexpr/builtins/readFile.md b/lix/libexpr/builtins/readFile.md similarity index 100% rename from src/libexpr/builtins/readFile.md rename to lix/libexpr/builtins/readFile.md diff --git a/src/libexpr/builtins/readFileType.md b/lix/libexpr/builtins/readFileType.md similarity index 100% rename from src/libexpr/builtins/readFileType.md rename to lix/libexpr/builtins/readFileType.md diff --git a/src/libexpr/builtins/removeAttrs.md b/lix/libexpr/builtins/removeAttrs.md similarity index 100% rename from src/libexpr/builtins/removeAttrs.md rename to lix/libexpr/builtins/removeAttrs.md diff --git a/src/libexpr/builtins/replaceStrings.md b/lix/libexpr/builtins/replaceStrings.md similarity index 100% rename from src/libexpr/builtins/replaceStrings.md rename to lix/libexpr/builtins/replaceStrings.md diff --git a/src/libexpr/builtins/seq.md b/lix/libexpr/builtins/seq.md similarity index 100% rename from src/libexpr/builtins/seq.md rename to lix/libexpr/builtins/seq.md diff --git a/src/libexpr/builtins/sort.md b/lix/libexpr/builtins/sort.md similarity index 100% rename from src/libexpr/builtins/sort.md rename to lix/libexpr/builtins/sort.md diff --git a/src/libexpr/builtins/split.md b/lix/libexpr/builtins/split.md similarity index 100% rename from src/libexpr/builtins/split.md rename to lix/libexpr/builtins/split.md diff --git a/src/libexpr/builtins/splitVersion.md b/lix/libexpr/builtins/splitVersion.md similarity index 100% rename from src/libexpr/builtins/splitVersion.md rename to lix/libexpr/builtins/splitVersion.md diff --git a/src/libexpr/builtins/storePath.md b/lix/libexpr/builtins/storePath.md similarity index 100% rename from src/libexpr/builtins/storePath.md rename to lix/libexpr/builtins/storePath.md diff --git a/src/libexpr/builtins/stringLength.md b/lix/libexpr/builtins/stringLength.md similarity index 100% rename from src/libexpr/builtins/stringLength.md rename to lix/libexpr/builtins/stringLength.md diff --git a/src/libexpr/builtins/sub.md b/lix/libexpr/builtins/sub.md similarity index 100% rename from src/libexpr/builtins/sub.md rename to lix/libexpr/builtins/sub.md diff --git a/src/libexpr/builtins/substring.md b/lix/libexpr/builtins/substring.md similarity index 100% rename from src/libexpr/builtins/substring.md rename to lix/libexpr/builtins/substring.md diff --git a/src/libexpr/builtins/tail.md b/lix/libexpr/builtins/tail.md similarity index 100% rename from src/libexpr/builtins/tail.md rename to lix/libexpr/builtins/tail.md diff --git a/src/libexpr/builtins/throw.md b/lix/libexpr/builtins/throw.md similarity index 100% rename from src/libexpr/builtins/throw.md rename to lix/libexpr/builtins/throw.md diff --git a/src/libexpr/builtins/toFile.md b/lix/libexpr/builtins/toFile.md similarity index 100% rename from src/libexpr/builtins/toFile.md rename to lix/libexpr/builtins/toFile.md diff --git a/src/libexpr/builtins/toJSON.md b/lix/libexpr/builtins/toJSON.md similarity index 100% rename from src/libexpr/builtins/toJSON.md rename to lix/libexpr/builtins/toJSON.md diff --git a/src/libexpr/builtins/toPath.md b/lix/libexpr/builtins/toPath.md similarity index 100% rename from src/libexpr/builtins/toPath.md rename to lix/libexpr/builtins/toPath.md diff --git a/src/libexpr/builtins/toString.md b/lix/libexpr/builtins/toString.md similarity index 100% rename from src/libexpr/builtins/toString.md rename to lix/libexpr/builtins/toString.md diff --git a/src/libexpr/builtins/toXML.md b/lix/libexpr/builtins/toXML.md similarity index 100% rename from src/libexpr/builtins/toXML.md rename to lix/libexpr/builtins/toXML.md diff --git a/src/libexpr/builtins/trace.md b/lix/libexpr/builtins/trace.md similarity index 100% rename from src/libexpr/builtins/trace.md rename to lix/libexpr/builtins/trace.md diff --git a/src/libexpr/builtins/traceVerbose.md b/lix/libexpr/builtins/traceVerbose.md similarity index 100% rename from src/libexpr/builtins/traceVerbose.md rename to lix/libexpr/builtins/traceVerbose.md diff --git a/src/libexpr/builtins/tryEval.md b/lix/libexpr/builtins/tryEval.md similarity index 100% rename from src/libexpr/builtins/tryEval.md rename to lix/libexpr/builtins/tryEval.md diff --git a/src/libexpr/builtins/typeOf.md b/lix/libexpr/builtins/typeOf.md similarity index 100% rename from src/libexpr/builtins/typeOf.md rename to lix/libexpr/builtins/typeOf.md diff --git a/src/libexpr/builtins/unsafeDiscardOutputDependency.md b/lix/libexpr/builtins/unsafeDiscardOutputDependency.md similarity index 100% rename from src/libexpr/builtins/unsafeDiscardOutputDependency.md rename to lix/libexpr/builtins/unsafeDiscardOutputDependency.md diff --git a/src/libexpr/builtins/zipAttrsWith.md b/lix/libexpr/builtins/zipAttrsWith.md similarity index 100% rename from src/libexpr/builtins/zipAttrsWith.md rename to lix/libexpr/builtins/zipAttrsWith.md diff --git a/src/libexpr/eval-cache.cc b/lix/libexpr/eval-cache.cc similarity index 100% rename from src/libexpr/eval-cache.cc rename to lix/libexpr/eval-cache.cc diff --git a/src/libexpr/eval-cache.hh b/lix/libexpr/eval-cache.hh similarity index 100% rename from src/libexpr/eval-cache.hh rename to lix/libexpr/eval-cache.hh diff --git a/src/libexpr/eval-error.cc b/lix/libexpr/eval-error.cc similarity index 100% rename from src/libexpr/eval-error.cc rename to lix/libexpr/eval-error.cc diff --git a/src/libexpr/eval-error.hh b/lix/libexpr/eval-error.hh similarity index 100% rename from src/libexpr/eval-error.hh rename to lix/libexpr/eval-error.hh diff --git a/src/libexpr/eval-inline.hh b/lix/libexpr/eval-inline.hh similarity index 100% rename from src/libexpr/eval-inline.hh rename to lix/libexpr/eval-inline.hh diff --git a/src/libexpr/eval-settings.cc b/lix/libexpr/eval-settings.cc similarity index 100% rename from src/libexpr/eval-settings.cc rename to lix/libexpr/eval-settings.cc diff --git a/src/libexpr/eval-settings.hh b/lix/libexpr/eval-settings.hh similarity index 100% rename from src/libexpr/eval-settings.hh rename to lix/libexpr/eval-settings.hh diff --git a/src/libexpr/eval.cc b/lix/libexpr/eval.cc similarity index 100% rename from src/libexpr/eval.cc rename to lix/libexpr/eval.cc diff --git a/src/libexpr/eval.hh b/lix/libexpr/eval.hh similarity index 100% rename from src/libexpr/eval.hh rename to lix/libexpr/eval.hh diff --git a/src/libexpr/extra-primops.hh b/lix/libexpr/extra-primops.hh similarity index 100% rename from src/libexpr/extra-primops.hh rename to lix/libexpr/extra-primops.hh diff --git a/src/libexpr/fetchurl.nix b/lix/libexpr/fetchurl.nix similarity index 100% rename from src/libexpr/fetchurl.nix rename to lix/libexpr/fetchurl.nix diff --git a/src/libexpr/flake/call-flake.nix b/lix/libexpr/flake/call-flake.nix similarity index 100% rename from src/libexpr/flake/call-flake.nix rename to lix/libexpr/flake/call-flake.nix diff --git a/src/libexpr/flake/config.cc b/lix/libexpr/flake/config.cc similarity index 100% rename from src/libexpr/flake/config.cc rename to lix/libexpr/flake/config.cc diff --git a/src/libexpr/flake/flake.cc b/lix/libexpr/flake/flake.cc similarity index 100% rename from src/libexpr/flake/flake.cc rename to lix/libexpr/flake/flake.cc diff --git a/src/libexpr/flake/flake.hh b/lix/libexpr/flake/flake.hh similarity index 100% rename from src/libexpr/flake/flake.hh rename to lix/libexpr/flake/flake.hh diff --git a/src/libexpr/flake/flakeref.cc b/lix/libexpr/flake/flakeref.cc similarity index 100% rename from src/libexpr/flake/flakeref.cc rename to lix/libexpr/flake/flakeref.cc diff --git a/src/libexpr/flake/flakeref.hh b/lix/libexpr/flake/flakeref.hh similarity index 100% rename from src/libexpr/flake/flakeref.hh rename to lix/libexpr/flake/flakeref.hh diff --git a/src/libexpr/flake/lockfile.cc b/lix/libexpr/flake/lockfile.cc similarity index 100% rename from src/libexpr/flake/lockfile.cc rename to lix/libexpr/flake/lockfile.cc diff --git a/src/libexpr/flake/lockfile.hh b/lix/libexpr/flake/lockfile.hh similarity index 100% rename from src/libexpr/flake/lockfile.hh rename to lix/libexpr/flake/lockfile.hh diff --git a/src/libexpr/flake/meson.build b/lix/libexpr/flake/meson.build similarity index 100% rename from src/libexpr/flake/meson.build rename to lix/libexpr/flake/meson.build diff --git a/src/libexpr/function-trace.cc b/lix/libexpr/function-trace.cc similarity index 100% rename from src/libexpr/function-trace.cc rename to lix/libexpr/function-trace.cc diff --git a/src/libexpr/function-trace.hh b/lix/libexpr/function-trace.hh similarity index 100% rename from src/libexpr/function-trace.hh rename to lix/libexpr/function-trace.hh diff --git a/src/libexpr/gc-alloc.cc b/lix/libexpr/gc-alloc.cc similarity index 100% rename from src/libexpr/gc-alloc.cc rename to lix/libexpr/gc-alloc.cc diff --git a/src/libexpr/gc-alloc.hh b/lix/libexpr/gc-alloc.hh similarity index 100% rename from src/libexpr/gc-alloc.hh rename to lix/libexpr/gc-alloc.hh diff --git a/src/libexpr/gc-small-vector.hh b/lix/libexpr/gc-small-vector.hh similarity index 100% rename from src/libexpr/gc-small-vector.hh rename to lix/libexpr/gc-small-vector.hh diff --git a/src/libexpr/get-drvs.cc b/lix/libexpr/get-drvs.cc similarity index 100% rename from src/libexpr/get-drvs.cc rename to lix/libexpr/get-drvs.cc diff --git a/src/libexpr/get-drvs.hh b/lix/libexpr/get-drvs.hh similarity index 100% rename from src/libexpr/get-drvs.hh rename to lix/libexpr/get-drvs.hh diff --git a/src/libexpr/imported-drv-to-derivation.nix b/lix/libexpr/imported-drv-to-derivation.nix similarity index 100% rename from src/libexpr/imported-drv-to-derivation.nix rename to lix/libexpr/imported-drv-to-derivation.nix diff --git a/src/libexpr/json-to-value.cc b/lix/libexpr/json-to-value.cc similarity index 100% rename from src/libexpr/json-to-value.cc rename to lix/libexpr/json-to-value.cc diff --git a/src/libexpr/json-to-value.hh b/lix/libexpr/json-to-value.hh similarity index 100% rename from src/libexpr/json-to-value.hh rename to lix/libexpr/json-to-value.hh diff --git a/src/libexpr/lix-expr.pc.in b/lix/libexpr/lix-expr.pc.in similarity index 100% rename from src/libexpr/lix-expr.pc.in rename to lix/libexpr/lix-expr.pc.in diff --git a/src/libexpr/meson.build b/lix/libexpr/meson.build similarity index 94% rename from src/libexpr/meson.build rename to lix/libexpr/meson.build index 0d5031ad3..8e3bfa4fb 100644 --- a/src/libexpr/meson.build +++ b/lix/libexpr/meson.build @@ -32,10 +32,10 @@ libexpr_setting_definitions = files( libexpr_settings_header = custom_target( command : [ python.full_path(), - '@SOURCE_ROOT@/src/code-generation/build_settings.py', + '@SOURCE_ROOT@/lix/code-generation/build_settings.py', '--kernel', host_machine.system(), '--header', '@OUTPUT@', - '--experimental-features', '@SOURCE_ROOT@/src/libutil/experimental-features', + '--experimental-features', '@SOURCE_ROOT@/lix/libutil/experimental-features', '@INPUT@', ], input : libexpr_setting_definitions, @@ -148,10 +148,10 @@ builtin_definitions = files( builtins_gen = custom_target( command : [ python.full_path(), - '@SOURCE_ROOT@/src/code-generation/build_builtins.py', + '@SOURCE_ROOT@/lix/code-generation/build_builtins.py', '--header', '@OUTPUT0@', '--docs', '@OUTPUT1@', - '--experimental-features', '@SOURCE_ROOT@/src/libutil/experimental-features', + '--experimental-features', '@SOURCE_ROOT@/lix/libutil/experimental-features', '@INPUT@' ], input : builtin_definitions, @@ -178,7 +178,7 @@ builtin_constant_definitions = files( builtin_constants_gen = custom_target( command : [ python.full_path(), - '@SOURCE_ROOT@/src/code-generation/build_builtin_constants.py', + '@SOURCE_ROOT@/lix/code-generation/build_builtin_constants.py', '--header', '@OUTPUT0@', '--docs', '@OUTPUT1@', '@INPUT@', @@ -293,7 +293,7 @@ install_headers( ) liblixexpr = declare_dependency( - include_directories : include_directories('../include'), + include_directories : include_directories('../..'), sources : libexpr_settings_header, link_with : libexpr, ) @@ -301,7 +301,7 @@ liblixexpr = declare_dependency( # FIXME: remove when https://git.lix.systems/lix-project/lix/issues/359 is fixed. if is_static liblixexpr_mstatic = declare_dependency( - include_directories : include_directories('../include'), + include_directories : include_directories('../..'), sources : libexpr_settings_header, link_whole : libexpr, ) diff --git a/src/libexpr/nixexpr.cc b/lix/libexpr/nixexpr.cc similarity index 100% rename from src/libexpr/nixexpr.cc rename to lix/libexpr/nixexpr.cc diff --git a/src/libexpr/nixexpr.hh b/lix/libexpr/nixexpr.hh similarity index 100% rename from src/libexpr/nixexpr.hh rename to lix/libexpr/nixexpr.hh diff --git a/src/libexpr/parser/change_head.hh b/lix/libexpr/parser/change_head.hh similarity index 100% rename from src/libexpr/parser/change_head.hh rename to lix/libexpr/parser/change_head.hh diff --git a/src/libexpr/parser/grammar.hh b/lix/libexpr/parser/grammar.hh similarity index 100% rename from src/libexpr/parser/grammar.hh rename to lix/libexpr/parser/grammar.hh diff --git a/src/libexpr/parser/parser-impl1.inc.cc b/lix/libexpr/parser/parser-impl1.inc.cc similarity index 100% rename from src/libexpr/parser/parser-impl1.inc.cc rename to lix/libexpr/parser/parser-impl1.inc.cc diff --git a/src/libexpr/parser/parser.cc b/lix/libexpr/parser/parser.cc similarity index 100% rename from src/libexpr/parser/parser.cc rename to lix/libexpr/parser/parser.cc diff --git a/src/libexpr/parser/state.hh b/lix/libexpr/parser/state.hh similarity index 100% rename from src/libexpr/parser/state.hh rename to lix/libexpr/parser/state.hh diff --git a/src/libexpr/paths.cc b/lix/libexpr/paths.cc similarity index 100% rename from src/libexpr/paths.cc rename to lix/libexpr/paths.cc diff --git a/src/libexpr/pos-idx.hh b/lix/libexpr/pos-idx.hh similarity index 100% rename from src/libexpr/pos-idx.hh rename to lix/libexpr/pos-idx.hh diff --git a/src/libexpr/pos-table.hh b/lix/libexpr/pos-table.hh similarity index 100% rename from src/libexpr/pos-table.hh rename to lix/libexpr/pos-table.hh diff --git a/src/libexpr/primops.cc b/lix/libexpr/primops.cc similarity index 100% rename from src/libexpr/primops.cc rename to lix/libexpr/primops.cc diff --git a/src/libexpr/primops.hh b/lix/libexpr/primops.hh similarity index 100% rename from src/libexpr/primops.hh rename to lix/libexpr/primops.hh diff --git a/src/libexpr/primops/context.cc b/lix/libexpr/primops/context.cc similarity index 100% rename from src/libexpr/primops/context.cc rename to lix/libexpr/primops/context.cc diff --git a/src/libexpr/primops/derivation.nix b/lix/libexpr/primops/derivation.nix similarity index 100% rename from src/libexpr/primops/derivation.nix rename to lix/libexpr/primops/derivation.nix diff --git a/src/libexpr/primops/fetchClosure.cc b/lix/libexpr/primops/fetchClosure.cc similarity index 100% rename from src/libexpr/primops/fetchClosure.cc rename to lix/libexpr/primops/fetchClosure.cc diff --git a/src/libexpr/primops/fetchMercurial.cc b/lix/libexpr/primops/fetchMercurial.cc similarity index 100% rename from src/libexpr/primops/fetchMercurial.cc rename to lix/libexpr/primops/fetchMercurial.cc diff --git a/src/libexpr/primops/fetchTree.cc b/lix/libexpr/primops/fetchTree.cc similarity index 100% rename from src/libexpr/primops/fetchTree.cc rename to lix/libexpr/primops/fetchTree.cc diff --git a/src/libexpr/primops/fromTOML.cc b/lix/libexpr/primops/fromTOML.cc similarity index 100% rename from src/libexpr/primops/fromTOML.cc rename to lix/libexpr/primops/fromTOML.cc diff --git a/src/libexpr/print-ambiguous.cc b/lix/libexpr/print-ambiguous.cc similarity index 100% rename from src/libexpr/print-ambiguous.cc rename to lix/libexpr/print-ambiguous.cc diff --git a/src/libexpr/print-ambiguous.hh b/lix/libexpr/print-ambiguous.hh similarity index 100% rename from src/libexpr/print-ambiguous.hh rename to lix/libexpr/print-ambiguous.hh diff --git a/src/libexpr/print-options.hh b/lix/libexpr/print-options.hh similarity index 100% rename from src/libexpr/print-options.hh rename to lix/libexpr/print-options.hh diff --git a/src/libexpr/print.cc b/lix/libexpr/print.cc similarity index 100% rename from src/libexpr/print.cc rename to lix/libexpr/print.cc diff --git a/src/libexpr/print.hh b/lix/libexpr/print.hh similarity index 100% rename from src/libexpr/print.hh rename to lix/libexpr/print.hh diff --git a/src/libexpr/repl-exit-status.hh b/lix/libexpr/repl-exit-status.hh similarity index 100% rename from src/libexpr/repl-exit-status.hh rename to lix/libexpr/repl-exit-status.hh diff --git a/src/libexpr/search-path.cc b/lix/libexpr/search-path.cc similarity index 100% rename from src/libexpr/search-path.cc rename to lix/libexpr/search-path.cc diff --git a/src/libexpr/search-path.hh b/lix/libexpr/search-path.hh similarity index 100% rename from src/libexpr/search-path.hh rename to lix/libexpr/search-path.hh diff --git a/src/libexpr/settings/allow-import-from-derivation.md b/lix/libexpr/settings/allow-import-from-derivation.md similarity index 100% rename from src/libexpr/settings/allow-import-from-derivation.md rename to lix/libexpr/settings/allow-import-from-derivation.md diff --git a/src/libexpr/settings/allow-unsafe-native-code-during-evaluation.md b/lix/libexpr/settings/allow-unsafe-native-code-during-evaluation.md similarity index 100% rename from src/libexpr/settings/allow-unsafe-native-code-during-evaluation.md rename to lix/libexpr/settings/allow-unsafe-native-code-during-evaluation.md diff --git a/src/libexpr/settings/allowed-uris.md b/lix/libexpr/settings/allowed-uris.md similarity index 100% rename from src/libexpr/settings/allowed-uris.md rename to lix/libexpr/settings/allowed-uris.md diff --git a/src/libexpr/settings/debugger-on-trace.md b/lix/libexpr/settings/debugger-on-trace.md similarity index 100% rename from src/libexpr/settings/debugger-on-trace.md rename to lix/libexpr/settings/debugger-on-trace.md diff --git a/src/libexpr/settings/eval-cache.md b/lix/libexpr/settings/eval-cache.md similarity index 100% rename from src/libexpr/settings/eval-cache.md rename to lix/libexpr/settings/eval-cache.md diff --git a/src/libexpr/settings/eval-system.md b/lix/libexpr/settings/eval-system.md similarity index 100% rename from src/libexpr/settings/eval-system.md rename to lix/libexpr/settings/eval-system.md diff --git a/src/libexpr/settings/ignore-try.md b/lix/libexpr/settings/ignore-try.md similarity index 100% rename from src/libexpr/settings/ignore-try.md rename to lix/libexpr/settings/ignore-try.md diff --git a/src/libexpr/settings/max-call-depth.md b/lix/libexpr/settings/max-call-depth.md similarity index 100% rename from src/libexpr/settings/max-call-depth.md rename to lix/libexpr/settings/max-call-depth.md diff --git a/src/libexpr/settings/nix-path.md b/lix/libexpr/settings/nix-path.md similarity index 100% rename from src/libexpr/settings/nix-path.md rename to lix/libexpr/settings/nix-path.md diff --git a/src/libexpr/settings/pure-eval.md b/lix/libexpr/settings/pure-eval.md similarity index 100% rename from src/libexpr/settings/pure-eval.md rename to lix/libexpr/settings/pure-eval.md diff --git a/src/libexpr/settings/repl-overlays.md b/lix/libexpr/settings/repl-overlays.md similarity index 100% rename from src/libexpr/settings/repl-overlays.md rename to lix/libexpr/settings/repl-overlays.md diff --git a/src/libexpr/settings/restrict-eval.md b/lix/libexpr/settings/restrict-eval.md similarity index 100% rename from src/libexpr/settings/restrict-eval.md rename to lix/libexpr/settings/restrict-eval.md diff --git a/src/libexpr/settings/trace-function-calls.md b/lix/libexpr/settings/trace-function-calls.md similarity index 100% rename from src/libexpr/settings/trace-function-calls.md rename to lix/libexpr/settings/trace-function-calls.md diff --git a/src/libexpr/settings/trace-verbose.md b/lix/libexpr/settings/trace-verbose.md similarity index 100% rename from src/libexpr/settings/trace-verbose.md rename to lix/libexpr/settings/trace-verbose.md diff --git a/src/libexpr/symbol-table.hh b/lix/libexpr/symbol-table.hh similarity index 100% rename from src/libexpr/symbol-table.hh rename to lix/libexpr/symbol-table.hh diff --git a/src/libexpr/value-to-json.cc b/lix/libexpr/value-to-json.cc similarity index 100% rename from src/libexpr/value-to-json.cc rename to lix/libexpr/value-to-json.cc diff --git a/src/libexpr/value-to-json.hh b/lix/libexpr/value-to-json.hh similarity index 100% rename from src/libexpr/value-to-json.hh rename to lix/libexpr/value-to-json.hh diff --git a/src/libexpr/value-to-xml.cc b/lix/libexpr/value-to-xml.cc similarity index 100% rename from src/libexpr/value-to-xml.cc rename to lix/libexpr/value-to-xml.cc diff --git a/src/libexpr/value-to-xml.hh b/lix/libexpr/value-to-xml.hh similarity index 100% rename from src/libexpr/value-to-xml.hh rename to lix/libexpr/value-to-xml.hh diff --git a/src/libexpr/value.cc b/lix/libexpr/value.cc similarity index 100% rename from src/libexpr/value.cc rename to lix/libexpr/value.cc diff --git a/src/libexpr/value.hh b/lix/libexpr/value.hh similarity index 100% rename from src/libexpr/value.hh rename to lix/libexpr/value.hh diff --git a/src/libexpr/value/context.cc b/lix/libexpr/value/context.cc similarity index 100% rename from src/libexpr/value/context.cc rename to lix/libexpr/value/context.cc diff --git a/src/libexpr/value/context.hh b/lix/libexpr/value/context.hh similarity index 100% rename from src/libexpr/value/context.hh rename to lix/libexpr/value/context.hh diff --git a/src/libfetchers/attrs.cc b/lix/libfetchers/attrs.cc similarity index 100% rename from src/libfetchers/attrs.cc rename to lix/libfetchers/attrs.cc diff --git a/src/libfetchers/attrs.hh b/lix/libfetchers/attrs.hh similarity index 100% rename from src/libfetchers/attrs.hh rename to lix/libfetchers/attrs.hh diff --git a/src/libfetchers/builtin-fetchers.hh b/lix/libfetchers/builtin-fetchers.hh similarity index 100% rename from src/libfetchers/builtin-fetchers.hh rename to lix/libfetchers/builtin-fetchers.hh diff --git a/src/libfetchers/cache.cc b/lix/libfetchers/cache.cc similarity index 100% rename from src/libfetchers/cache.cc rename to lix/libfetchers/cache.cc diff --git a/src/libfetchers/cache.hh b/lix/libfetchers/cache.hh similarity index 100% rename from src/libfetchers/cache.hh rename to lix/libfetchers/cache.hh diff --git a/src/libfetchers/fetch-settings.cc b/lix/libfetchers/fetch-settings.cc similarity index 100% rename from src/libfetchers/fetch-settings.cc rename to lix/libfetchers/fetch-settings.cc diff --git a/src/libfetchers/fetch-settings.hh b/lix/libfetchers/fetch-settings.hh similarity index 100% rename from src/libfetchers/fetch-settings.hh rename to lix/libfetchers/fetch-settings.hh diff --git a/src/libfetchers/fetch-to-store.cc b/lix/libfetchers/fetch-to-store.cc similarity index 100% rename from src/libfetchers/fetch-to-store.cc rename to lix/libfetchers/fetch-to-store.cc diff --git a/src/libfetchers/fetch-to-store.hh b/lix/libfetchers/fetch-to-store.hh similarity index 100% rename from src/libfetchers/fetch-to-store.hh rename to lix/libfetchers/fetch-to-store.hh diff --git a/src/libfetchers/fetchers.cc b/lix/libfetchers/fetchers.cc similarity index 100% rename from src/libfetchers/fetchers.cc rename to lix/libfetchers/fetchers.cc diff --git a/src/libfetchers/fetchers.hh b/lix/libfetchers/fetchers.hh similarity index 100% rename from src/libfetchers/fetchers.hh rename to lix/libfetchers/fetchers.hh diff --git a/src/libfetchers/git.cc b/lix/libfetchers/git.cc similarity index 100% rename from src/libfetchers/git.cc rename to lix/libfetchers/git.cc diff --git a/src/libfetchers/github.cc b/lix/libfetchers/github.cc similarity index 100% rename from src/libfetchers/github.cc rename to lix/libfetchers/github.cc diff --git a/src/libfetchers/indirect.cc b/lix/libfetchers/indirect.cc similarity index 100% rename from src/libfetchers/indirect.cc rename to lix/libfetchers/indirect.cc diff --git a/src/libfetchers/lix-fetchers.pc.in b/lix/libfetchers/lix-fetchers.pc.in similarity index 100% rename from src/libfetchers/lix-fetchers.pc.in rename to lix/libfetchers/lix-fetchers.pc.in diff --git a/src/libfetchers/mercurial.cc b/lix/libfetchers/mercurial.cc similarity index 100% rename from src/libfetchers/mercurial.cc rename to lix/libfetchers/mercurial.cc diff --git a/src/libfetchers/meson.build b/lix/libfetchers/meson.build similarity index 88% rename from src/libfetchers/meson.build rename to lix/libfetchers/meson.build index 5731d1406..dd906d7a2 100644 --- a/src/libfetchers/meson.build +++ b/lix/libfetchers/meson.build @@ -34,10 +34,10 @@ libfetchers_setting_definitions = files( libfetchers_settings_header = custom_target( command : [ python.full_path(), - '@SOURCE_ROOT@/src/code-generation/build_settings.py', + '@SOURCE_ROOT@/lix/code-generation/build_settings.py', '--kernel', host_machine.system(), '--header', '@OUTPUT@', - '--experimental-features', '@SOURCE_ROOT@/src/libutil/experimental-features', + '--experimental-features', '@SOURCE_ROOT@/lix/libutil/experimental-features', '@INPUT@', ], input : libfetchers_setting_definitions, @@ -55,7 +55,7 @@ libfetchers = library( liblixutil, nlohmann_json, ], - include_directories : [ '../include' ], + include_directories : [ '../..' ], cpp_pch : cpp_pch, install : true, # FIXME(Qyriad): is this right? @@ -79,7 +79,7 @@ configure_file( ) liblixfetchers = declare_dependency( - include_directories : include_directories('../include'), + include_directories : include_directories('../..'), sources : libfetchers_settings_header, link_with : libfetchers, ) @@ -87,7 +87,7 @@ liblixfetchers = declare_dependency( # FIXME: remove when https://git.lix.systems/lix-project/lix/issues/359 is fixed. if is_static liblixfetchers_mstatic = declare_dependency( - include_directories : include_directories('../include'), + include_directories : include_directories('../..'), sources : libfetchers_settings_header, link_whole : libfetchers, ) diff --git a/src/libfetchers/path.cc b/lix/libfetchers/path.cc similarity index 100% rename from src/libfetchers/path.cc rename to lix/libfetchers/path.cc diff --git a/src/libfetchers/registry.cc b/lix/libfetchers/registry.cc similarity index 100% rename from src/libfetchers/registry.cc rename to lix/libfetchers/registry.cc diff --git a/src/libfetchers/registry.hh b/lix/libfetchers/registry.hh similarity index 100% rename from src/libfetchers/registry.hh rename to lix/libfetchers/registry.hh diff --git a/src/libfetchers/settings/accept-flake-config.md b/lix/libfetchers/settings/accept-flake-config.md similarity index 100% rename from src/libfetchers/settings/accept-flake-config.md rename to lix/libfetchers/settings/accept-flake-config.md diff --git a/src/libfetchers/settings/access-tokens.md b/lix/libfetchers/settings/access-tokens.md similarity index 100% rename from src/libfetchers/settings/access-tokens.md rename to lix/libfetchers/settings/access-tokens.md diff --git a/src/libfetchers/settings/allow-dirty.md b/lix/libfetchers/settings/allow-dirty.md similarity index 100% rename from src/libfetchers/settings/allow-dirty.md rename to lix/libfetchers/settings/allow-dirty.md diff --git a/src/libfetchers/settings/commit-lockfile-summary.md b/lix/libfetchers/settings/commit-lockfile-summary.md similarity index 100% rename from src/libfetchers/settings/commit-lockfile-summary.md rename to lix/libfetchers/settings/commit-lockfile-summary.md diff --git a/src/libfetchers/settings/flake-registry.md b/lix/libfetchers/settings/flake-registry.md similarity index 100% rename from src/libfetchers/settings/flake-registry.md rename to lix/libfetchers/settings/flake-registry.md diff --git a/src/libfetchers/settings/use-registries.md b/lix/libfetchers/settings/use-registries.md similarity index 100% rename from src/libfetchers/settings/use-registries.md rename to lix/libfetchers/settings/use-registries.md diff --git a/src/libfetchers/settings/warn-dirty.md b/lix/libfetchers/settings/warn-dirty.md similarity index 100% rename from src/libfetchers/settings/warn-dirty.md rename to lix/libfetchers/settings/warn-dirty.md diff --git a/src/libfetchers/tarball.cc b/lix/libfetchers/tarball.cc similarity index 100% rename from src/libfetchers/tarball.cc rename to lix/libfetchers/tarball.cc diff --git a/src/libmain/common-args.cc b/lix/libmain/common-args.cc similarity index 100% rename from src/libmain/common-args.cc rename to lix/libmain/common-args.cc diff --git a/src/libmain/common-args.hh b/lix/libmain/common-args.hh similarity index 100% rename from src/libmain/common-args.hh rename to lix/libmain/common-args.hh diff --git a/src/libmain/crash-handler.cc b/lix/libmain/crash-handler.cc similarity index 100% rename from src/libmain/crash-handler.cc rename to lix/libmain/crash-handler.cc diff --git a/src/libmain/crash-handler.hh b/lix/libmain/crash-handler.hh similarity index 100% rename from src/libmain/crash-handler.hh rename to lix/libmain/crash-handler.hh diff --git a/src/libmain/lix-main.pc.in b/lix/libmain/lix-main.pc.in similarity index 100% rename from src/libmain/lix-main.pc.in rename to lix/libmain/lix-main.pc.in diff --git a/src/libmain/loggers.cc b/lix/libmain/loggers.cc similarity index 100% rename from src/libmain/loggers.cc rename to lix/libmain/loggers.cc diff --git a/src/libmain/loggers.hh b/lix/libmain/loggers.hh similarity index 100% rename from src/libmain/loggers.hh rename to lix/libmain/loggers.hh diff --git a/src/libmain/meson.build b/lix/libmain/meson.build similarity index 91% rename from src/libmain/meson.build rename to lix/libmain/meson.build index ba5b48ba3..bbd6f9bb7 100644 --- a/src/libmain/meson.build +++ b/lix/libmain/meson.build @@ -22,7 +22,7 @@ libmain = library( liblixutil, liblixstore, ], - include_directories : [ '../include' ], + include_directories : [ '../..' ], cpp_pch : cpp_pch, install : true, # FIXME(Qyriad): is this right? @@ -32,7 +32,7 @@ libmain = library( install_headers(libmain_headers, subdir : 'lix/libmain', preserve_path : true) liblixmain = declare_dependency( - include_directories : include_directories('../include'), + include_directories : include_directories('../..'), link_with : libmain, ) diff --git a/src/libmain/progress-bar.cc b/lix/libmain/progress-bar.cc similarity index 100% rename from src/libmain/progress-bar.cc rename to lix/libmain/progress-bar.cc diff --git a/src/libmain/progress-bar.hh b/lix/libmain/progress-bar.hh similarity index 100% rename from src/libmain/progress-bar.hh rename to lix/libmain/progress-bar.hh diff --git a/src/libmain/shared.cc b/lix/libmain/shared.cc similarity index 100% rename from src/libmain/shared.cc rename to lix/libmain/shared.cc diff --git a/src/libmain/shared.hh b/lix/libmain/shared.hh similarity index 100% rename from src/libmain/shared.hh rename to lix/libmain/shared.hh diff --git a/src/libmain/stack.cc b/lix/libmain/stack.cc similarity index 100% rename from src/libmain/stack.cc rename to lix/libmain/stack.cc diff --git a/src/libstore/binary-cache-store.cc b/lix/libstore/binary-cache-store.cc similarity index 100% rename from src/libstore/binary-cache-store.cc rename to lix/libstore/binary-cache-store.cc diff --git a/src/libstore/binary-cache-store.hh b/lix/libstore/binary-cache-store.hh similarity index 100% rename from src/libstore/binary-cache-store.hh rename to lix/libstore/binary-cache-store.hh diff --git a/src/libstore/build-result.cc b/lix/libstore/build-result.cc similarity index 100% rename from src/libstore/build-result.cc rename to lix/libstore/build-result.cc diff --git a/src/libstore/build-result.hh b/lix/libstore/build-result.hh similarity index 100% rename from src/libstore/build-result.hh rename to lix/libstore/build-result.hh diff --git a/src/libstore/build/child.cc b/lix/libstore/build/child.cc similarity index 100% rename from src/libstore/build/child.cc rename to lix/libstore/build/child.cc diff --git a/src/libstore/build/child.hh b/lix/libstore/build/child.hh similarity index 100% rename from src/libstore/build/child.hh rename to lix/libstore/build/child.hh diff --git a/src/libstore/build/derivation-goal.cc b/lix/libstore/build/derivation-goal.cc similarity index 100% rename from src/libstore/build/derivation-goal.cc rename to lix/libstore/build/derivation-goal.cc diff --git a/src/libstore/build/derivation-goal.hh b/lix/libstore/build/derivation-goal.hh similarity index 100% rename from src/libstore/build/derivation-goal.hh rename to lix/libstore/build/derivation-goal.hh diff --git a/src/libstore/build/drv-output-substitution-goal.cc b/lix/libstore/build/drv-output-substitution-goal.cc similarity index 100% rename from src/libstore/build/drv-output-substitution-goal.cc rename to lix/libstore/build/drv-output-substitution-goal.cc diff --git a/src/libstore/build/drv-output-substitution-goal.hh b/lix/libstore/build/drv-output-substitution-goal.hh similarity index 100% rename from src/libstore/build/drv-output-substitution-goal.hh rename to lix/libstore/build/drv-output-substitution-goal.hh diff --git a/src/libstore/build/entry-points.cc b/lix/libstore/build/entry-points.cc similarity index 100% rename from src/libstore/build/entry-points.cc rename to lix/libstore/build/entry-points.cc diff --git a/src/libstore/build/goal.cc b/lix/libstore/build/goal.cc similarity index 100% rename from src/libstore/build/goal.cc rename to lix/libstore/build/goal.cc diff --git a/src/libstore/build/goal.hh b/lix/libstore/build/goal.hh similarity index 100% rename from src/libstore/build/goal.hh rename to lix/libstore/build/goal.hh diff --git a/src/libstore/build/hook-instance.cc b/lix/libstore/build/hook-instance.cc similarity index 100% rename from src/libstore/build/hook-instance.cc rename to lix/libstore/build/hook-instance.cc diff --git a/src/libstore/build/hook-instance.hh b/lix/libstore/build/hook-instance.hh similarity index 100% rename from src/libstore/build/hook-instance.hh rename to lix/libstore/build/hook-instance.hh diff --git a/src/libstore/build/local-derivation-goal.cc b/lix/libstore/build/local-derivation-goal.cc similarity index 100% rename from src/libstore/build/local-derivation-goal.cc rename to lix/libstore/build/local-derivation-goal.cc diff --git a/src/libstore/build/local-derivation-goal.hh b/lix/libstore/build/local-derivation-goal.hh similarity index 100% rename from src/libstore/build/local-derivation-goal.hh rename to lix/libstore/build/local-derivation-goal.hh diff --git a/src/libstore/build/personality.cc b/lix/libstore/build/personality.cc similarity index 100% rename from src/libstore/build/personality.cc rename to lix/libstore/build/personality.cc diff --git a/src/libstore/build/personality.hh b/lix/libstore/build/personality.hh similarity index 100% rename from src/libstore/build/personality.hh rename to lix/libstore/build/personality.hh diff --git a/src/libstore/build/sandbox-defaults.sb b/lix/libstore/build/sandbox-defaults.sb similarity index 100% rename from src/libstore/build/sandbox-defaults.sb rename to lix/libstore/build/sandbox-defaults.sb diff --git a/src/libstore/build/sandbox-minimal.sb b/lix/libstore/build/sandbox-minimal.sb similarity index 100% rename from src/libstore/build/sandbox-minimal.sb rename to lix/libstore/build/sandbox-minimal.sb diff --git a/src/libstore/build/sandbox-network.sb b/lix/libstore/build/sandbox-network.sb similarity index 100% rename from src/libstore/build/sandbox-network.sb rename to lix/libstore/build/sandbox-network.sb diff --git a/src/libstore/build/substitution-goal.cc b/lix/libstore/build/substitution-goal.cc similarity index 100% rename from src/libstore/build/substitution-goal.cc rename to lix/libstore/build/substitution-goal.cc diff --git a/src/libstore/build/substitution-goal.hh b/lix/libstore/build/substitution-goal.hh similarity index 100% rename from src/libstore/build/substitution-goal.hh rename to lix/libstore/build/substitution-goal.hh diff --git a/src/libstore/build/worker.cc b/lix/libstore/build/worker.cc similarity index 100% rename from src/libstore/build/worker.cc rename to lix/libstore/build/worker.cc diff --git a/src/libstore/build/worker.hh b/lix/libstore/build/worker.hh similarity index 100% rename from src/libstore/build/worker.hh rename to lix/libstore/build/worker.hh diff --git a/src/libstore/builtins.hh b/lix/libstore/builtins.hh similarity index 100% rename from src/libstore/builtins.hh rename to lix/libstore/builtins.hh diff --git a/src/libstore/builtins/buildenv.cc b/lix/libstore/builtins/buildenv.cc similarity index 100% rename from src/libstore/builtins/buildenv.cc rename to lix/libstore/builtins/buildenv.cc diff --git a/src/libstore/builtins/buildenv.hh b/lix/libstore/builtins/buildenv.hh similarity index 100% rename from src/libstore/builtins/buildenv.hh rename to lix/libstore/builtins/buildenv.hh diff --git a/src/libstore/builtins/fetchurl.cc b/lix/libstore/builtins/fetchurl.cc similarity index 100% rename from src/libstore/builtins/fetchurl.cc rename to lix/libstore/builtins/fetchurl.cc diff --git a/src/libstore/builtins/unpack-channel.cc b/lix/libstore/builtins/unpack-channel.cc similarity index 100% rename from src/libstore/builtins/unpack-channel.cc rename to lix/libstore/builtins/unpack-channel.cc diff --git a/src/libstore/ca-specific-schema.sql b/lix/libstore/ca-specific-schema.sql similarity index 100% rename from src/libstore/ca-specific-schema.sql rename to lix/libstore/ca-specific-schema.sql diff --git a/src/libstore/common-protocol-impl.hh b/lix/libstore/common-protocol-impl.hh similarity index 100% rename from src/libstore/common-protocol-impl.hh rename to lix/libstore/common-protocol-impl.hh diff --git a/src/libstore/common-protocol.cc b/lix/libstore/common-protocol.cc similarity index 100% rename from src/libstore/common-protocol.cc rename to lix/libstore/common-protocol.cc diff --git a/src/libstore/common-protocol.hh b/lix/libstore/common-protocol.hh similarity index 100% rename from src/libstore/common-protocol.hh rename to lix/libstore/common-protocol.hh diff --git a/src/libstore/content-address.cc b/lix/libstore/content-address.cc similarity index 100% rename from src/libstore/content-address.cc rename to lix/libstore/content-address.cc diff --git a/src/libstore/content-address.hh b/lix/libstore/content-address.hh similarity index 100% rename from src/libstore/content-address.hh rename to lix/libstore/content-address.hh diff --git a/src/libstore/crypto.cc b/lix/libstore/crypto.cc similarity index 100% rename from src/libstore/crypto.cc rename to lix/libstore/crypto.cc diff --git a/src/libstore/crypto.hh b/lix/libstore/crypto.hh similarity index 100% rename from src/libstore/crypto.hh rename to lix/libstore/crypto.hh diff --git a/src/libstore/daemon.cc b/lix/libstore/daemon.cc similarity index 100% rename from src/libstore/daemon.cc rename to lix/libstore/daemon.cc diff --git a/src/libstore/daemon.hh b/lix/libstore/daemon.hh similarity index 100% rename from src/libstore/daemon.hh rename to lix/libstore/daemon.hh diff --git a/src/libstore/derivations.cc b/lix/libstore/derivations.cc similarity index 100% rename from src/libstore/derivations.cc rename to lix/libstore/derivations.cc diff --git a/src/libstore/derivations.hh b/lix/libstore/derivations.hh similarity index 100% rename from src/libstore/derivations.hh rename to lix/libstore/derivations.hh diff --git a/src/libstore/derived-path-map.cc b/lix/libstore/derived-path-map.cc similarity index 100% rename from src/libstore/derived-path-map.cc rename to lix/libstore/derived-path-map.cc diff --git a/src/libstore/derived-path-map.hh b/lix/libstore/derived-path-map.hh similarity index 100% rename from src/libstore/derived-path-map.hh rename to lix/libstore/derived-path-map.hh diff --git a/src/libstore/derived-path.cc b/lix/libstore/derived-path.cc similarity index 100% rename from src/libstore/derived-path.cc rename to lix/libstore/derived-path.cc diff --git a/src/libstore/derived-path.hh b/lix/libstore/derived-path.hh similarity index 100% rename from src/libstore/derived-path.hh rename to lix/libstore/derived-path.hh diff --git a/src/libstore/downstream-placeholder.cc b/lix/libstore/downstream-placeholder.cc similarity index 100% rename from src/libstore/downstream-placeholder.cc rename to lix/libstore/downstream-placeholder.cc diff --git a/src/libstore/downstream-placeholder.hh b/lix/libstore/downstream-placeholder.hh similarity index 100% rename from src/libstore/downstream-placeholder.hh rename to lix/libstore/downstream-placeholder.hh diff --git a/src/libstore/dummy-store.cc b/lix/libstore/dummy-store.cc similarity index 100% rename from src/libstore/dummy-store.cc rename to lix/libstore/dummy-store.cc diff --git a/src/libstore/dummy-store.hh b/lix/libstore/dummy-store.hh similarity index 100% rename from src/libstore/dummy-store.hh rename to lix/libstore/dummy-store.hh diff --git a/src/libstore/dummy-store.md b/lix/libstore/dummy-store.md similarity index 100% rename from src/libstore/dummy-store.md rename to lix/libstore/dummy-store.md diff --git a/src/libstore/export-import.cc b/lix/libstore/export-import.cc similarity index 100% rename from src/libstore/export-import.cc rename to lix/libstore/export-import.cc diff --git a/src/libstore/file-transfer-settings/connect-timeout.md b/lix/libstore/file-transfer-settings/connect-timeout.md similarity index 100% rename from src/libstore/file-transfer-settings/connect-timeout.md rename to lix/libstore/file-transfer-settings/connect-timeout.md diff --git a/src/libstore/file-transfer-settings/download-attempts.md b/lix/libstore/file-transfer-settings/download-attempts.md similarity index 100% rename from src/libstore/file-transfer-settings/download-attempts.md rename to lix/libstore/file-transfer-settings/download-attempts.md diff --git a/src/libstore/file-transfer-settings/http-connections.md b/lix/libstore/file-transfer-settings/http-connections.md similarity index 100% rename from src/libstore/file-transfer-settings/http-connections.md rename to lix/libstore/file-transfer-settings/http-connections.md diff --git a/src/libstore/file-transfer-settings/http2.md b/lix/libstore/file-transfer-settings/http2.md similarity index 100% rename from src/libstore/file-transfer-settings/http2.md rename to lix/libstore/file-transfer-settings/http2.md diff --git a/src/libstore/file-transfer-settings/stalled-download-timeout.md b/lix/libstore/file-transfer-settings/stalled-download-timeout.md similarity index 100% rename from src/libstore/file-transfer-settings/stalled-download-timeout.md rename to lix/libstore/file-transfer-settings/stalled-download-timeout.md diff --git a/src/libstore/file-transfer-settings/user-agent-suffix.md b/lix/libstore/file-transfer-settings/user-agent-suffix.md similarity index 100% rename from src/libstore/file-transfer-settings/user-agent-suffix.md rename to lix/libstore/file-transfer-settings/user-agent-suffix.md diff --git a/src/libstore/filetransfer.cc b/lix/libstore/filetransfer.cc similarity index 100% rename from src/libstore/filetransfer.cc rename to lix/libstore/filetransfer.cc diff --git a/src/libstore/filetransfer.hh b/lix/libstore/filetransfer.hh similarity index 100% rename from src/libstore/filetransfer.hh rename to lix/libstore/filetransfer.hh diff --git a/src/libstore/fs-accessor.hh b/lix/libstore/fs-accessor.hh similarity index 100% rename from src/libstore/fs-accessor.hh rename to lix/libstore/fs-accessor.hh diff --git a/src/libstore/gc-store.hh b/lix/libstore/gc-store.hh similarity index 100% rename from src/libstore/gc-store.hh rename to lix/libstore/gc-store.hh diff --git a/src/libstore/gc.cc b/lix/libstore/gc.cc similarity index 99% rename from src/libstore/gc.cc rename to lix/libstore/gc.cc index b3f5250f7..fa79b43cf 100644 --- a/src/libstore/gc.cc +++ b/lix/libstore/gc.cc @@ -326,7 +326,7 @@ void LocalStore::findPlatformRoots(UncheckedRoots & unchecked) { // N.B. This is (read: undertested!) fallback code only used for // non-Darwin, non-Linux platforms. Both major platforms have - // platform-specific code in src/libstore/platform/ + // platform-specific code in lix/libstore/platform/ try { std::regex lsofRegex(R"(^n(/.*)$)"); auto lsofLines = diff --git a/src/libstore/globals.cc b/lix/libstore/globals.cc similarity index 100% rename from src/libstore/globals.cc rename to lix/libstore/globals.cc diff --git a/src/libstore/globals.hh b/lix/libstore/globals.hh similarity index 100% rename from src/libstore/globals.hh rename to lix/libstore/globals.hh diff --git a/src/libstore/http-binary-cache-store.cc b/lix/libstore/http-binary-cache-store.cc similarity index 100% rename from src/libstore/http-binary-cache-store.cc rename to lix/libstore/http-binary-cache-store.cc diff --git a/src/libstore/http-binary-cache-store.hh b/lix/libstore/http-binary-cache-store.hh similarity index 100% rename from src/libstore/http-binary-cache-store.hh rename to lix/libstore/http-binary-cache-store.hh diff --git a/src/libstore/http-binary-cache-store.md b/lix/libstore/http-binary-cache-store.md similarity index 100% rename from src/libstore/http-binary-cache-store.md rename to lix/libstore/http-binary-cache-store.md diff --git a/src/libstore/indirect-root-store.hh b/lix/libstore/indirect-root-store.hh similarity index 100% rename from src/libstore/indirect-root-store.hh rename to lix/libstore/indirect-root-store.hh diff --git a/src/libstore/legacy-ssh-store.cc b/lix/libstore/legacy-ssh-store.cc similarity index 100% rename from src/libstore/legacy-ssh-store.cc rename to lix/libstore/legacy-ssh-store.cc diff --git a/src/libstore/legacy-ssh-store.hh b/lix/libstore/legacy-ssh-store.hh similarity index 100% rename from src/libstore/legacy-ssh-store.hh rename to lix/libstore/legacy-ssh-store.hh diff --git a/src/libstore/legacy-ssh-store.md b/lix/libstore/legacy-ssh-store.md similarity index 100% rename from src/libstore/legacy-ssh-store.md rename to lix/libstore/legacy-ssh-store.md diff --git a/src/libstore/length-prefixed-protocol-helper.hh b/lix/libstore/length-prefixed-protocol-helper.hh similarity index 100% rename from src/libstore/length-prefixed-protocol-helper.hh rename to lix/libstore/length-prefixed-protocol-helper.hh diff --git a/src/libstore/lix-store.pc.in b/lix/libstore/lix-store.pc.in similarity index 100% rename from src/libstore/lix-store.pc.in rename to lix/libstore/lix-store.pc.in diff --git a/src/libstore/local-binary-cache-store.cc b/lix/libstore/local-binary-cache-store.cc similarity index 100% rename from src/libstore/local-binary-cache-store.cc rename to lix/libstore/local-binary-cache-store.cc diff --git a/src/libstore/local-binary-cache-store.hh b/lix/libstore/local-binary-cache-store.hh similarity index 100% rename from src/libstore/local-binary-cache-store.hh rename to lix/libstore/local-binary-cache-store.hh diff --git a/src/libstore/local-binary-cache-store.md b/lix/libstore/local-binary-cache-store.md similarity index 100% rename from src/libstore/local-binary-cache-store.md rename to lix/libstore/local-binary-cache-store.md diff --git a/src/libstore/local-fs-store.cc b/lix/libstore/local-fs-store.cc similarity index 100% rename from src/libstore/local-fs-store.cc rename to lix/libstore/local-fs-store.cc diff --git a/src/libstore/local-fs-store.hh b/lix/libstore/local-fs-store.hh similarity index 100% rename from src/libstore/local-fs-store.hh rename to lix/libstore/local-fs-store.hh diff --git a/src/libstore/local-store.cc b/lix/libstore/local-store.cc similarity index 100% rename from src/libstore/local-store.cc rename to lix/libstore/local-store.cc diff --git a/src/libstore/local-store.hh b/lix/libstore/local-store.hh similarity index 100% rename from src/libstore/local-store.hh rename to lix/libstore/local-store.hh diff --git a/src/libstore/local-store.md b/lix/libstore/local-store.md similarity index 100% rename from src/libstore/local-store.md rename to lix/libstore/local-store.md diff --git a/src/libstore/lock.cc b/lix/libstore/lock.cc similarity index 100% rename from src/libstore/lock.cc rename to lix/libstore/lock.cc diff --git a/src/libstore/lock.hh b/lix/libstore/lock.hh similarity index 100% rename from src/libstore/lock.hh rename to lix/libstore/lock.hh diff --git a/src/libstore/log-store.cc b/lix/libstore/log-store.cc similarity index 100% rename from src/libstore/log-store.cc rename to lix/libstore/log-store.cc diff --git a/src/libstore/log-store.hh b/lix/libstore/log-store.hh similarity index 100% rename from src/libstore/log-store.hh rename to lix/libstore/log-store.hh diff --git a/src/libstore/machines.cc b/lix/libstore/machines.cc similarity index 100% rename from src/libstore/machines.cc rename to lix/libstore/machines.cc diff --git a/src/libstore/machines.hh b/lix/libstore/machines.hh similarity index 100% rename from src/libstore/machines.hh rename to lix/libstore/machines.hh diff --git a/src/libstore/make-content-addressed.cc b/lix/libstore/make-content-addressed.cc similarity index 100% rename from src/libstore/make-content-addressed.cc rename to lix/libstore/make-content-addressed.cc diff --git a/src/libstore/make-content-addressed.hh b/lix/libstore/make-content-addressed.hh similarity index 100% rename from src/libstore/make-content-addressed.hh rename to lix/libstore/make-content-addressed.hh diff --git a/src/libstore/meson.build b/lix/libstore/meson.build similarity index 96% rename from src/libstore/meson.build rename to lix/libstore/meson.build index 207d9c8d9..be4b3bea1 100644 --- a/src/libstore/meson.build +++ b/lix/libstore/meson.build @@ -41,10 +41,10 @@ file_transfer_setting_definitions = files( libstore_settings_headers += custom_target( command : [ python.full_path(), - '@SOURCE_ROOT@/src/code-generation/build_settings.py', + '@SOURCE_ROOT@/lix/code-generation/build_settings.py', '--kernel', host_machine.system(), '--header', '@OUTPUT@', - '--experimental-features', '@SOURCE_ROOT@/src/libutil/experimental-features', + '--experimental-features', '@SOURCE_ROOT@/lix/libutil/experimental-features', '@INPUT@', ], input : file_transfer_setting_definitions, @@ -130,10 +130,10 @@ libstore_setting_definitions = files( libstore_settings_headers += custom_target( command : [ python.full_path(), - '@SOURCE_ROOT@/src/code-generation/build_settings.py', + '@SOURCE_ROOT@/lix/code-generation/build_settings.py', '--kernel', host_machine.system(), '--header', '@OUTPUT@', - '--experimental-features', '@SOURCE_ROOT@/src/libutil/experimental-features', + '--experimental-features', '@SOURCE_ROOT@/lix/libutil/experimental-features', '@INPUT@', ], input : libstore_setting_definitions, @@ -349,7 +349,7 @@ libstore = library( libstore_sources, libstore_settings_headers, libstore_generated_headers, - include_directories : [ '../include' ], + include_directories : [ '../..' ], dependencies : dependencies, cpp_args : cpp_args, cpp_pch : cpp_pch, @@ -362,7 +362,7 @@ install_headers(libstore_headers, subdir : 'lix/libstore', preserve_path : true) # Used by libfetchers. liblixstore = declare_dependency( - include_directories : include_directories('../include'), + include_directories : include_directories('../..'), sources : libstore_settings_headers, link_with : libstore, ) @@ -370,7 +370,7 @@ liblixstore = declare_dependency( # FIXME: remove when https://git.lix.systems/lix-project/lix/issues/359 is fixed. if is_static liblixstore_mstatic = declare_dependency( - include_directories : include_directories('../include'), + include_directories : include_directories('../..'), sources : libstore_settings_headers, link_whole : libstore, ) diff --git a/src/libstore/misc.cc b/lix/libstore/misc.cc similarity index 100% rename from src/libstore/misc.cc rename to lix/libstore/misc.cc diff --git a/src/libstore/names.cc b/lix/libstore/names.cc similarity index 100% rename from src/libstore/names.cc rename to lix/libstore/names.cc diff --git a/src/libstore/names.hh b/lix/libstore/names.hh similarity index 100% rename from src/libstore/names.hh rename to lix/libstore/names.hh diff --git a/src/libstore/nar-accessor.cc b/lix/libstore/nar-accessor.cc similarity index 100% rename from src/libstore/nar-accessor.cc rename to lix/libstore/nar-accessor.cc diff --git a/src/libstore/nar-accessor.hh b/lix/libstore/nar-accessor.hh similarity index 100% rename from src/libstore/nar-accessor.hh rename to lix/libstore/nar-accessor.hh diff --git a/src/libstore/nar-info-disk-cache.cc b/lix/libstore/nar-info-disk-cache.cc similarity index 100% rename from src/libstore/nar-info-disk-cache.cc rename to lix/libstore/nar-info-disk-cache.cc diff --git a/src/libstore/nar-info-disk-cache.hh b/lix/libstore/nar-info-disk-cache.hh similarity index 100% rename from src/libstore/nar-info-disk-cache.hh rename to lix/libstore/nar-info-disk-cache.hh diff --git a/src/libstore/nar-info.cc b/lix/libstore/nar-info.cc similarity index 100% rename from src/libstore/nar-info.cc rename to lix/libstore/nar-info.cc diff --git a/src/libstore/nar-info.hh b/lix/libstore/nar-info.hh similarity index 100% rename from src/libstore/nar-info.hh rename to lix/libstore/nar-info.hh diff --git a/src/libstore/optimise-store.cc b/lix/libstore/optimise-store.cc similarity index 100% rename from src/libstore/optimise-store.cc rename to lix/libstore/optimise-store.cc diff --git a/src/libstore/outputs-spec.cc b/lix/libstore/outputs-spec.cc similarity index 100% rename from src/libstore/outputs-spec.cc rename to lix/libstore/outputs-spec.cc diff --git a/src/libstore/outputs-spec.hh b/lix/libstore/outputs-spec.hh similarity index 100% rename from src/libstore/outputs-spec.hh rename to lix/libstore/outputs-spec.hh diff --git a/src/libstore/parsed-derivations.cc b/lix/libstore/parsed-derivations.cc similarity index 100% rename from src/libstore/parsed-derivations.cc rename to lix/libstore/parsed-derivations.cc diff --git a/src/libstore/parsed-derivations.hh b/lix/libstore/parsed-derivations.hh similarity index 100% rename from src/libstore/parsed-derivations.hh rename to lix/libstore/parsed-derivations.hh diff --git a/src/libstore/path-info.cc b/lix/libstore/path-info.cc similarity index 100% rename from src/libstore/path-info.cc rename to lix/libstore/path-info.cc diff --git a/src/libstore/path-info.hh b/lix/libstore/path-info.hh similarity index 100% rename from src/libstore/path-info.hh rename to lix/libstore/path-info.hh diff --git a/src/libstore/path-references.cc b/lix/libstore/path-references.cc similarity index 100% rename from src/libstore/path-references.cc rename to lix/libstore/path-references.cc diff --git a/src/libstore/path-references.hh b/lix/libstore/path-references.hh similarity index 100% rename from src/libstore/path-references.hh rename to lix/libstore/path-references.hh diff --git a/src/libstore/path-regex.hh b/lix/libstore/path-regex.hh similarity index 100% rename from src/libstore/path-regex.hh rename to lix/libstore/path-regex.hh diff --git a/src/libstore/path-with-outputs.cc b/lix/libstore/path-with-outputs.cc similarity index 100% rename from src/libstore/path-with-outputs.cc rename to lix/libstore/path-with-outputs.cc diff --git a/src/libstore/path-with-outputs.hh b/lix/libstore/path-with-outputs.hh similarity index 100% rename from src/libstore/path-with-outputs.hh rename to lix/libstore/path-with-outputs.hh diff --git a/src/libstore/path.cc b/lix/libstore/path.cc similarity index 100% rename from src/libstore/path.cc rename to lix/libstore/path.cc diff --git a/src/libstore/path.hh b/lix/libstore/path.hh similarity index 100% rename from src/libstore/path.hh rename to lix/libstore/path.hh diff --git a/src/libstore/pathlocks.cc b/lix/libstore/pathlocks.cc similarity index 100% rename from src/libstore/pathlocks.cc rename to lix/libstore/pathlocks.cc diff --git a/src/libstore/pathlocks.hh b/lix/libstore/pathlocks.hh similarity index 100% rename from src/libstore/pathlocks.hh rename to lix/libstore/pathlocks.hh diff --git a/src/libstore/platform.cc b/lix/libstore/platform.cc similarity index 100% rename from src/libstore/platform.cc rename to lix/libstore/platform.cc diff --git a/src/libstore/platform/darwin.cc b/lix/libstore/platform/darwin.cc similarity index 100% rename from src/libstore/platform/darwin.cc rename to lix/libstore/platform/darwin.cc diff --git a/src/libstore/platform/darwin.hh b/lix/libstore/platform/darwin.hh similarity index 100% rename from src/libstore/platform/darwin.hh rename to lix/libstore/platform/darwin.hh diff --git a/src/libstore/platform/fallback.cc b/lix/libstore/platform/fallback.cc similarity index 100% rename from src/libstore/platform/fallback.cc rename to lix/libstore/platform/fallback.cc diff --git a/src/libstore/platform/fallback.hh b/lix/libstore/platform/fallback.hh similarity index 100% rename from src/libstore/platform/fallback.hh rename to lix/libstore/platform/fallback.hh diff --git a/src/libstore/platform/freebsd.cc b/lix/libstore/platform/freebsd.cc similarity index 100% rename from src/libstore/platform/freebsd.cc rename to lix/libstore/platform/freebsd.cc diff --git a/src/libstore/platform/freebsd.hh b/lix/libstore/platform/freebsd.hh similarity index 100% rename from src/libstore/platform/freebsd.hh rename to lix/libstore/platform/freebsd.hh diff --git a/src/libstore/platform/linux.cc b/lix/libstore/platform/linux.cc similarity index 100% rename from src/libstore/platform/linux.cc rename to lix/libstore/platform/linux.cc diff --git a/src/libstore/platform/linux.hh b/lix/libstore/platform/linux.hh similarity index 100% rename from src/libstore/platform/linux.hh rename to lix/libstore/platform/linux.hh diff --git a/src/libstore/profiles.cc b/lix/libstore/profiles.cc similarity index 100% rename from src/libstore/profiles.cc rename to lix/libstore/profiles.cc diff --git a/src/libstore/profiles.hh b/lix/libstore/profiles.hh similarity index 100% rename from src/libstore/profiles.hh rename to lix/libstore/profiles.hh diff --git a/src/libstore/realisation.cc b/lix/libstore/realisation.cc similarity index 100% rename from src/libstore/realisation.cc rename to lix/libstore/realisation.cc diff --git a/src/libstore/realisation.hh b/lix/libstore/realisation.hh similarity index 100% rename from src/libstore/realisation.hh rename to lix/libstore/realisation.hh diff --git a/src/libstore/remote-fs-accessor.cc b/lix/libstore/remote-fs-accessor.cc similarity index 100% rename from src/libstore/remote-fs-accessor.cc rename to lix/libstore/remote-fs-accessor.cc diff --git a/src/libstore/remote-fs-accessor.hh b/lix/libstore/remote-fs-accessor.hh similarity index 100% rename from src/libstore/remote-fs-accessor.hh rename to lix/libstore/remote-fs-accessor.hh diff --git a/src/libstore/remote-store-connection.hh b/lix/libstore/remote-store-connection.hh similarity index 100% rename from src/libstore/remote-store-connection.hh rename to lix/libstore/remote-store-connection.hh diff --git a/src/libstore/remote-store.cc b/lix/libstore/remote-store.cc similarity index 100% rename from src/libstore/remote-store.cc rename to lix/libstore/remote-store.cc diff --git a/src/libstore/remote-store.hh b/lix/libstore/remote-store.hh similarity index 100% rename from src/libstore/remote-store.hh rename to lix/libstore/remote-store.hh diff --git a/src/libstore/s3-binary-cache-store.cc b/lix/libstore/s3-binary-cache-store.cc similarity index 100% rename from src/libstore/s3-binary-cache-store.cc rename to lix/libstore/s3-binary-cache-store.cc diff --git a/src/libstore/s3-binary-cache-store.hh b/lix/libstore/s3-binary-cache-store.hh similarity index 100% rename from src/libstore/s3-binary-cache-store.hh rename to lix/libstore/s3-binary-cache-store.hh diff --git a/src/libstore/s3-binary-cache-store.md b/lix/libstore/s3-binary-cache-store.md similarity index 100% rename from src/libstore/s3-binary-cache-store.md rename to lix/libstore/s3-binary-cache-store.md diff --git a/src/libstore/s3.hh b/lix/libstore/s3.hh similarity index 100% rename from src/libstore/s3.hh rename to lix/libstore/s3.hh diff --git a/src/libstore/schema.sql b/lix/libstore/schema.sql similarity index 100% rename from src/libstore/schema.sql rename to lix/libstore/schema.sql diff --git a/src/libstore/serve-protocol-impl.hh b/lix/libstore/serve-protocol-impl.hh similarity index 100% rename from src/libstore/serve-protocol-impl.hh rename to lix/libstore/serve-protocol-impl.hh diff --git a/src/libstore/serve-protocol.cc b/lix/libstore/serve-protocol.cc similarity index 100% rename from src/libstore/serve-protocol.cc rename to lix/libstore/serve-protocol.cc diff --git a/src/libstore/serve-protocol.hh b/lix/libstore/serve-protocol.hh similarity index 100% rename from src/libstore/serve-protocol.hh rename to lix/libstore/serve-protocol.hh diff --git a/src/libstore/settings/allow-symlinked-store.md b/lix/libstore/settings/allow-symlinked-store.md similarity index 100% rename from src/libstore/settings/allow-symlinked-store.md rename to lix/libstore/settings/allow-symlinked-store.md diff --git a/src/libstore/settings/allowed-impure-host-deps.md b/lix/libstore/settings/allowed-impure-host-deps.md similarity index 100% rename from src/libstore/settings/allowed-impure-host-deps.md rename to lix/libstore/settings/allowed-impure-host-deps.md diff --git a/src/libstore/settings/always-allow-substitutes.md b/lix/libstore/settings/always-allow-substitutes.md similarity index 100% rename from src/libstore/settings/always-allow-substitutes.md rename to lix/libstore/settings/always-allow-substitutes.md diff --git a/src/libstore/settings/auto-allocate-uids.md b/lix/libstore/settings/auto-allocate-uids.md similarity index 100% rename from src/libstore/settings/auto-allocate-uids.md rename to lix/libstore/settings/auto-allocate-uids.md diff --git a/src/libstore/settings/auto-optimise-store.md b/lix/libstore/settings/auto-optimise-store.md similarity index 100% rename from src/libstore/settings/auto-optimise-store.md rename to lix/libstore/settings/auto-optimise-store.md diff --git a/src/libstore/settings/build-dir.md b/lix/libstore/settings/build-dir.md similarity index 100% rename from src/libstore/settings/build-dir.md rename to lix/libstore/settings/build-dir.md diff --git a/src/libstore/settings/build-hook.md b/lix/libstore/settings/build-hook.md similarity index 100% rename from src/libstore/settings/build-hook.md rename to lix/libstore/settings/build-hook.md diff --git a/src/libstore/settings/build-poll-interval.md b/lix/libstore/settings/build-poll-interval.md similarity index 100% rename from src/libstore/settings/build-poll-interval.md rename to lix/libstore/settings/build-poll-interval.md diff --git a/src/libstore/settings/build-users-group.md b/lix/libstore/settings/build-users-group.md similarity index 100% rename from src/libstore/settings/build-users-group.md rename to lix/libstore/settings/build-users-group.md diff --git a/src/libstore/settings/builders-use-substitutes.md b/lix/libstore/settings/builders-use-substitutes.md similarity index 100% rename from src/libstore/settings/builders-use-substitutes.md rename to lix/libstore/settings/builders-use-substitutes.md diff --git a/src/libstore/settings/builders.md b/lix/libstore/settings/builders.md similarity index 100% rename from src/libstore/settings/builders.md rename to lix/libstore/settings/builders.md diff --git a/src/libstore/settings/compress-build-log.md b/lix/libstore/settings/compress-build-log.md similarity index 100% rename from src/libstore/settings/compress-build-log.md rename to lix/libstore/settings/compress-build-log.md diff --git a/src/libstore/settings/cores.md b/lix/libstore/settings/cores.md similarity index 100% rename from src/libstore/settings/cores.md rename to lix/libstore/settings/cores.md diff --git a/src/libstore/settings/darwin-log-sandbox-violations.md b/lix/libstore/settings/darwin-log-sandbox-violations.md similarity index 100% rename from src/libstore/settings/darwin-log-sandbox-violations.md rename to lix/libstore/settings/darwin-log-sandbox-violations.md diff --git a/src/libstore/settings/diff-hook.md b/lix/libstore/settings/diff-hook.md similarity index 100% rename from src/libstore/settings/diff-hook.md rename to lix/libstore/settings/diff-hook.md diff --git a/src/libstore/settings/download-speed.md b/lix/libstore/settings/download-speed.md similarity index 100% rename from src/libstore/settings/download-speed.md rename to lix/libstore/settings/download-speed.md diff --git a/src/libstore/settings/enable-core-dumps.md b/lix/libstore/settings/enable-core-dumps.md similarity index 100% rename from src/libstore/settings/enable-core-dumps.md rename to lix/libstore/settings/enable-core-dumps.md diff --git a/src/libstore/settings/extra-platforms.md b/lix/libstore/settings/extra-platforms.md similarity index 100% rename from src/libstore/settings/extra-platforms.md rename to lix/libstore/settings/extra-platforms.md diff --git a/src/libstore/settings/fallback.md b/lix/libstore/settings/fallback.md similarity index 100% rename from src/libstore/settings/fallback.md rename to lix/libstore/settings/fallback.md diff --git a/src/libstore/settings/fsync-metadata.md b/lix/libstore/settings/fsync-metadata.md similarity index 100% rename from src/libstore/settings/fsync-metadata.md rename to lix/libstore/settings/fsync-metadata.md diff --git a/src/libstore/settings/gc-reserved-space.md b/lix/libstore/settings/gc-reserved-space.md similarity index 100% rename from src/libstore/settings/gc-reserved-space.md rename to lix/libstore/settings/gc-reserved-space.md diff --git a/src/libstore/settings/hashed-mirrors.md b/lix/libstore/settings/hashed-mirrors.md similarity index 100% rename from src/libstore/settings/hashed-mirrors.md rename to lix/libstore/settings/hashed-mirrors.md diff --git a/src/libstore/settings/id-count.md b/lix/libstore/settings/id-count.md similarity index 100% rename from src/libstore/settings/id-count.md rename to lix/libstore/settings/id-count.md diff --git a/src/libstore/settings/ignored-acls.md b/lix/libstore/settings/ignored-acls.md similarity index 100% rename from src/libstore/settings/ignored-acls.md rename to lix/libstore/settings/ignored-acls.md diff --git a/src/libstore/settings/impersonate-linux-26.md b/lix/libstore/settings/impersonate-linux-26.md similarity index 100% rename from src/libstore/settings/impersonate-linux-26.md rename to lix/libstore/settings/impersonate-linux-26.md diff --git a/src/libstore/settings/keep-build-log.md b/lix/libstore/settings/keep-build-log.md similarity index 100% rename from src/libstore/settings/keep-build-log.md rename to lix/libstore/settings/keep-build-log.md diff --git a/src/libstore/settings/keep-derivations.md b/lix/libstore/settings/keep-derivations.md similarity index 100% rename from src/libstore/settings/keep-derivations.md rename to lix/libstore/settings/keep-derivations.md diff --git a/src/libstore/settings/keep-env-derivations.md b/lix/libstore/settings/keep-env-derivations.md similarity index 100% rename from src/libstore/settings/keep-env-derivations.md rename to lix/libstore/settings/keep-env-derivations.md diff --git a/src/libstore/settings/keep-failed.md b/lix/libstore/settings/keep-failed.md similarity index 100% rename from src/libstore/settings/keep-failed.md rename to lix/libstore/settings/keep-failed.md diff --git a/src/libstore/settings/keep-going.md b/lix/libstore/settings/keep-going.md similarity index 100% rename from src/libstore/settings/keep-going.md rename to lix/libstore/settings/keep-going.md diff --git a/src/libstore/settings/keep-outputs.md b/lix/libstore/settings/keep-outputs.md similarity index 100% rename from src/libstore/settings/keep-outputs.md rename to lix/libstore/settings/keep-outputs.md diff --git a/src/libstore/settings/log-lines.md b/lix/libstore/settings/log-lines.md similarity index 100% rename from src/libstore/settings/log-lines.md rename to lix/libstore/settings/log-lines.md diff --git a/src/libstore/settings/max-build-log-size.md b/lix/libstore/settings/max-build-log-size.md similarity index 100% rename from src/libstore/settings/max-build-log-size.md rename to lix/libstore/settings/max-build-log-size.md diff --git a/src/libstore/settings/max-free.md b/lix/libstore/settings/max-free.md similarity index 100% rename from src/libstore/settings/max-free.md rename to lix/libstore/settings/max-free.md diff --git a/src/libstore/settings/max-jobs.md b/lix/libstore/settings/max-jobs.md similarity index 100% rename from src/libstore/settings/max-jobs.md rename to lix/libstore/settings/max-jobs.md diff --git a/src/libstore/settings/max-silent-time.md b/lix/libstore/settings/max-silent-time.md similarity index 100% rename from src/libstore/settings/max-silent-time.md rename to lix/libstore/settings/max-silent-time.md diff --git a/src/libstore/settings/max-substitution-jobs.md b/lix/libstore/settings/max-substitution-jobs.md similarity index 100% rename from src/libstore/settings/max-substitution-jobs.md rename to lix/libstore/settings/max-substitution-jobs.md diff --git a/src/libstore/settings/min-free-check-interval.md b/lix/libstore/settings/min-free-check-interval.md similarity index 100% rename from src/libstore/settings/min-free-check-interval.md rename to lix/libstore/settings/min-free-check-interval.md diff --git a/src/libstore/settings/min-free.md b/lix/libstore/settings/min-free.md similarity index 100% rename from src/libstore/settings/min-free.md rename to lix/libstore/settings/min-free.md diff --git a/src/libstore/settings/nar-buffer-size.md b/lix/libstore/settings/nar-buffer-size.md similarity index 100% rename from src/libstore/settings/nar-buffer-size.md rename to lix/libstore/settings/nar-buffer-size.md diff --git a/src/libstore/settings/narinfo-cache-negative-ttl.md b/lix/libstore/settings/narinfo-cache-negative-ttl.md similarity index 100% rename from src/libstore/settings/narinfo-cache-negative-ttl.md rename to lix/libstore/settings/narinfo-cache-negative-ttl.md diff --git a/src/libstore/settings/narinfo-cache-positive-ttl.md b/lix/libstore/settings/narinfo-cache-positive-ttl.md similarity index 100% rename from src/libstore/settings/narinfo-cache-positive-ttl.md rename to lix/libstore/settings/narinfo-cache-positive-ttl.md diff --git a/src/libstore/settings/netrc-file.md b/lix/libstore/settings/netrc-file.md similarity index 100% rename from src/libstore/settings/netrc-file.md rename to lix/libstore/settings/netrc-file.md diff --git a/src/libstore/settings/plugin-files.md b/lix/libstore/settings/plugin-files.md similarity index 100% rename from src/libstore/settings/plugin-files.md rename to lix/libstore/settings/plugin-files.md diff --git a/src/libstore/settings/post-build-hook.md b/lix/libstore/settings/post-build-hook.md similarity index 100% rename from src/libstore/settings/post-build-hook.md rename to lix/libstore/settings/post-build-hook.md diff --git a/src/libstore/settings/pre-build-hook.md b/lix/libstore/settings/pre-build-hook.md similarity index 100% rename from src/libstore/settings/pre-build-hook.md rename to lix/libstore/settings/pre-build-hook.md diff --git a/src/libstore/settings/print-missing.md b/lix/libstore/settings/print-missing.md similarity index 100% rename from src/libstore/settings/print-missing.md rename to lix/libstore/settings/print-missing.md diff --git a/src/libstore/settings/require-drop-supplementary-groups.md b/lix/libstore/settings/require-drop-supplementary-groups.md similarity index 100% rename from src/libstore/settings/require-drop-supplementary-groups.md rename to lix/libstore/settings/require-drop-supplementary-groups.md diff --git a/src/libstore/settings/require-sigs.md b/lix/libstore/settings/require-sigs.md similarity index 100% rename from src/libstore/settings/require-sigs.md rename to lix/libstore/settings/require-sigs.md diff --git a/src/libstore/settings/run-diff-hook.md b/lix/libstore/settings/run-diff-hook.md similarity index 100% rename from src/libstore/settings/run-diff-hook.md rename to lix/libstore/settings/run-diff-hook.md diff --git a/src/libstore/settings/sandbox-build-dir.md b/lix/libstore/settings/sandbox-build-dir.md similarity index 100% rename from src/libstore/settings/sandbox-build-dir.md rename to lix/libstore/settings/sandbox-build-dir.md diff --git a/src/libstore/settings/sandbox-dev-shm-size.md b/lix/libstore/settings/sandbox-dev-shm-size.md similarity index 100% rename from src/libstore/settings/sandbox-dev-shm-size.md rename to lix/libstore/settings/sandbox-dev-shm-size.md diff --git a/src/libstore/settings/sandbox-fallback.md b/lix/libstore/settings/sandbox-fallback.md similarity index 100% rename from src/libstore/settings/sandbox-fallback.md rename to lix/libstore/settings/sandbox-fallback.md diff --git a/src/libstore/settings/sandbox-paths.md b/lix/libstore/settings/sandbox-paths.md similarity index 100% rename from src/libstore/settings/sandbox-paths.md rename to lix/libstore/settings/sandbox-paths.md diff --git a/src/libstore/settings/sandbox.md b/lix/libstore/settings/sandbox.md similarity index 100% rename from src/libstore/settings/sandbox.md rename to lix/libstore/settings/sandbox.md diff --git a/src/libstore/settings/secret-key-files.md b/lix/libstore/settings/secret-key-files.md similarity index 100% rename from src/libstore/settings/secret-key-files.md rename to lix/libstore/settings/secret-key-files.md diff --git a/src/libstore/settings/ssl-cert-file.md b/lix/libstore/settings/ssl-cert-file.md similarity index 100% rename from src/libstore/settings/ssl-cert-file.md rename to lix/libstore/settings/ssl-cert-file.md diff --git a/src/libstore/settings/start-id.md b/lix/libstore/settings/start-id.md similarity index 100% rename from src/libstore/settings/start-id.md rename to lix/libstore/settings/start-id.md diff --git a/src/libstore/settings/store.md b/lix/libstore/settings/store.md similarity index 100% rename from src/libstore/settings/store.md rename to lix/libstore/settings/store.md diff --git a/src/libstore/settings/substitute.md b/lix/libstore/settings/substitute.md similarity index 100% rename from src/libstore/settings/substitute.md rename to lix/libstore/settings/substitute.md diff --git a/src/libstore/settings/substituters.md b/lix/libstore/settings/substituters.md similarity index 100% rename from src/libstore/settings/substituters.md rename to lix/libstore/settings/substituters.md diff --git a/src/libstore/settings/sync-before-registering.md b/lix/libstore/settings/sync-before-registering.md similarity index 100% rename from src/libstore/settings/sync-before-registering.md rename to lix/libstore/settings/sync-before-registering.md diff --git a/src/libstore/settings/system-features.md b/lix/libstore/settings/system-features.md similarity index 100% rename from src/libstore/settings/system-features.md rename to lix/libstore/settings/system-features.md diff --git a/src/libstore/settings/system.md b/lix/libstore/settings/system.md similarity index 100% rename from src/libstore/settings/system.md rename to lix/libstore/settings/system.md diff --git a/src/libstore/settings/tarball-ttl.md b/lix/libstore/settings/tarball-ttl.md similarity index 100% rename from src/libstore/settings/tarball-ttl.md rename to lix/libstore/settings/tarball-ttl.md diff --git a/src/libstore/settings/temp-dir.md b/lix/libstore/settings/temp-dir.md similarity index 100% rename from src/libstore/settings/temp-dir.md rename to lix/libstore/settings/temp-dir.md diff --git a/src/libstore/settings/timeout.md b/lix/libstore/settings/timeout.md similarity index 100% rename from src/libstore/settings/timeout.md rename to lix/libstore/settings/timeout.md diff --git a/src/libstore/settings/trusted-public-keys.md b/lix/libstore/settings/trusted-public-keys.md similarity index 100% rename from src/libstore/settings/trusted-public-keys.md rename to lix/libstore/settings/trusted-public-keys.md diff --git a/src/libstore/settings/trusted-substituters.md b/lix/libstore/settings/trusted-substituters.md similarity index 100% rename from src/libstore/settings/trusted-substituters.md rename to lix/libstore/settings/trusted-substituters.md diff --git a/src/libstore/settings/use-cgroups.md b/lix/libstore/settings/use-cgroups.md similarity index 100% rename from src/libstore/settings/use-cgroups.md rename to lix/libstore/settings/use-cgroups.md diff --git a/src/libstore/settings/use-sqlite-wal.md b/lix/libstore/settings/use-sqlite-wal.md similarity index 100% rename from src/libstore/settings/use-sqlite-wal.md rename to lix/libstore/settings/use-sqlite-wal.md diff --git a/src/libstore/settings/use-xdg-base-directories.md b/lix/libstore/settings/use-xdg-base-directories.md similarity index 100% rename from src/libstore/settings/use-xdg-base-directories.md rename to lix/libstore/settings/use-xdg-base-directories.md diff --git a/src/libstore/sqlite.cc b/lix/libstore/sqlite.cc similarity index 100% rename from src/libstore/sqlite.cc rename to lix/libstore/sqlite.cc diff --git a/src/libstore/sqlite.hh b/lix/libstore/sqlite.hh similarity index 100% rename from src/libstore/sqlite.hh rename to lix/libstore/sqlite.hh diff --git a/src/libstore/ssh-store.cc b/lix/libstore/ssh-store.cc similarity index 100% rename from src/libstore/ssh-store.cc rename to lix/libstore/ssh-store.cc diff --git a/src/libstore/ssh-store.hh b/lix/libstore/ssh-store.hh similarity index 100% rename from src/libstore/ssh-store.hh rename to lix/libstore/ssh-store.hh diff --git a/src/libstore/ssh-store.md b/lix/libstore/ssh-store.md similarity index 100% rename from src/libstore/ssh-store.md rename to lix/libstore/ssh-store.md diff --git a/src/libstore/ssh.cc b/lix/libstore/ssh.cc similarity index 100% rename from src/libstore/ssh.cc rename to lix/libstore/ssh.cc diff --git a/src/libstore/ssh.hh b/lix/libstore/ssh.hh similarity index 100% rename from src/libstore/ssh.hh rename to lix/libstore/ssh.hh diff --git a/src/libstore/store-api.cc b/lix/libstore/store-api.cc similarity index 100% rename from src/libstore/store-api.cc rename to lix/libstore/store-api.cc diff --git a/src/libstore/store-api.hh b/lix/libstore/store-api.hh similarity index 100% rename from src/libstore/store-api.hh rename to lix/libstore/store-api.hh diff --git a/src/libstore/store-cast.hh b/lix/libstore/store-cast.hh similarity index 100% rename from src/libstore/store-cast.hh rename to lix/libstore/store-cast.hh diff --git a/src/libstore/temporary-dir.cc b/lix/libstore/temporary-dir.cc similarity index 100% rename from src/libstore/temporary-dir.cc rename to lix/libstore/temporary-dir.cc diff --git a/src/libstore/temporary-dir.hh b/lix/libstore/temporary-dir.hh similarity index 100% rename from src/libstore/temporary-dir.hh rename to lix/libstore/temporary-dir.hh diff --git a/src/libstore/uds-remote-store.cc b/lix/libstore/uds-remote-store.cc similarity index 100% rename from src/libstore/uds-remote-store.cc rename to lix/libstore/uds-remote-store.cc diff --git a/src/libstore/uds-remote-store.hh b/lix/libstore/uds-remote-store.hh similarity index 100% rename from src/libstore/uds-remote-store.hh rename to lix/libstore/uds-remote-store.hh diff --git a/src/libstore/uds-remote-store.md b/lix/libstore/uds-remote-store.md similarity index 100% rename from src/libstore/uds-remote-store.md rename to lix/libstore/uds-remote-store.md diff --git a/src/libstore/worker-protocol-impl.hh b/lix/libstore/worker-protocol-impl.hh similarity index 100% rename from src/libstore/worker-protocol-impl.hh rename to lix/libstore/worker-protocol-impl.hh diff --git a/src/libstore/worker-protocol.cc b/lix/libstore/worker-protocol.cc similarity index 100% rename from src/libstore/worker-protocol.cc rename to lix/libstore/worker-protocol.cc diff --git a/src/libstore/worker-protocol.hh b/lix/libstore/worker-protocol.hh similarity index 100% rename from src/libstore/worker-protocol.hh rename to lix/libstore/worker-protocol.hh diff --git a/src/libutil/abstract-setting-to-json.hh b/lix/libutil/abstract-setting-to-json.hh similarity index 100% rename from src/libutil/abstract-setting-to-json.hh rename to lix/libutil/abstract-setting-to-json.hh diff --git a/src/libutil/ansicolor.hh b/lix/libutil/ansicolor.hh similarity index 100% rename from src/libutil/ansicolor.hh rename to lix/libutil/ansicolor.hh diff --git a/src/libutil/apply-config-options.hh b/lix/libutil/apply-config-options.hh similarity index 100% rename from src/libutil/apply-config-options.hh rename to lix/libutil/apply-config-options.hh diff --git a/src/libutil/archive-settings/preallocate-contents.md b/lix/libutil/archive-settings/preallocate-contents.md similarity index 100% rename from src/libutil/archive-settings/preallocate-contents.md rename to lix/libutil/archive-settings/preallocate-contents.md diff --git a/src/libutil/archive-settings/use-case-hack.md b/lix/libutil/archive-settings/use-case-hack.md similarity index 100% rename from src/libutil/archive-settings/use-case-hack.md rename to lix/libutil/archive-settings/use-case-hack.md diff --git a/src/libutil/archive.cc b/lix/libutil/archive.cc similarity index 100% rename from src/libutil/archive.cc rename to lix/libutil/archive.cc diff --git a/src/libutil/archive.hh b/lix/libutil/archive.hh similarity index 100% rename from src/libutil/archive.hh rename to lix/libutil/archive.hh diff --git a/src/libutil/args.cc b/lix/libutil/args.cc similarity index 100% rename from src/libutil/args.cc rename to lix/libutil/args.cc diff --git a/src/libutil/args.hh b/lix/libutil/args.hh similarity index 100% rename from src/libutil/args.hh rename to lix/libutil/args.hh diff --git a/src/libutil/args/root.hh b/lix/libutil/args/root.hh similarity index 100% rename from src/libutil/args/root.hh rename to lix/libutil/args/root.hh diff --git a/src/libutil/async-collect.hh b/lix/libutil/async-collect.hh similarity index 100% rename from src/libutil/async-collect.hh rename to lix/libutil/async-collect.hh diff --git a/src/libutil/async-semaphore.hh b/lix/libutil/async-semaphore.hh similarity index 100% rename from src/libutil/async-semaphore.hh rename to lix/libutil/async-semaphore.hh diff --git a/src/libutil/backed-string-view.hh b/lix/libutil/backed-string-view.hh similarity index 100% rename from src/libutil/backed-string-view.hh rename to lix/libutil/backed-string-view.hh diff --git a/src/libutil/box_ptr.hh b/lix/libutil/box_ptr.hh similarity index 100% rename from src/libutil/box_ptr.hh rename to lix/libutil/box_ptr.hh diff --git a/src/libutil/canon-path.cc b/lix/libutil/canon-path.cc similarity index 100% rename from src/libutil/canon-path.cc rename to lix/libutil/canon-path.cc diff --git a/src/libutil/canon-path.hh b/lix/libutil/canon-path.hh similarity index 100% rename from src/libutil/canon-path.hh rename to lix/libutil/canon-path.hh diff --git a/src/libutil/cgroup.cc b/lix/libutil/cgroup.cc similarity index 100% rename from src/libutil/cgroup.cc rename to lix/libutil/cgroup.cc diff --git a/src/libutil/cgroup.hh b/lix/libutil/cgroup.hh similarity index 100% rename from src/libutil/cgroup.hh rename to lix/libutil/cgroup.hh diff --git a/src/libutil/charptr-cast.hh b/lix/libutil/charptr-cast.hh similarity index 100% rename from src/libutil/charptr-cast.hh rename to lix/libutil/charptr-cast.hh diff --git a/src/libutil/checked-arithmetic.hh b/lix/libutil/checked-arithmetic.hh similarity index 100% rename from src/libutil/checked-arithmetic.hh rename to lix/libutil/checked-arithmetic.hh diff --git a/src/libutil/chunked-vector.hh b/lix/libutil/chunked-vector.hh similarity index 100% rename from src/libutil/chunked-vector.hh rename to lix/libutil/chunked-vector.hh diff --git a/src/libutil/closure.hh b/lix/libutil/closure.hh similarity index 100% rename from src/libutil/closure.hh rename to lix/libutil/closure.hh diff --git a/src/libutil/comparator.hh b/lix/libutil/comparator.hh similarity index 100% rename from src/libutil/comparator.hh rename to lix/libutil/comparator.hh diff --git a/src/libutil/compression.cc b/lix/libutil/compression.cc similarity index 100% rename from src/libutil/compression.cc rename to lix/libutil/compression.cc diff --git a/src/libutil/compression.hh b/lix/libutil/compression.hh similarity index 100% rename from src/libutil/compression.hh rename to lix/libutil/compression.hh diff --git a/src/libutil/compute-levels.cc b/lix/libutil/compute-levels.cc similarity index 100% rename from src/libutil/compute-levels.cc rename to lix/libutil/compute-levels.cc diff --git a/src/libutil/compute-levels.hh b/lix/libutil/compute-levels.hh similarity index 100% rename from src/libutil/compute-levels.hh rename to lix/libutil/compute-levels.hh diff --git a/src/libutil/concepts.hh b/lix/libutil/concepts.hh similarity index 100% rename from src/libutil/concepts.hh rename to lix/libutil/concepts.hh diff --git a/src/libutil/config-impl.hh b/lix/libutil/config-impl.hh similarity index 100% rename from src/libutil/config-impl.hh rename to lix/libutil/config-impl.hh diff --git a/src/libutil/config.cc b/lix/libutil/config.cc similarity index 100% rename from src/libutil/config.cc rename to lix/libutil/config.cc diff --git a/src/libutil/config.hh b/lix/libutil/config.hh similarity index 100% rename from src/libutil/config.hh rename to lix/libutil/config.hh diff --git a/src/libutil/current-process.cc b/lix/libutil/current-process.cc similarity index 100% rename from src/libutil/current-process.cc rename to lix/libutil/current-process.cc diff --git a/src/libutil/current-process.hh b/lix/libutil/current-process.hh similarity index 100% rename from src/libutil/current-process.hh rename to lix/libutil/current-process.hh diff --git a/src/libutil/deprecated-features-json.hh b/lix/libutil/deprecated-features-json.hh similarity index 100% rename from src/libutil/deprecated-features-json.hh rename to lix/libutil/deprecated-features-json.hh diff --git a/src/libutil/deprecated-features.cc b/lix/libutil/deprecated-features.cc similarity index 100% rename from src/libutil/deprecated-features.cc rename to lix/libutil/deprecated-features.cc diff --git a/src/libutil/deprecated-features.hh b/lix/libutil/deprecated-features.hh similarity index 100% rename from src/libutil/deprecated-features.hh rename to lix/libutil/deprecated-features.hh diff --git a/src/libutil/deprecated-features/ancient-let.md b/lix/libutil/deprecated-features/ancient-let.md similarity index 100% rename from src/libutil/deprecated-features/ancient-let.md rename to lix/libutil/deprecated-features/ancient-let.md diff --git a/src/libutil/deprecated-features/rec-set-overrides.md b/lix/libutil/deprecated-features/rec-set-overrides.md similarity index 100% rename from src/libutil/deprecated-features/rec-set-overrides.md rename to lix/libutil/deprecated-features/rec-set-overrides.md diff --git a/src/libutil/deprecated-features/url-literals.md b/lix/libutil/deprecated-features/url-literals.md similarity index 100% rename from src/libutil/deprecated-features/url-literals.md rename to lix/libutil/deprecated-features/url-literals.md diff --git a/src/libutil/english.cc b/lix/libutil/english.cc similarity index 100% rename from src/libutil/english.cc rename to lix/libutil/english.cc diff --git a/src/libutil/english.hh b/lix/libutil/english.hh similarity index 100% rename from src/libutil/english.hh rename to lix/libutil/english.hh diff --git a/src/libutil/environment-variables.cc b/lix/libutil/environment-variables.cc similarity index 100% rename from src/libutil/environment-variables.cc rename to lix/libutil/environment-variables.cc diff --git a/src/libutil/environment-variables.hh b/lix/libutil/environment-variables.hh similarity index 100% rename from src/libutil/environment-variables.hh rename to lix/libutil/environment-variables.hh diff --git a/src/libutil/error.cc b/lix/libutil/error.cc similarity index 100% rename from src/libutil/error.cc rename to lix/libutil/error.cc diff --git a/src/libutil/error.hh b/lix/libutil/error.hh similarity index 100% rename from src/libutil/error.hh rename to lix/libutil/error.hh diff --git a/src/libutil/escape-char.cc b/lix/libutil/escape-char.cc similarity index 100% rename from src/libutil/escape-char.cc rename to lix/libutil/escape-char.cc diff --git a/src/libutil/escape-char.hh b/lix/libutil/escape-char.hh similarity index 100% rename from src/libutil/escape-char.hh rename to lix/libutil/escape-char.hh diff --git a/src/libutil/escape-string.cc b/lix/libutil/escape-string.cc similarity index 100% rename from src/libutil/escape-string.cc rename to lix/libutil/escape-string.cc diff --git a/src/libutil/escape-string.hh b/lix/libutil/escape-string.hh similarity index 100% rename from src/libutil/escape-string.hh rename to lix/libutil/escape-string.hh diff --git a/src/libutil/exit.cc b/lix/libutil/exit.cc similarity index 100% rename from src/libutil/exit.cc rename to lix/libutil/exit.cc diff --git a/src/libutil/exit.hh b/lix/libutil/exit.hh similarity index 100% rename from src/libutil/exit.hh rename to lix/libutil/exit.hh diff --git a/src/libutil/experimental-features-json.hh b/lix/libutil/experimental-features-json.hh similarity index 100% rename from src/libutil/experimental-features-json.hh rename to lix/libutil/experimental-features-json.hh diff --git a/src/libutil/experimental-features.cc b/lix/libutil/experimental-features.cc similarity index 100% rename from src/libutil/experimental-features.cc rename to lix/libutil/experimental-features.cc diff --git a/src/libutil/experimental-features.hh b/lix/libutil/experimental-features.hh similarity index 100% rename from src/libutil/experimental-features.hh rename to lix/libutil/experimental-features.hh diff --git a/src/libutil/experimental-features/auto-allocate-uids.md b/lix/libutil/experimental-features/auto-allocate-uids.md similarity index 100% rename from src/libutil/experimental-features/auto-allocate-uids.md rename to lix/libutil/experimental-features/auto-allocate-uids.md diff --git a/src/libutil/experimental-features/ca-derivations.md b/lix/libutil/experimental-features/ca-derivations.md similarity index 100% rename from src/libutil/experimental-features/ca-derivations.md rename to lix/libutil/experimental-features/ca-derivations.md diff --git a/src/libutil/experimental-features/cgroups.md b/lix/libutil/experimental-features/cgroups.md similarity index 100% rename from src/libutil/experimental-features/cgroups.md rename to lix/libutil/experimental-features/cgroups.md diff --git a/src/libutil/experimental-features/daemon-trust-override.md b/lix/libutil/experimental-features/daemon-trust-override.md similarity index 100% rename from src/libutil/experimental-features/daemon-trust-override.md rename to lix/libutil/experimental-features/daemon-trust-override.md diff --git a/src/libutil/experimental-features/dynamic-derivations.md b/lix/libutil/experimental-features/dynamic-derivations.md similarity index 100% rename from src/libutil/experimental-features/dynamic-derivations.md rename to lix/libutil/experimental-features/dynamic-derivations.md diff --git a/src/libutil/experimental-features/fetch-closure.md b/lix/libutil/experimental-features/fetch-closure.md similarity index 100% rename from src/libutil/experimental-features/fetch-closure.md rename to lix/libutil/experimental-features/fetch-closure.md diff --git a/src/libutil/experimental-features/flakes.md b/lix/libutil/experimental-features/flakes.md similarity index 100% rename from src/libutil/experimental-features/flakes.md rename to lix/libutil/experimental-features/flakes.md diff --git a/src/libutil/experimental-features/impure-derivations.md b/lix/libutil/experimental-features/impure-derivations.md similarity index 100% rename from src/libutil/experimental-features/impure-derivations.md rename to lix/libutil/experimental-features/impure-derivations.md diff --git a/src/libutil/experimental-features/nix-command.md b/lix/libutil/experimental-features/nix-command.md similarity index 100% rename from src/libutil/experimental-features/nix-command.md rename to lix/libutil/experimental-features/nix-command.md diff --git a/src/libutil/experimental-features/no-url-literals.md b/lix/libutil/experimental-features/no-url-literals.md similarity index 100% rename from src/libutil/experimental-features/no-url-literals.md rename to lix/libutil/experimental-features/no-url-literals.md diff --git a/src/libutil/experimental-features/parse-toml-timestamps.md b/lix/libutil/experimental-features/parse-toml-timestamps.md similarity index 100% rename from src/libutil/experimental-features/parse-toml-timestamps.md rename to lix/libutil/experimental-features/parse-toml-timestamps.md diff --git a/src/libutil/experimental-features/pipe-operator.md b/lix/libutil/experimental-features/pipe-operator.md similarity index 100% rename from src/libutil/experimental-features/pipe-operator.md rename to lix/libutil/experimental-features/pipe-operator.md diff --git a/src/libutil/experimental-features/read-only-local-store.md b/lix/libutil/experimental-features/read-only-local-store.md similarity index 100% rename from src/libutil/experimental-features/read-only-local-store.md rename to lix/libutil/experimental-features/read-only-local-store.md diff --git a/src/libutil/experimental-features/recursive-nix.md b/lix/libutil/experimental-features/recursive-nix.md similarity index 100% rename from src/libutil/experimental-features/recursive-nix.md rename to lix/libutil/experimental-features/recursive-nix.md diff --git a/src/libutil/experimental-features/repl-automation.md b/lix/libutil/experimental-features/repl-automation.md similarity index 100% rename from src/libutil/experimental-features/repl-automation.md rename to lix/libutil/experimental-features/repl-automation.md diff --git a/src/libutil/experimental-features/repl-flake.md b/lix/libutil/experimental-features/repl-flake.md similarity index 100% rename from src/libutil/experimental-features/repl-flake.md rename to lix/libutil/experimental-features/repl-flake.md diff --git a/src/libutil/feature-settings/deprecated-features.md b/lix/libutil/feature-settings/deprecated-features.md similarity index 85% rename from src/libutil/feature-settings/deprecated-features.md rename to lix/libutil/feature-settings/deprecated-features.md index 74fe5ae35..7c25bfd37 100644 --- a/src/libutil/feature-settings/deprecated-features.md +++ b/lix/libutil/feature-settings/deprecated-features.md @@ -14,6 +14,6 @@ deprecated-features = url-literals The following deprecated feature features can be re-activated: -{{#include @generated@/../../../src/libutil/deprecated-features-shortlist.md}} +{{#include @generated@/../../../lix/libutil/deprecated-features-shortlist.md}} Deprecated features are [further documented in the manual](@docroot@/contributing/deprecated-features.md). diff --git a/src/libutil/feature-settings/experimental-features.md b/lix/libutil/feature-settings/experimental-features.md similarity index 86% rename from src/libutil/feature-settings/experimental-features.md rename to lix/libutil/feature-settings/experimental-features.md index 04871003b..c5896d14c 100644 --- a/src/libutil/feature-settings/experimental-features.md +++ b/lix/libutil/feature-settings/experimental-features.md @@ -14,6 +14,6 @@ experimental-features = nix-command flakes The following experimental features are available: -{{#include @generated@/../../../src/libutil/experimental-features-shortlist.md}} +{{#include @generated@/../../../lix/libutil/experimental-features-shortlist.md}} Experimental features are [further documented in the manual](@docroot@/contributing/experimental-features.md). diff --git a/src/libutil/file-descriptor.cc b/lix/libutil/file-descriptor.cc similarity index 100% rename from src/libutil/file-descriptor.cc rename to lix/libutil/file-descriptor.cc diff --git a/src/libutil/file-descriptor.hh b/lix/libutil/file-descriptor.hh similarity index 100% rename from src/libutil/file-descriptor.hh rename to lix/libutil/file-descriptor.hh diff --git a/src/libutil/file-system.cc b/lix/libutil/file-system.cc similarity index 100% rename from src/libutil/file-system.cc rename to lix/libutil/file-system.cc diff --git a/src/libutil/file-system.hh b/lix/libutil/file-system.hh similarity index 100% rename from src/libutil/file-system.hh rename to lix/libutil/file-system.hh diff --git a/src/libutil/finally.hh b/lix/libutil/finally.hh similarity index 100% rename from src/libutil/finally.hh rename to lix/libutil/finally.hh diff --git a/src/libutil/fmt.cc b/lix/libutil/fmt.cc similarity index 100% rename from src/libutil/fmt.cc rename to lix/libutil/fmt.cc diff --git a/src/libutil/fmt.hh b/lix/libutil/fmt.hh similarity index 100% rename from src/libutil/fmt.hh rename to lix/libutil/fmt.hh diff --git a/src/libutil/generator.hh b/lix/libutil/generator.hh similarity index 100% rename from src/libutil/generator.hh rename to lix/libutil/generator.hh diff --git a/src/libutil/git.cc b/lix/libutil/git.cc similarity index 100% rename from src/libutil/git.cc rename to lix/libutil/git.cc diff --git a/src/libutil/git.hh b/lix/libutil/git.hh similarity index 100% rename from src/libutil/git.hh rename to lix/libutil/git.hh diff --git a/src/libutil/hash.cc b/lix/libutil/hash.cc similarity index 100% rename from src/libutil/hash.cc rename to lix/libutil/hash.cc diff --git a/src/libutil/hash.hh b/lix/libutil/hash.hh similarity index 100% rename from src/libutil/hash.hh rename to lix/libutil/hash.hh diff --git a/src/libutil/hilite.cc b/lix/libutil/hilite.cc similarity index 100% rename from src/libutil/hilite.cc rename to lix/libutil/hilite.cc diff --git a/src/libutil/hilite.hh b/lix/libutil/hilite.hh similarity index 100% rename from src/libutil/hilite.hh rename to lix/libutil/hilite.hh diff --git a/src/libutil/input-accessor.hh b/lix/libutil/input-accessor.hh similarity index 100% rename from src/libutil/input-accessor.hh rename to lix/libutil/input-accessor.hh diff --git a/src/libutil/json-impls.hh b/lix/libutil/json-impls.hh similarity index 100% rename from src/libutil/json-impls.hh rename to lix/libutil/json-impls.hh diff --git a/src/libutil/json-utils.cc b/lix/libutil/json-utils.cc similarity index 100% rename from src/libutil/json-utils.cc rename to lix/libutil/json-utils.cc diff --git a/src/libutil/json-utils.hh b/lix/libutil/json-utils.hh similarity index 100% rename from src/libutil/json-utils.hh rename to lix/libutil/json-utils.hh diff --git a/src/libutil/lix-util.pc.in b/lix/libutil/lix-util.pc.in similarity index 100% rename from src/libutil/lix-util.pc.in rename to lix/libutil/lix-util.pc.in diff --git a/src/libutil/logging-json.hh b/lix/libutil/logging-json.hh similarity index 100% rename from src/libutil/logging-json.hh rename to lix/libutil/logging-json.hh diff --git a/src/libutil/logging-settings/show-trace.md b/lix/libutil/logging-settings/show-trace.md similarity index 100% rename from src/libutil/logging-settings/show-trace.md rename to lix/libutil/logging-settings/show-trace.md diff --git a/src/libutil/logging.cc b/lix/libutil/logging.cc similarity index 100% rename from src/libutil/logging.cc rename to lix/libutil/logging.cc diff --git a/src/libutil/logging.hh b/lix/libutil/logging.hh similarity index 100% rename from src/libutil/logging.hh rename to lix/libutil/logging.hh diff --git a/src/libutil/lru-cache.hh b/lix/libutil/lru-cache.hh similarity index 100% rename from src/libutil/lru-cache.hh rename to lix/libutil/lru-cache.hh diff --git a/src/libutil/meson.build b/lix/libutil/meson.build similarity index 92% rename from src/libutil/meson.build rename to lix/libutil/meson.build index 280849dff..e30e990c2 100644 --- a/src/libutil/meson.build +++ b/lix/libutil/meson.build @@ -160,7 +160,7 @@ deprecated_feature_definitions = files( experimental_features_gen = custom_target( command : [ python.full_path(), - '@SOURCE_ROOT@/src/code-generation/build_experimental_features.py', + '@SOURCE_ROOT@/lix/code-generation/build_experimental_features.py', '--header', '@OUTPUT0@', '--impl-header', '@OUTPUT1@', '--shortlist', '@OUTPUT2@', @@ -190,7 +190,7 @@ experimental_feature_descriptions_md = experimental_features_gen[3] deprecated_features_gen = custom_target( command : [ python.full_path(), - '@SOURCE_ROOT@/src/code-generation/build_experimental_features.py', + '@SOURCE_ROOT@/lix/code-generation/build_experimental_features.py', '--deprecated', '--header', '@OUTPUT0@', '--impl-header', '@OUTPUT1@', @@ -227,10 +227,10 @@ archive_setting_definitions = files( libutil_settings_headers += custom_target( command : [ python.full_path(), - '@SOURCE_ROOT@/src/code-generation/build_settings.py', + '@SOURCE_ROOT@/lix/code-generation/build_settings.py', '--kernel', host_machine.system(), '--header', '@OUTPUT@', - '--experimental-features', '@SOURCE_ROOT@/src/libutil/experimental-features', + '--experimental-features', '@SOURCE_ROOT@/lix/libutil/experimental-features', '@INPUT@', ], input : archive_setting_definitions, @@ -244,10 +244,10 @@ feature_setting_definitions = files( libutil_settings_headers += custom_target( command : [ python.full_path(), - '@SOURCE_ROOT@/src/code-generation/build_settings.py', + '@SOURCE_ROOT@/lix/code-generation/build_settings.py', '--kernel', host_machine.system(), '--header', '@OUTPUT@', - '--experimental-features', '@SOURCE_ROOT@/src/libutil/experimental-features', + '--experimental-features', '@SOURCE_ROOT@/lix/libutil/experimental-features', '@INPUT@', ], input : feature_setting_definitions, @@ -262,10 +262,10 @@ logging_setting_definitions = files( libutil_settings_headers += custom_target( command : [ python.full_path(), - '@SOURCE_ROOT@/src/code-generation/build_settings.py', + '@SOURCE_ROOT@/lix/code-generation/build_settings.py', '--kernel', host_machine.system(), '--header', '@OUTPUT@', - '--experimental-features', '@SOURCE_ROOT@/src/libutil/experimental-features', + '--experimental-features', '@SOURCE_ROOT@/lix/libutil/experimental-features', '@INPUT@', ], input : logging_setting_definitions, @@ -294,7 +294,7 @@ libutil = library( openssl, nlohmann_json, ], - include_directories : [ '../include' ], + include_directories : [ '../..' ], cpp_pch : cpp_pch, implicit_include_directories : true, install : true, @@ -318,7 +318,7 @@ configure_file( # Used by libstore and libfetchers. liblixutil = declare_dependency( - include_directories : include_directories('../include'), + include_directories : include_directories('../..'), sources : [ experimental_features_header, deprecated_features_header, @@ -330,7 +330,7 @@ liblixutil = declare_dependency( # FIXME: remove when https://git.lix.systems/lix-project/lix/issues/359 is fixed. if is_static liblixutil_mstatic = declare_dependency( - include_directories : include_directories('../include'), + include_directories : include_directories('../..'), sources : [ experimental_features_header, deprecated_features_header, diff --git a/src/libutil/monitor-fd.hh b/lix/libutil/monitor-fd.hh similarity index 100% rename from src/libutil/monitor-fd.hh rename to lix/libutil/monitor-fd.hh diff --git a/src/libutil/mount.cc b/lix/libutil/mount.cc similarity index 100% rename from src/libutil/mount.cc rename to lix/libutil/mount.cc diff --git a/src/libutil/mount.hh b/lix/libutil/mount.hh similarity index 100% rename from src/libutil/mount.hh rename to lix/libutil/mount.hh diff --git a/src/libutil/namespaces.cc b/lix/libutil/namespaces.cc similarity index 100% rename from src/libutil/namespaces.cc rename to lix/libutil/namespaces.cc diff --git a/src/libutil/namespaces.hh b/lix/libutil/namespaces.hh similarity index 100% rename from src/libutil/namespaces.hh rename to lix/libutil/namespaces.hh diff --git a/src/libutil/notifying-counter.hh b/lix/libutil/notifying-counter.hh similarity index 100% rename from src/libutil/notifying-counter.hh rename to lix/libutil/notifying-counter.hh diff --git a/src/libutil/pool.hh b/lix/libutil/pool.hh similarity index 100% rename from src/libutil/pool.hh rename to lix/libutil/pool.hh diff --git a/src/libutil/position.cc b/lix/libutil/position.cc similarity index 100% rename from src/libutil/position.cc rename to lix/libutil/position.cc diff --git a/src/libutil/position.hh b/lix/libutil/position.hh similarity index 100% rename from src/libutil/position.hh rename to lix/libutil/position.hh diff --git a/src/libutil/print-elided.cc b/lix/libutil/print-elided.cc similarity index 100% rename from src/libutil/print-elided.cc rename to lix/libutil/print-elided.cc diff --git a/src/libutil/print-elided.hh b/lix/libutil/print-elided.hh similarity index 100% rename from src/libutil/print-elided.hh rename to lix/libutil/print-elided.hh diff --git a/src/libutil/processes.cc b/lix/libutil/processes.cc similarity index 100% rename from src/libutil/processes.cc rename to lix/libutil/processes.cc diff --git a/src/libutil/processes.hh b/lix/libutil/processes.hh similarity index 100% rename from src/libutil/processes.hh rename to lix/libutil/processes.hh diff --git a/src/libutil/ref.hh b/lix/libutil/ref.hh similarity index 100% rename from src/libutil/ref.hh rename to lix/libutil/ref.hh diff --git a/src/libutil/references.cc b/lix/libutil/references.cc similarity index 100% rename from src/libutil/references.cc rename to lix/libutil/references.cc diff --git a/src/libutil/references.hh b/lix/libutil/references.hh similarity index 100% rename from src/libutil/references.hh rename to lix/libutil/references.hh diff --git a/src/libutil/regex-combinators.hh b/lix/libutil/regex-combinators.hh similarity index 100% rename from src/libutil/regex-combinators.hh rename to lix/libutil/regex-combinators.hh diff --git a/src/libutil/regex.cc b/lix/libutil/regex.cc similarity index 100% rename from src/libutil/regex.cc rename to lix/libutil/regex.cc diff --git a/src/libutil/regex.hh b/lix/libutil/regex.hh similarity index 100% rename from src/libutil/regex.hh rename to lix/libutil/regex.hh diff --git a/src/libutil/repair-flag.hh b/lix/libutil/repair-flag.hh similarity index 100% rename from src/libutil/repair-flag.hh rename to lix/libutil/repair-flag.hh diff --git a/src/libutil/result.hh b/lix/libutil/result.hh similarity index 100% rename from src/libutil/result.hh rename to lix/libutil/result.hh diff --git a/src/libutil/serialise.cc b/lix/libutil/serialise.cc similarity index 100% rename from src/libutil/serialise.cc rename to lix/libutil/serialise.cc diff --git a/src/libutil/serialise.hh b/lix/libutil/serialise.hh similarity index 100% rename from src/libutil/serialise.hh rename to lix/libutil/serialise.hh diff --git a/src/libutil/shlex.cc b/lix/libutil/shlex.cc similarity index 100% rename from src/libutil/shlex.cc rename to lix/libutil/shlex.cc diff --git a/src/libutil/shlex.hh b/lix/libutil/shlex.hh similarity index 100% rename from src/libutil/shlex.hh rename to lix/libutil/shlex.hh diff --git a/src/libutil/signals.cc b/lix/libutil/signals.cc similarity index 100% rename from src/libutil/signals.cc rename to lix/libutil/signals.cc diff --git a/src/libutil/signals.hh b/lix/libutil/signals.hh similarity index 100% rename from src/libutil/signals.hh rename to lix/libutil/signals.hh diff --git a/src/libutil/source-path.cc b/lix/libutil/source-path.cc similarity index 100% rename from src/libutil/source-path.cc rename to lix/libutil/source-path.cc diff --git a/src/libutil/source-path.hh b/lix/libutil/source-path.hh similarity index 100% rename from src/libutil/source-path.hh rename to lix/libutil/source-path.hh diff --git a/src/libutil/split.hh b/lix/libutil/split.hh similarity index 100% rename from src/libutil/split.hh rename to lix/libutil/split.hh diff --git a/src/libutil/strings.cc b/lix/libutil/strings.cc similarity index 100% rename from src/libutil/strings.cc rename to lix/libutil/strings.cc diff --git a/src/libutil/strings.hh b/lix/libutil/strings.hh similarity index 100% rename from src/libutil/strings.hh rename to lix/libutil/strings.hh diff --git a/src/libutil/suggestions.cc b/lix/libutil/suggestions.cc similarity index 100% rename from src/libutil/suggestions.cc rename to lix/libutil/suggestions.cc diff --git a/src/libutil/suggestions.hh b/lix/libutil/suggestions.hh similarity index 100% rename from src/libutil/suggestions.hh rename to lix/libutil/suggestions.hh diff --git a/src/libutil/sync.hh b/lix/libutil/sync.hh similarity index 100% rename from src/libutil/sync.hh rename to lix/libutil/sync.hh diff --git a/src/libutil/tarfile.cc b/lix/libutil/tarfile.cc similarity index 100% rename from src/libutil/tarfile.cc rename to lix/libutil/tarfile.cc diff --git a/src/libutil/tarfile.hh b/lix/libutil/tarfile.hh similarity index 100% rename from src/libutil/tarfile.hh rename to lix/libutil/tarfile.hh diff --git a/src/libutil/terminal.cc b/lix/libutil/terminal.cc similarity index 100% rename from src/libutil/terminal.cc rename to lix/libutil/terminal.cc diff --git a/src/libutil/terminal.hh b/lix/libutil/terminal.hh similarity index 100% rename from src/libutil/terminal.hh rename to lix/libutil/terminal.hh diff --git a/src/libutil/thread-name.cc b/lix/libutil/thread-name.cc similarity index 100% rename from src/libutil/thread-name.cc rename to lix/libutil/thread-name.cc diff --git a/src/libutil/thread-name.hh b/lix/libutil/thread-name.hh similarity index 100% rename from src/libutil/thread-name.hh rename to lix/libutil/thread-name.hh diff --git a/src/libutil/thread-pool.cc b/lix/libutil/thread-pool.cc similarity index 100% rename from src/libutil/thread-pool.cc rename to lix/libutil/thread-pool.cc diff --git a/src/libutil/thread-pool.hh b/lix/libutil/thread-pool.hh similarity index 100% rename from src/libutil/thread-pool.hh rename to lix/libutil/thread-pool.hh diff --git a/src/libutil/topo-sort.hh b/lix/libutil/topo-sort.hh similarity index 100% rename from src/libutil/topo-sort.hh rename to lix/libutil/topo-sort.hh diff --git a/src/libutil/types.hh b/lix/libutil/types.hh similarity index 100% rename from src/libutil/types.hh rename to lix/libutil/types.hh diff --git a/src/libutil/unix-domain-socket.cc b/lix/libutil/unix-domain-socket.cc similarity index 100% rename from src/libutil/unix-domain-socket.cc rename to lix/libutil/unix-domain-socket.cc diff --git a/src/libutil/unix-domain-socket.hh b/lix/libutil/unix-domain-socket.hh similarity index 100% rename from src/libutil/unix-domain-socket.hh rename to lix/libutil/unix-domain-socket.hh diff --git a/src/libutil/url-name.cc b/lix/libutil/url-name.cc similarity index 100% rename from src/libutil/url-name.cc rename to lix/libutil/url-name.cc diff --git a/src/libutil/url-name.hh b/lix/libutil/url-name.hh similarity index 100% rename from src/libutil/url-name.hh rename to lix/libutil/url-name.hh diff --git a/src/libutil/url-parts.hh b/lix/libutil/url-parts.hh similarity index 100% rename from src/libutil/url-parts.hh rename to lix/libutil/url-parts.hh diff --git a/src/libutil/url.cc b/lix/libutil/url.cc similarity index 100% rename from src/libutil/url.cc rename to lix/libutil/url.cc diff --git a/src/libutil/url.hh b/lix/libutil/url.hh similarity index 100% rename from src/libutil/url.hh rename to lix/libutil/url.hh diff --git a/src/libutil/users.cc b/lix/libutil/users.cc similarity index 100% rename from src/libutil/users.cc rename to lix/libutil/users.cc diff --git a/src/libutil/users.hh b/lix/libutil/users.hh similarity index 100% rename from src/libutil/users.hh rename to lix/libutil/users.hh diff --git a/src/libutil/variant-wrapper.hh b/lix/libutil/variant-wrapper.hh similarity index 100% rename from src/libutil/variant-wrapper.hh rename to lix/libutil/variant-wrapper.hh diff --git a/src/libutil/xml-writer.cc b/lix/libutil/xml-writer.cc similarity index 100% rename from src/libutil/xml-writer.cc rename to lix/libutil/xml-writer.cc diff --git a/src/libutil/xml-writer.hh b/lix/libutil/xml-writer.hh similarity index 100% rename from src/libutil/xml-writer.hh rename to lix/libutil/xml-writer.hh diff --git a/src/lix-base.pc.in b/lix/lix-base.pc.in similarity index 100% rename from src/lix-base.pc.in rename to lix/lix-base.pc.in diff --git a/src/lix-doc/.gitignore b/lix/lix-doc/.gitignore similarity index 100% rename from src/lix-doc/.gitignore rename to lix/lix-doc/.gitignore diff --git a/src/lix-doc/Cargo.toml b/lix/lix-doc/Cargo.toml similarity index 100% rename from src/lix-doc/Cargo.toml rename to lix/lix-doc/Cargo.toml diff --git a/src/lix-doc/README.md b/lix/lix-doc/README.md similarity index 100% rename from src/lix-doc/README.md rename to lix/lix-doc/README.md diff --git a/src/lix-doc/meson.build b/lix/lix-doc/meson.build similarity index 100% rename from src/lix-doc/meson.build rename to lix/lix-doc/meson.build diff --git a/src/lix-doc/package.nix b/lix/lix-doc/package.nix similarity index 100% rename from src/lix-doc/package.nix rename to lix/lix-doc/package.nix diff --git a/src/lix-doc/src/lib.rs b/lix/lix-doc/src/lib.rs similarity index 100% rename from src/lix-doc/src/lib.rs rename to lix/lix-doc/src/lib.rs diff --git a/src/lix-doc/src/pprint.rs b/lix/lix-doc/src/pprint.rs similarity index 100% rename from src/lix-doc/src/pprint.rs rename to lix/lix-doc/src/pprint.rs diff --git a/src/meson.build b/lix/meson.build similarity index 100% rename from src/meson.build rename to lix/meson.build diff --git a/src/nix/add-file.md b/lix/nix/add-file.md similarity index 100% rename from src/nix/add-file.md rename to lix/nix/add-file.md diff --git a/src/nix/add-path.md b/lix/nix/add-path.md similarity index 100% rename from src/nix/add-path.md rename to lix/nix/add-path.md diff --git a/src/nix/add-to-store.cc b/lix/nix/add-to-store.cc similarity index 100% rename from src/nix/add-to-store.cc rename to lix/nix/add-to-store.cc diff --git a/src/nix/app.cc b/lix/nix/app.cc similarity index 100% rename from src/nix/app.cc rename to lix/nix/app.cc diff --git a/src/nix/build.cc b/lix/nix/build.cc similarity index 100% rename from src/nix/build.cc rename to lix/nix/build.cc diff --git a/src/nix/build.md b/lix/nix/build.md similarity index 100% rename from src/nix/build.md rename to lix/nix/build.md diff --git a/src/nix/bundle.cc b/lix/nix/bundle.cc similarity index 100% rename from src/nix/bundle.cc rename to lix/nix/bundle.cc diff --git a/src/nix/bundle.md b/lix/nix/bundle.md similarity index 100% rename from src/nix/bundle.md rename to lix/nix/bundle.md diff --git a/src/nix/cat.cc b/lix/nix/cat.cc similarity index 100% rename from src/nix/cat.cc rename to lix/nix/cat.cc diff --git a/src/nix/config.cc b/lix/nix/config.cc similarity index 100% rename from src/nix/config.cc rename to lix/nix/config.cc diff --git a/src/nix/copy.cc b/lix/nix/copy.cc similarity index 100% rename from src/nix/copy.cc rename to lix/nix/copy.cc diff --git a/src/nix/copy.md b/lix/nix/copy.md similarity index 100% rename from src/nix/copy.md rename to lix/nix/copy.md diff --git a/src/nix/daemon-command.hh b/lix/nix/daemon-command.hh similarity index 100% rename from src/nix/daemon-command.hh rename to lix/nix/daemon-command.hh diff --git a/src/nix/daemon-settings/allowed-users.md b/lix/nix/daemon-settings/allowed-users.md similarity index 100% rename from src/nix/daemon-settings/allowed-users.md rename to lix/nix/daemon-settings/allowed-users.md diff --git a/src/nix/daemon-settings/trusted-users.md b/lix/nix/daemon-settings/trusted-users.md similarity index 100% rename from src/nix/daemon-settings/trusted-users.md rename to lix/nix/daemon-settings/trusted-users.md diff --git a/src/nix/daemon.cc b/lix/nix/daemon.cc similarity index 100% rename from src/nix/daemon.cc rename to lix/nix/daemon.cc diff --git a/src/nix/daemon.md b/lix/nix/daemon.md similarity index 100% rename from src/nix/daemon.md rename to lix/nix/daemon.md diff --git a/src/nix/derivation-add.cc b/lix/nix/derivation-add.cc similarity index 100% rename from src/nix/derivation-add.cc rename to lix/nix/derivation-add.cc diff --git a/src/nix/derivation-add.md b/lix/nix/derivation-add.md similarity index 100% rename from src/nix/derivation-add.md rename to lix/nix/derivation-add.md diff --git a/src/nix/derivation-show.cc b/lix/nix/derivation-show.cc similarity index 100% rename from src/nix/derivation-show.cc rename to lix/nix/derivation-show.cc diff --git a/src/nix/derivation-show.md b/lix/nix/derivation-show.md similarity index 100% rename from src/nix/derivation-show.md rename to lix/nix/derivation-show.md diff --git a/src/nix/derivation.cc b/lix/nix/derivation.cc similarity index 100% rename from src/nix/derivation.cc rename to lix/nix/derivation.cc diff --git a/src/nix/develop-settings/bash-prompt-prefix.md b/lix/nix/develop-settings/bash-prompt-prefix.md similarity index 100% rename from src/nix/develop-settings/bash-prompt-prefix.md rename to lix/nix/develop-settings/bash-prompt-prefix.md diff --git a/src/nix/develop-settings/bash-prompt-suffix.md b/lix/nix/develop-settings/bash-prompt-suffix.md similarity index 100% rename from src/nix/develop-settings/bash-prompt-suffix.md rename to lix/nix/develop-settings/bash-prompt-suffix.md diff --git a/src/nix/develop-settings/bash-prompt.md b/lix/nix/develop-settings/bash-prompt.md similarity index 100% rename from src/nix/develop-settings/bash-prompt.md rename to lix/nix/develop-settings/bash-prompt.md diff --git a/src/nix/develop.cc b/lix/nix/develop.cc similarity index 100% rename from src/nix/develop.cc rename to lix/nix/develop.cc diff --git a/src/nix/develop.md b/lix/nix/develop.md similarity index 100% rename from src/nix/develop.md rename to lix/nix/develop.md diff --git a/src/nix/diff-closures.cc b/lix/nix/diff-closures.cc similarity index 100% rename from src/nix/diff-closures.cc rename to lix/nix/diff-closures.cc diff --git a/src/nix/diff-closures.md b/lix/nix/diff-closures.md similarity index 100% rename from src/nix/diff-closures.md rename to lix/nix/diff-closures.md diff --git a/src/nix/doctor.cc b/lix/nix/doctor.cc similarity index 100% rename from src/nix/doctor.cc rename to lix/nix/doctor.cc diff --git a/src/nix/dump-path.cc b/lix/nix/dump-path.cc similarity index 100% rename from src/nix/dump-path.cc rename to lix/nix/dump-path.cc diff --git a/src/nix/edit.cc b/lix/nix/edit.cc similarity index 100% rename from src/nix/edit.cc rename to lix/nix/edit.cc diff --git a/src/nix/edit.md b/lix/nix/edit.md similarity index 100% rename from src/nix/edit.md rename to lix/nix/edit.md diff --git a/src/nix/eval.cc b/lix/nix/eval.cc similarity index 100% rename from src/nix/eval.cc rename to lix/nix/eval.cc diff --git a/src/nix/eval.md b/lix/nix/eval.md similarity index 100% rename from src/nix/eval.md rename to lix/nix/eval.md diff --git a/src/nix/flake-archive.md b/lix/nix/flake-archive.md similarity index 100% rename from src/nix/flake-archive.md rename to lix/nix/flake-archive.md diff --git a/src/nix/flake-check.md b/lix/nix/flake-check.md similarity index 100% rename from src/nix/flake-check.md rename to lix/nix/flake-check.md diff --git a/src/nix/flake-clone.md b/lix/nix/flake-clone.md similarity index 100% rename from src/nix/flake-clone.md rename to lix/nix/flake-clone.md diff --git a/src/nix/flake-init.md b/lix/nix/flake-init.md similarity index 100% rename from src/nix/flake-init.md rename to lix/nix/flake-init.md diff --git a/src/nix/flake-lock.md b/lix/nix/flake-lock.md similarity index 100% rename from src/nix/flake-lock.md rename to lix/nix/flake-lock.md diff --git a/src/nix/flake-metadata.md b/lix/nix/flake-metadata.md similarity index 100% rename from src/nix/flake-metadata.md rename to lix/nix/flake-metadata.md diff --git a/src/nix/flake-new.md b/lix/nix/flake-new.md similarity index 100% rename from src/nix/flake-new.md rename to lix/nix/flake-new.md diff --git a/src/nix/flake-prefetch.md b/lix/nix/flake-prefetch.md similarity index 100% rename from src/nix/flake-prefetch.md rename to lix/nix/flake-prefetch.md diff --git a/src/nix/flake-show.md b/lix/nix/flake-show.md similarity index 100% rename from src/nix/flake-show.md rename to lix/nix/flake-show.md diff --git a/src/nix/flake-update.md b/lix/nix/flake-update.md similarity index 100% rename from src/nix/flake-update.md rename to lix/nix/flake-update.md diff --git a/src/nix/flake.cc b/lix/nix/flake.cc similarity index 100% rename from src/nix/flake.cc rename to lix/nix/flake.cc diff --git a/src/nix/flake.md b/lix/nix/flake.md similarity index 100% rename from src/nix/flake.md rename to lix/nix/flake.md diff --git a/src/nix/fmt.cc b/lix/nix/fmt.cc similarity index 100% rename from src/nix/fmt.cc rename to lix/nix/fmt.cc diff --git a/src/nix/fmt.md b/lix/nix/fmt.md similarity index 100% rename from src/nix/fmt.md rename to lix/nix/fmt.md diff --git a/src/nix/get-env.sh b/lix/nix/get-env.sh similarity index 100% rename from src/nix/get-env.sh rename to lix/nix/get-env.sh diff --git a/src/nix/hash-command.hh b/lix/nix/hash-command.hh similarity index 100% rename from src/nix/hash-command.hh rename to lix/nix/hash-command.hh diff --git a/src/nix/hash.cc b/lix/nix/hash.cc similarity index 100% rename from src/nix/hash.cc rename to lix/nix/hash.cc diff --git a/src/nix/help-stores.md b/lix/nix/help-stores.md similarity index 100% rename from src/nix/help-stores.md rename to lix/nix/help-stores.md diff --git a/src/nix/help.md b/lix/nix/help.md similarity index 100% rename from src/nix/help.md rename to lix/nix/help.md diff --git a/src/nix/key-convert-secret-to-public.md b/lix/nix/key-convert-secret-to-public.md similarity index 100% rename from src/nix/key-convert-secret-to-public.md rename to lix/nix/key-convert-secret-to-public.md diff --git a/src/nix/key-generate-secret.md b/lix/nix/key-generate-secret.md similarity index 100% rename from src/nix/key-generate-secret.md rename to lix/nix/key-generate-secret.md diff --git a/src/nix/log.cc b/lix/nix/log.cc similarity index 100% rename from src/nix/log.cc rename to lix/nix/log.cc diff --git a/src/nix/log.md b/lix/nix/log.md similarity index 100% rename from src/nix/log.md rename to lix/nix/log.md diff --git a/src/nix/ls.cc b/lix/nix/ls.cc similarity index 100% rename from src/nix/ls.cc rename to lix/nix/ls.cc diff --git a/src/nix/main.cc b/lix/nix/main.cc similarity index 100% rename from src/nix/main.cc rename to lix/nix/main.cc diff --git a/src/nix/make-content-addressed.cc b/lix/nix/make-content-addressed.cc similarity index 100% rename from src/nix/make-content-addressed.cc rename to lix/nix/make-content-addressed.cc diff --git a/src/nix/make-content-addressed.md b/lix/nix/make-content-addressed.md similarity index 100% rename from src/nix/make-content-addressed.md rename to lix/nix/make-content-addressed.md diff --git a/src/nix/meson.build b/lix/nix/meson.build similarity index 92% rename from src/nix/meson.build rename to lix/nix/meson.build index 2ffe97aab..37d411cac 100644 --- a/src/nix/meson.build +++ b/lix/nix/meson.build @@ -4,7 +4,7 @@ nix_generated_headers = [ gen_header.process('get-env.sh'), ] -# src/nix/profile.cc includes src/nix/profile.md, which includes "doc/files/profiles.md.gen.hh". +# lix/nix/profile.cc includes lix/nix/profile.md, which includes "doc/files/profiles.md.gen.hh". # Unfortunately, https://github.com/mesonbuild/meson/issues/2320. # "docs/files" isn't a directory hierarchy that already exists somewhere in this source tree, # and Meson refuses to create targets with specific directory paths. @@ -32,10 +32,10 @@ daemon_setting_definitions = files( nix_settings_headers += custom_target( command : [ python.full_path(), - '@SOURCE_ROOT@/src/code-generation/build_settings.py', + '@SOURCE_ROOT@/lix/code-generation/build_settings.py', '--kernel', host_machine.system(), '--header', '@OUTPUT@', - '--experimental-features', '@SOURCE_ROOT@/src/libutil/experimental-features', + '--experimental-features', '@SOURCE_ROOT@/lix/libutil/experimental-features', '@INPUT@', ], input : daemon_setting_definitions, @@ -50,10 +50,10 @@ develop_settings_definitions = files( nix_settings_headers += custom_target( command : [ python.full_path(), - '@SOURCE_ROOT@/src/code-generation/build_settings.py', + '@SOURCE_ROOT@/lix/code-generation/build_settings.py', '--kernel', host_machine.system(), '--header', '@OUTPUT@', - '--experimental-features', '@SOURCE_ROOT@/src/libutil/experimental-features', + '--experimental-features', '@SOURCE_ROOT@/lix/libutil/experimental-features', '@INPUT@', ], input : develop_settings_definitions, diff --git a/src/nix/nar-cat.md b/lix/nix/nar-cat.md similarity index 100% rename from src/nix/nar-cat.md rename to lix/nix/nar-cat.md diff --git a/src/nix/nar-dump-path.md b/lix/nix/nar-dump-path.md similarity index 100% rename from src/nix/nar-dump-path.md rename to lix/nix/nar-dump-path.md diff --git a/src/nix/nar-ls.md b/lix/nix/nar-ls.md similarity index 100% rename from src/nix/nar-ls.md rename to lix/nix/nar-ls.md diff --git a/src/nix/nar.cc b/lix/nix/nar.cc similarity index 100% rename from src/nix/nar.cc rename to lix/nix/nar.cc diff --git a/src/nix/nar.md b/lix/nix/nar.md similarity index 100% rename from src/nix/nar.md rename to lix/nix/nar.md diff --git a/src/nix/nix.md b/lix/nix/nix.md similarity index 100% rename from src/nix/nix.md rename to lix/nix/nix.md diff --git a/src/nix/optimise-store.cc b/lix/nix/optimise-store.cc similarity index 100% rename from src/nix/optimise-store.cc rename to lix/nix/optimise-store.cc diff --git a/src/nix/optimise-store.md b/lix/nix/optimise-store.md similarity index 100% rename from src/nix/optimise-store.md rename to lix/nix/optimise-store.md diff --git a/src/nix/path-from-hash-part.cc b/lix/nix/path-from-hash-part.cc similarity index 100% rename from src/nix/path-from-hash-part.cc rename to lix/nix/path-from-hash-part.cc diff --git a/src/nix/path-from-hash-part.md b/lix/nix/path-from-hash-part.md similarity index 100% rename from src/nix/path-from-hash-part.md rename to lix/nix/path-from-hash-part.md diff --git a/src/nix/path-info.cc b/lix/nix/path-info.cc similarity index 100% rename from src/nix/path-info.cc rename to lix/nix/path-info.cc diff --git a/src/nix/path-info.md b/lix/nix/path-info.md similarity index 100% rename from src/nix/path-info.md rename to lix/nix/path-info.md diff --git a/src/nix/ping-store.cc b/lix/nix/ping-store.cc similarity index 100% rename from src/nix/ping-store.cc rename to lix/nix/ping-store.cc diff --git a/src/nix/ping-store.md b/lix/nix/ping-store.md similarity index 100% rename from src/nix/ping-store.md rename to lix/nix/ping-store.md diff --git a/src/nix/prefetch-command.hh b/lix/nix/prefetch-command.hh similarity index 100% rename from src/nix/prefetch-command.hh rename to lix/nix/prefetch-command.hh diff --git a/src/nix/prefetch.cc b/lix/nix/prefetch.cc similarity index 100% rename from src/nix/prefetch.cc rename to lix/nix/prefetch.cc diff --git a/src/nix/print-dev-env.md b/lix/nix/print-dev-env.md similarity index 100% rename from src/nix/print-dev-env.md rename to lix/nix/print-dev-env.md diff --git a/src/nix/profile-diff-closures.md b/lix/nix/profile-diff-closures.md similarity index 100% rename from src/nix/profile-diff-closures.md rename to lix/nix/profile-diff-closures.md diff --git a/src/nix/profile-history.md b/lix/nix/profile-history.md similarity index 100% rename from src/nix/profile-history.md rename to lix/nix/profile-history.md diff --git a/src/nix/profile-install.md b/lix/nix/profile-install.md similarity index 100% rename from src/nix/profile-install.md rename to lix/nix/profile-install.md diff --git a/src/nix/profile-list.md b/lix/nix/profile-list.md similarity index 100% rename from src/nix/profile-list.md rename to lix/nix/profile-list.md diff --git a/src/nix/profile-remove.md b/lix/nix/profile-remove.md similarity index 100% rename from src/nix/profile-remove.md rename to lix/nix/profile-remove.md diff --git a/src/nix/profile-rollback.md b/lix/nix/profile-rollback.md similarity index 100% rename from src/nix/profile-rollback.md rename to lix/nix/profile-rollback.md diff --git a/src/nix/profile-upgrade.md b/lix/nix/profile-upgrade.md similarity index 100% rename from src/nix/profile-upgrade.md rename to lix/nix/profile-upgrade.md diff --git a/src/nix/profile-wipe-history.md b/lix/nix/profile-wipe-history.md similarity index 100% rename from src/nix/profile-wipe-history.md rename to lix/nix/profile-wipe-history.md diff --git a/src/nix/profile.cc b/lix/nix/profile.cc similarity index 100% rename from src/nix/profile.cc rename to lix/nix/profile.cc diff --git a/src/nix/profile.md b/lix/nix/profile.md similarity index 100% rename from src/nix/profile.md rename to lix/nix/profile.md diff --git a/src/nix/realisation.cc b/lix/nix/realisation.cc similarity index 100% rename from src/nix/realisation.cc rename to lix/nix/realisation.cc diff --git a/src/nix/realisation/info.md b/lix/nix/realisation/info.md similarity index 100% rename from src/nix/realisation/info.md rename to lix/nix/realisation/info.md diff --git a/src/nix/registry-add.md b/lix/nix/registry-add.md similarity index 100% rename from src/nix/registry-add.md rename to lix/nix/registry-add.md diff --git a/src/nix/registry-list.md b/lix/nix/registry-list.md similarity index 100% rename from src/nix/registry-list.md rename to lix/nix/registry-list.md diff --git a/src/nix/registry-pin.md b/lix/nix/registry-pin.md similarity index 100% rename from src/nix/registry-pin.md rename to lix/nix/registry-pin.md diff --git a/src/nix/registry-remove.md b/lix/nix/registry-remove.md similarity index 100% rename from src/nix/registry-remove.md rename to lix/nix/registry-remove.md diff --git a/src/nix/registry.cc b/lix/nix/registry.cc similarity index 100% rename from src/nix/registry.cc rename to lix/nix/registry.cc diff --git a/src/nix/registry.md b/lix/nix/registry.md similarity index 100% rename from src/nix/registry.md rename to lix/nix/registry.md diff --git a/src/nix/repl.cc b/lix/nix/repl.cc similarity index 100% rename from src/nix/repl.cc rename to lix/nix/repl.cc diff --git a/src/nix/repl.md b/lix/nix/repl.md similarity index 100% rename from src/nix/repl.md rename to lix/nix/repl.md diff --git a/src/nix/run.cc b/lix/nix/run.cc similarity index 100% rename from src/nix/run.cc rename to lix/nix/run.cc diff --git a/src/nix/run.hh b/lix/nix/run.hh similarity index 100% rename from src/nix/run.hh rename to lix/nix/run.hh diff --git a/src/nix/run.md b/lix/nix/run.md similarity index 100% rename from src/nix/run.md rename to lix/nix/run.md diff --git a/src/nix/search.cc b/lix/nix/search.cc similarity index 100% rename from src/nix/search.cc rename to lix/nix/search.cc diff --git a/src/nix/search.md b/lix/nix/search.md similarity index 100% rename from src/nix/search.md rename to lix/nix/search.md diff --git a/src/nix/shell.md b/lix/nix/shell.md similarity index 100% rename from src/nix/shell.md rename to lix/nix/shell.md diff --git a/src/nix/sigs.cc b/lix/nix/sigs.cc similarity index 100% rename from src/nix/sigs.cc rename to lix/nix/sigs.cc diff --git a/src/nix/store-cat.md b/lix/nix/store-cat.md similarity index 100% rename from src/nix/store-cat.md rename to lix/nix/store-cat.md diff --git a/src/nix/store-copy-log.cc b/lix/nix/store-copy-log.cc similarity index 100% rename from src/nix/store-copy-log.cc rename to lix/nix/store-copy-log.cc diff --git a/src/nix/store-copy-log.md b/lix/nix/store-copy-log.md similarity index 100% rename from src/nix/store-copy-log.md rename to lix/nix/store-copy-log.md diff --git a/src/nix/store-delete.cc b/lix/nix/store-delete.cc similarity index 100% rename from src/nix/store-delete.cc rename to lix/nix/store-delete.cc diff --git a/src/nix/store-delete.md b/lix/nix/store-delete.md similarity index 100% rename from src/nix/store-delete.md rename to lix/nix/store-delete.md diff --git a/src/nix/store-dump-path.md b/lix/nix/store-dump-path.md similarity index 100% rename from src/nix/store-dump-path.md rename to lix/nix/store-dump-path.md diff --git a/src/nix/store-gc.cc b/lix/nix/store-gc.cc similarity index 100% rename from src/nix/store-gc.cc rename to lix/nix/store-gc.cc diff --git a/src/nix/store-gc.md b/lix/nix/store-gc.md similarity index 100% rename from src/nix/store-gc.md rename to lix/nix/store-gc.md diff --git a/src/nix/store-ls.md b/lix/nix/store-ls.md similarity index 100% rename from src/nix/store-ls.md rename to lix/nix/store-ls.md diff --git a/src/nix/store-prefetch-file.md b/lix/nix/store-prefetch-file.md similarity index 100% rename from src/nix/store-prefetch-file.md rename to lix/nix/store-prefetch-file.md diff --git a/src/nix/store-repair.cc b/lix/nix/store-repair.cc similarity index 100% rename from src/nix/store-repair.cc rename to lix/nix/store-repair.cc diff --git a/src/nix/store-repair.md b/lix/nix/store-repair.md similarity index 100% rename from src/nix/store-repair.md rename to lix/nix/store-repair.md diff --git a/src/nix/store.cc b/lix/nix/store.cc similarity index 100% rename from src/nix/store.cc rename to lix/nix/store.cc diff --git a/src/nix/upgrade-nix.cc b/lix/nix/upgrade-nix.cc similarity index 100% rename from src/nix/upgrade-nix.cc rename to lix/nix/upgrade-nix.cc diff --git a/src/nix/upgrade-nix.md b/lix/nix/upgrade-nix.md similarity index 100% rename from src/nix/upgrade-nix.md rename to lix/nix/upgrade-nix.md diff --git a/src/nix/verify.cc b/lix/nix/verify.cc similarity index 100% rename from src/nix/verify.cc rename to lix/nix/verify.cc diff --git a/src/nix/verify.md b/lix/nix/verify.md similarity index 100% rename from src/nix/verify.md rename to lix/nix/verify.md diff --git a/src/nix/why-depends.cc b/lix/nix/why-depends.cc similarity index 100% rename from src/nix/why-depends.cc rename to lix/nix/why-depends.cc diff --git a/src/nix/why-depends.md b/lix/nix/why-depends.md similarity index 100% rename from src/nix/why-depends.md rename to lix/nix/why-depends.md diff --git a/src/pch/precompiled-headers.hh b/lix/pch/precompiled-headers.hh similarity index 100% rename from src/pch/precompiled-headers.hh rename to lix/pch/precompiled-headers.hh diff --git a/maintainers/check-syscalls.sh b/maintainers/check-syscalls.sh index 72b629438..00c5fae90 100755 --- a/maintainers/check-syscalls.sh +++ b/maintainers/check-syscalls.sh @@ -2,6 +2,6 @@ set -e -diff -u <(awk < src/libstore/platform/linux.cc '/BEGIN extract-syscalls/ { extracting = 1; next } +diff -u <(awk < lix/libstore/platform/linux.cc '/BEGIN extract-syscalls/ { extracting = 1; next } match($0, /allowSyscall\(ctx, SCMP_SYS\(([^)]*)\)\);|\/\/ skip ([^ ]*)/, result) { print result[1] result[2] } /END extract-syscalls/ { extracting = 0; next }') <(tail -n+2 "$1" | cut -d, -f 1) diff --git a/meson.build b/meson.build index ddb463bcf..9a3967289 100644 --- a/meson.build +++ b/meson.build @@ -6,16 +6,16 @@ # like the previous, autoconf-based build system did), the mechanism for header # generation, and the few global C++ compiler arguments that are added to all targets in Lix. # -# src/meson.build coordinates each of Lix's subcomponents (the lib dirs in ./src), +# lix/meson.build coordinates each of Lix's subcomponents (the lib dirs in ./lix), # which each have their own meson.build. Lix's components depend on each other, -# so each of `src/lib{util,store,fetchers,expr,main,cmd}/meson.build` rely on variables +# so each of `lix/lib{util,store,fetchers,expr,main,cmd}/meson.build` rely on variables # set in earlier `meson.build` files. Each of these also defines the install targets for # their headers. # -# src/meson.build also collects the miscellaneous source files that are in further subdirectories -# that become part of the final Nix command (things like `src/nix-build/*.cc`). +# lix/meson.build also collects the miscellaneous source files that are in further subdirectories +# that become part of the final Nix command (things like `lix/nix-build/*.cc`). # -# Finally, src/nix/meson.build defines the Nix command itself, relying on all prior meson files. +# Finally, lix/nix/meson.build defines the Nix command itself, relying on all prior meson files. # # libstore, libexpr, and libfetchers have some special handling to make static builds work. # Their use static constructors for dynamic registration of primops, store backends, etc @@ -31,7 +31,7 @@ # is fixed. # # lix-doc is built with Meson in lix-doc/meson.build, and linked into libcmd in -# src/libcmd/meson.build. When building outside the Nix sandbox, Meson will use the .wrap +# lix/libcmd/meson.build. When building outside the Nix sandbox, Meson will use the .wrap # files in subprojects/ to download and extract the dependency crates into subprojects/. # When building inside the Nix sandbox, Lix's derivation in package.nix uses a # fixed-output derivation to fetch those crates in advance instead, and then symlinks @@ -146,7 +146,7 @@ summary('PCH C++ stdlib', should_pch, bool_yn : true) if should_pch # Unlike basically everything else that takes a file, Meson requires the arguments to # cpp_pch : to be strings and doesn't accept files(). So absolute path it is. - cpp_pch = [meson.project_source_root() / 'src/pch/precompiled-headers.hh'] + cpp_pch = [meson.project_source_root() / 'lix/pch/precompiled-headers.hh'] # Saves about 400s (30% at time of writing) from compile time on-cpu, mostly # by removing instantiations of nlohmann from every single damned compilation @@ -367,7 +367,7 @@ if enable_docs mdbook = find_program('mdbook', native : true) endif -# Used to workaround https://github.com/mesonbuild/meson/issues/2320 in src/nix/meson.build. +# Used to workaround https://github.com/mesonbuild/meson/issues/2320 in lix/nix/meson.build. installcmd = find_program('install', native : true) enable_embedded_sandbox_shell = get_option('enable-embedded-sandbox-shell') @@ -469,7 +469,7 @@ install_headers(config_h, subdir : 'lix') # FIXME: not using the pkg-config module because it creates way too many deps # while meson migration is in progress, and we want to not include boost here configure_file( - input : 'src/lix-base.pc.in', + input : 'lix/lix-base.pc.in', output : 'lix-base.pc', install_dir : libdir / 'pkgconfig', configuration : { @@ -550,11 +550,11 @@ if cxx.get_id() in ['clang', 'gcc'] # Meson uses out of source builds, conventionally usually in a subdirectory # of the source tree (e.g. meson setup ./build). This means that unlike in # the previous Make buildsystem, all compilation sources are passed as a relative - # parent, e.g. `cc -o src/libexpr/nixexpr.cc.o ../src/libexpr/nixexpr.cc`. + # parent, e.g. `cc -o lix/libexpr/nixexpr.cc.o ../lix/libexpr/nixexpr.cc`. # These paths show up when debugging, and in asserts, which look both look strange # and confuse debuggers. - # So let's just tell GCC and Clang that ../src really means src. - '-ffile-prefix-map=../src=src', + # So let's just tell GCC and Clang that ../lix really means lix. + '-ffile-prefix-map=../lix=lix', ], language : 'cpp', ) @@ -596,7 +596,7 @@ if is_darwin ) endif -subdir('src') +subdir('lix') subdir('scripts') subdir('misc') diff --git a/meson/clang-tidy/clang-tidy-runner.py b/meson/clang-tidy/clang-tidy-runner.py index c36e66b41..a8e15fc7b 100755 --- a/meson/clang-tidy/clang-tidy-runner.py +++ b/meson/clang-tidy/clang-tidy-runner.py @@ -39,7 +39,7 @@ def go(exe: str, plugin_path: Path, compile_commands_json_dir: Path, jobs: int, '-j', str(jobs), '-header-filter', - r'src/[^/]+/.*\.hh' + r'lix/[^/]+/.*\.hh' ] if werror: args += ['-warnings-as-errors', '*'] diff --git a/misc/pre-commit.nix b/misc/pre-commit.nix index 59ad2f874..de44bf9e1 100644 --- a/misc/pre-commit.nix +++ b/misc/pre-commit.nix @@ -81,14 +81,14 @@ pre-commit-run { check-headers = { enable = true; package = pkgs.check-headers; - files = "^src/"; + files = "^lix/"; types = [ "c++" "file" "header" ]; excludes = [ - ''^src/pch/.*$'' + ''^lix/pch/.*$'' # generated files; these will never actually be seen by this # check, and are left here as documentation ''(parser|lexer)-tab\.hh$'' diff --git a/package.nix b/package.nix index 297bc01fc..4bc81abb2 100644 --- a/package.nix +++ b/package.nix @@ -192,8 +192,8 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (!finalAttrs.dontBuild || internalApiDocs || lintInsteadOfBuild) [ ./doc + ./lix ./misc - ./src ./COPYING ] ++ lib.optionals lintInsteadOfBuild [ ./.clang-tidy ] diff --git a/src/include/lix b/src/include/lix deleted file mode 120000 index a96aa0ea9..000000000 --- a/src/include/lix +++ /dev/null @@ -1 +0,0 @@ -.. \ No newline at end of file diff --git a/subprojects/lix-clang-tidy/FixIncludes.cc b/subprojects/lix-clang-tidy/FixIncludes.cc index 2ebeaacdf..3591898a8 100644 --- a/subprojects/lix-clang-tidy/FixIncludes.cc +++ b/subprojects/lix-clang-tidy/FixIncludes.cc @@ -51,7 +51,7 @@ void FixIncludesCallbacks::InclusionDirective( return; // FIXME: this is kinda evil, but this is a one-time fixup - const std::vector SourceDirs = {"src/", "include/lix/"}; + const std::vector SourceDirs = {"lix/", "include/lix/"}; const auto Bracketize = [IsAngled](StringRef s) { return IsAngled ? ("<" + s + ">").str() : ("\"" + s + "\"").str(); diff --git a/subprojects/lix-clang-tidy/README.md b/subprojects/lix-clang-tidy/README.md index c2d1cb258..b8aa30e78 100644 --- a/subprojects/lix-clang-tidy/README.md +++ b/subprojects/lix-clang-tidy/README.md @@ -10,13 +10,13 @@ goal and is there as an example), `HasPrefixSuffixCheck`. One file: ``` -ninja -C build && clang-tidy --checks='-*,lix-*' --load=build/liblix-clang-tidy.so -p ../compile_commands.json -header-filter '\.\./src/.*\.h' --fix ../src/libcmd/installables.cc +ninja -C build && clang-tidy --checks='-*,lix-*' --load=build/liblix-clang-tidy.so -p ../../build -header-filter '\.\./lix/.*\.h' --fix ../../lix/libcmd/installables.cc ``` Several files, in parallel: ``` -ninja -C build && run-clang-tidy -checks='-*,lix-*' -load=build/liblix-clang-tidy.so -p .. -header-filter '\.\./src/.*\.h' -fix ../src | tee -a clang-tidy-result +ninja -C build && run-clang-tidy -checks='-*,lix-*' -load=build/liblix-clang-tidy.so -p ../../build -header-filter '\.\./lix/.*\.h' -fix ../../lix | tee -a clang-tidy-result ``` ## Resources @@ -40,7 +40,7 @@ enable output dump match callExpr(callee(functionDecl(hasName("hasPrefix"))), optionally(hasArgument( 0, cxxConstructExpr(hasDeclaration(functionDecl(hasParameter(0, parmVarDecl(hasType(asString("const char *"))).bind("meow2")))))))) ``` -Then run, e.g. `clang-query --preload hasprefix.query -p compile_commands.json src/libcmd/installables.cc`. +Then run, e.g. `clang-query --preload hasprefix.query -p compile_commands.json lix/libcmd/installables.cc`. With this you can iterate a query before writing it in C++ and suffering from C++. diff --git a/tests/functional/restricted.sh b/tests/functional/restricted.sh index dd6386278..ca537ceff 100644 --- a/tests/functional/restricted.sh +++ b/tests/functional/restricted.sh @@ -11,8 +11,8 @@ nix-instantiate --restrict-eval ./simple.nix -I src1=simple.nix -I src2=config.n (! nix-instantiate --restrict-eval --eval -E 'builtins.readFile ./simple.nix') nix-instantiate --restrict-eval --eval -E 'builtins.readFile ./simple.nix' -I src=../.. -(! nix-instantiate --restrict-eval --eval -E 'builtins.readDir ../../src/legacy') -nix-instantiate --restrict-eval --eval -E 'builtins.readDir ../../src/legacy' -I src=../../src +(! nix-instantiate --restrict-eval --eval -E 'builtins.readDir ../../lix/legacy') +nix-instantiate --restrict-eval --eval -E 'builtins.readDir ../../lix/legacy' -I src=../../lix (! nix-instantiate --restrict-eval --eval -E 'let __nixPath = [ { prefix = "foo"; path = ./.; } ]; in ') nix-instantiate --restrict-eval --eval -E 'let __nixPath = [ { prefix = "foo"; path = ./.; } ]; in ' -I src=. diff --git a/tests/unit/meson.build b/tests/unit/meson.build index 9db619c5d..5b09e418f 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build @@ -35,7 +35,7 @@ libutil_test_support = library( rapidcheck, boehm, ], - include_directories : include_directories('libutil-support', '../../src'), + include_directories : include_directories('libutil-support'), ) liblixutil_test_support = declare_dependency( include_directories : include_directories('libutil-support'), @@ -259,7 +259,7 @@ test( env : default_test_env + { # No special meaning here, it's just a file laying around that is unlikely to go anywhere # any time soon. - '_NIX_TEST_UNIT_DATA': meson.project_source_root() / 'src/legacy/buildenv.nix', + '_NIX_TEST_UNIT_DATA': meson.project_source_root() / 'lix/legacy/buildenv.nix', # Use a temporary home directory for the unit tests. # Otherwise, /homeless-shelter is created in the single-user sandbox, and functional tests will fail. # TODO(alois31): handle TMPDIR properly (meson can't, and setting HOME in the test is too late)…