diff options
74 files changed, 300 insertions, 295 deletions
diff --git a/.gitignore b/.gitignore index 4d921d97f..816a8e4b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,128 +1,5 @@ -Makefile.config -perl/Makefile.config - -# / -/aclocal.m4 -/autom4te.cache -/precompiled-headers.h.gch -/config.* -/configure -/stamp-h1 -/svn-revision -/libtool -/config - -# /doc/manual/ -/doc/manual/*.1 -/doc/manual/*.5 -/doc/manual/*.8 -/doc/manual/generated/* -/doc/manual/nix.json -/doc/manual/conf-file.json -/doc/manual/language.json -/doc/manual/xp-features.json -/doc/manual/src/command-ref/experimental-features-shortlist.md -/doc/manual/src/contributing/experimental-feature-descriptions.md -/doc/manual/src/release-notes/rl-next-generated.md - -# /scripts/ -/scripts/nix-profile.sh -/scripts/nix-profile-daemon.sh -/scripts/nix-profile.fish -/scripts/nix-profile-daemon.fish - -# /src/libexpr/ -/src/libexpr/lexer-tab.cc -/src/libexpr/lexer-tab.hh -/src/libexpr/parser-tab.cc -/src/libexpr/parser-tab.hh -/src/libexpr/parser-tab.output -/src/libexpr/nix.tbl -/src/libexpr/tests -/tests/unit/libexpr/libnixexpr-tests - -# /src/libstore/ -*.gen.* -/src/libstore/tests -/tests/unit/libstore/libnixstore-tests - -# /src/libutil/ -/src/libutil/tests -/tests/unit/libutil/libnixutil-tests - -/src/nix/nix - -/src/nix/doc - -# /src/nix-env/ -/src/nix-env/nix-env - -# /src/nix-instantiate/ -/src/nix-instantiate/nix-instantiate - -# /src/nix-store/ -/src/nix-store/nix-store - -/src/nix-prefetch-url/nix-prefetch-url - -/src/nix-collect-garbage/nix-collect-garbage - -# /src/nix-channel/ -/src/nix-channel/nix-channel - -# /src/nix-build/ -/src/nix-build/nix-build - -/src/nix-copy-closure/nix-copy-closure - -/src/error-demo/error-demo - -/src/build-remote/build-remote - -# /tests/functional/ -/tests/functional/test-tmp -/tests/functional/common/vars-and-functions.sh -/tests/functional/result* -/tests/functional/restricted-innocent -/tests/functional/shell -/tests/functional/shell.drv -/tests/functional/config.nix -/tests/functional/ca/config.nix -/tests/functional/dyn-drv/config.nix -/tests/functional/repl-result-out -/tests/functional/debugger-test-out -/tests/functional/test-libstoreconsumer/test-libstoreconsumer - -# /tests/functional/lang/ -/tests/functional/lang/*.out -/tests/functional/lang/*.out.xml -/tests/functional/lang/*.err -/tests/functional/lang/*.ast - -/perl/lib/Nix/Config.pm -/perl/lib/Nix/Store.cc - -/misc/systemd/nix-daemon.service -/misc/systemd/nix-daemon.socket -/misc/systemd/nix-daemon.conf -/misc/upstart/nix-daemon.conf - -/src/resolve-system-dependencies/resolve-system-dependencies - outputs/ -*.a -*.o -*.o.tmp -*.so -*.dylib -*.dll -*.exe -*.dep -*~ -*.pc -*.plist - # GNU Global GPATH GRTAGS @@ -132,17 +9,11 @@ GTAGS # ccls /.ccls-cache -# auto-generated compilation database -compile_commands.json - -nix-rust/target - result result-* .vscode/ .direnv/ -.envrc.local # clangd and possibly more .cache/ @@ -6,14 +6,14 @@ Read more about us at https://lix.systems. ## Installation -On Linux and macOS the easiest way to install Nix is to run the following shell command +On Linux and macOS the easiest way to install Lix is to run the following shell command (as a user other than root): ```console $ curl -sSf -L https://install.lix.systems/lix | sh -s -- install ``` -For systems that **already have Nix installed**, such as NixOS systems, read our [install page](https://lix.systems/install) +For systems that **already have a Nix implementation installed**, such as NixOS systems, read our [install page](https://lix.systems/install) ## Building And Developing diff --git a/doc/manual/src/contributing/hacking.md b/doc/manual/src/contributing/hacking.md index a73d672d4..781aa75c1 100644 --- a/doc/manual/src/contributing/hacking.md +++ b/doc/manual/src/contributing/hacking.md @@ -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://github.com/nixos/nix/blob/master/flake.nix +[`flake.nix`]: https://git.lix.systems/lix-project/lix/src/branch/main/flake.nix - `x86_64-linux` - `x86_64-darwin` diff --git a/doc/manual/src/installation/obtaining-source.md b/doc/manual/src/installation/obtaining-source.md index da05d243d..9c88942c3 100644 --- a/doc/manual/src/installation/obtaining-source.md +++ b/doc/manual/src/installation/obtaining-source.md @@ -1,13 +1,13 @@ # Obtaining the Source -The most recent sources of Nix can be obtained from its [Git -repository](https://github.com/NixOS/nix). For example, the following +The most recent sources of Lix can be obtained from its [Git +repository](https://git.lix.systems/lix-project/lix). For example, the following command will check out the latest revision into a directory called `nix`: ```console -$ git clone https://github.com/NixOS/nix +$ git clone https://git.lix.systems/lix-project/lix ``` Likewise, specific releases can be obtained from the -[tags](https://github.com/NixOS/nix/tags) of the repository. +[tags](https://git.lix.systems/lix-project/lix/tags) of the repository. diff --git a/doc/manual/src/quick-start.md b/doc/manual/src/quick-start.md index 862eed432..bcca9857d 100644 --- a/doc/manual/src/quick-start.md +++ b/doc/manual/src/quick-start.md @@ -22,7 +22,7 @@ to subsequent chapters. $ curl -sSf -L https://install.lix.systems/lix | sh -s -- install ``` - For systems that **already have Nix installed**, such as NixOS systems, read our [install page](https://lix.systems/install) + For systems that **already have a Nix implementation installed**, such as NixOS systems, read our [install page](https://lix.systems/install) The install script will use `sudo`, so make sure you have sufficient rights. @@ -240,7 +240,7 @@ system: binaryTarball nixpkgsFor.${system}.native.nix nixpkgsFor.${system}.native ); - # docker image with Nix inside + # docker image with Lix inside dockerImage = lib.genAttrs linux64BitSystems (system: self.packages.${system}.dockerImage); # API docs for Nix's unstable internal C++ interfaces. @@ -336,7 +336,7 @@ }; in pkgs.runCommand "docker-image-tarball-${version}" - { meta.description = "Docker image with Nix for ${system}"; } + { meta.description = "Docker image with Lix for ${system}"; } '' mkdir -p $out/nix-support image=$out/image.tar.gz diff --git a/meson.build b/meson.build index 9db764f00..b98b1fb15 100644 --- a/meson.build +++ b/meson.build @@ -17,6 +17,19 @@ # # Finally, src/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 +# gets borked during static link. We can't simply wholesale apply `link_whole :` either, +# because these libraries get linked multiple times since Lix's components are transitively +# dependent. So instead, each of those libraries have two dependency objects: +# liblix{store,expr,fetchers,util} and liblix{store,expr,fetchers,util}_mstatic ("maybe static"). +# The _mstatic versions should be used in the `dependencies :` arguments to ALL EXECUTABLES +# but executables ONLY. When we are not building statically (default_library != 'static'), +# they are equivalent. When we are building statically, the _mstatic version will be +# `link_whole :` rather than `link_with :`. +# FIXME: This hack should be removed when https://git.lix.systems/lix-project/lix/issues/359 +# is fixed. +# # Unit tests are setup in tests/unit/meson.build, under the test suite "check". # # Functional tests are a bit more complicated. Generally they're defined in @@ -79,6 +92,8 @@ if not fs.is_absolute(sysconfdir) sysconfdir = '/' / sysconfdir endif +is_static = get_option('default_library') == 'static' + # All of this has to go before the rest of the dependency checking, # so that internal-api-docs can be built with -Denable-build=false diff --git a/misc/pre-commit.nix b/misc/pre-commit.nix index ed2b152a3..4f54141b3 100644 --- a/misc/pre-commit.nix +++ b/misc/pre-commit.nix @@ -87,11 +87,12 @@ pre-commit-run { "file" "header" ]; - # generated files; these will never actually be seen by this - # check, and are left here as documentation excludes = [ - "(parser|lexer)-tab\\.hh$" - "\\.gen\\.hh$" + ''^src/pch/.*$'' + # generated files; these will never actually be seen by this + # check, and are left here as documentation + ''(parser|lexer)-tab\.hh$'' + ''\.gen\.hh$'' ]; entry = lib.getExe pkgs.check-headers; }; diff --git a/nix-support/binary-tarball.nix b/nix-support/binary-tarball.nix index b73e59043..6cadcd650 100644 --- a/nix-support/binary-tarball.nix +++ b/nix-support/binary-tarball.nix @@ -13,7 +13,7 @@ let ]; }; - meta.description = "Distribution-independent Nix bootstrap binaries for ${system}"; + meta.description = "Distribution-independent Lix bootstrap binaries for ${system}"; in buildPackages.runCommand "nix-binary-tarball-${version}" { inherit meta; } '' cp ${installerClosureInfo}/registration $TMPDIR/reginfo diff --git a/package.nix b/package.nix index 6251b28ba..43b709023 100644 --- a/package.nix +++ b/package.nix @@ -169,7 +169,6 @@ stdenv.mkDerivation (finalAttrs: { ./boehmgc-coroutine-sp-fallback.diff ./doc ./misc - ./precompiled-headers.h ./src ./COPYING ] @@ -449,7 +448,10 @@ stdenv.mkDerivation (finalAttrs: { shellHook = '' # don't re-run the hook in (other) nested nix-shells function lixShellHook() { - if [[ $name != lix-shell-env ]]; then + # n.b. how the heck does this become -env-env? well, `nix develop` does it: + # https://git.lix.systems/lix-project/lix/src/commit/7575db522e9008685c4009423398f6900a16bcce/src/nix/develop.cc#L240-L241 + # this is, of course, absurd. + if [[ $name != lix-shell-env && $name != lix-shell-env-env ]]; then return; fi diff --git a/perl/configure.ac b/perl/configure.ac index a02cb06c9..493f0c85c 100644 --- a/perl/configure.ac +++ b/perl/configure.ac @@ -29,7 +29,7 @@ NEED_PROG(xz, xz) AC_MSG_CHECKING([whether Perl is recent enough]) if ! $perl -e 'open(FOO, "-|", "true"); while (<FOO>) { print; }; close FOO or die;'; then AC_MSG_RESULT(no) - AC_MSG_ERROR([Your Perl version is too old. Nix requires Perl 5.8.0 or newer.]) + AC_MSG_ERROR([Your Perl version is too old. Lix requires Perl 5.8.0 or newer.]) fi AC_MSG_RESULT(yes) diff --git a/src/build-remote/build-remote.cc b/src/build-remote/build-remote.cc index f7a159829..fb90403a0 100644 --- a/src/build-remote/build-remote.cc +++ b/src/build-remote/build-remote.cc @@ -3,6 +3,7 @@ #include <algorithm> #include <set> #include <memory> +#include <string_view> #include <tuple> #include <iomanip> #if __APPLE__ @@ -20,9 +21,9 @@ #include "local-store.hh" #include "legacy.hh" #include "experimental-features.hh" +#include "hash.hh" using namespace nix; -using std::cin; static void handleAlarm(int sig) { } @@ -35,9 +36,19 @@ std::string escapeUri(std::string uri) static std::string currentLoad; +static std::string makeLockFilename(const std::string & storeUri) { + // We include 48 bytes of escaped URI to give an idea of what the lock + // is on, then 16 bytes of hash to disambiguate. + // This avoids issues with the escaped URI being very long and causing + // path too long errors, while also avoiding any possibility of collision + // caused by simple truncation. + auto hash = hashString(HashType::htSHA256, storeUri).to_string(Base::Base32, false); + return escapeUri(storeUri).substr(0, 48) + "-" + hash.substr(0, 16); +} + static AutoCloseFD openSlotLock(const Machine & m, uint64_t slot) { - return openLockFile(fmt("%s/%s-%d", currentLoad, escapeUri(m.storeUri), slot), true); + return openLockFile(fmt("%s/%s-%d", currentLoad, makeLockFilename(m.storeUri), slot), true); } static bool allSupportedLocally(Store & store, const std::set<std::string>& requiredFeatures) { @@ -263,7 +274,9 @@ connected: auto inputs = readStrings<PathSet>(source); auto wantedOutputs = readStrings<StringSet>(source); - AutoCloseFD uploadLock = openLockFile(currentLoad + "/" + escapeUri(storeUri) + ".upload-lock", true); + auto lockFileName = currentLoad + "/" + makeLockFilename(storeUri) + ".upload-lock"; + + AutoCloseFD uploadLock = openLockFile(lockFileName, true); { Activity act(*logger, lvlTalkative, actUnknown, fmt("waiting for the upload lock to '%s'", storeUri)); diff --git a/src/libcmd/common-eval-args.cc b/src/libcmd/common-eval-args.cc index e86213020..9a7c30d57 100644 --- a/src/libcmd/common-eval-args.cc +++ b/src/libcmd/common-eval-args.cc @@ -45,7 +45,7 @@ MixEvalArgs::MixEvalArgs() -I /etc/nixos ``` - will cause Nix to look for paths relative to `/home/eelco/Dev` and + will cause Lix to look for paths relative to `/home/eelco/Dev` and `/etc/nixos`, in that order. This is equivalent to setting the `NIX_PATH` environment variable to @@ -61,7 +61,7 @@ MixEvalArgs::MixEvalArgs() -I /etc/nixos ``` - will cause Nix to search for `<nixpkgs/path>` in + will cause Lix to search for `<nixpkgs/path>` in `/home/eelco/Dev/nixpkgs-branch/path` and `/etc/nixos/nixpkgs/path`. If a path in the Nix search path starts with `http://` or `https://`, @@ -73,7 +73,7 @@ MixEvalArgs::MixEvalArgs() -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/master.tar.gz ``` - tells Nix to download and use the current contents of the `master` + tells Lix to download and use the current contents of the `master` branch in the `nixpkgs` repository. The URLs of the tarballs from the official `nixos.org` channels diff --git a/src/libcmd/meson.build b/src/libcmd/meson.build index 4da1b496b..4dc0714c8 100644 --- a/src/libcmd/meson.build +++ b/src/libcmd/meson.build @@ -54,6 +54,7 @@ libcmd = library( nlohmann_json, lix_doc ], + cpp_pch : ['../pch/precompiled-headers.hh'], install : true, # FIXME(Qyriad): is this right? install_rpath : libdir, diff --git a/src/libexpr/eval-settings.hh b/src/libexpr/eval-settings.hh index 4674acda2..64c74c4b9 100644 --- a/src/libexpr/eval-settings.hh +++ b/src/libexpr/eval-settings.hh @@ -71,8 +71,8 @@ struct EvalSettings : Config Setting<bool> enableImportFromDerivation{ this, true, "allow-import-from-derivation", R"( - By default, Nix allows you to `import` from a derivation, allowing - building at evaluation time. With this option set to false, Nix will + By default, Lix allows you to `import` from a derivation, allowing + building at evaluation time. With this option set to false, Lix will throw an error when evaluating an expression that uses this feature, allowing users to ensure their evaluation will not require any builds to take place. diff --git a/src/libexpr/meson.build b/src/libexpr/meson.build index fda6fde2c..e60a85b5d 100644 --- a/src/libexpr/meson.build +++ b/src/libexpr/meson.build @@ -145,6 +145,7 @@ libexpr = library( include_directories : [ '../libmain', ], + cpp_pch : ['../pch/precompiled-headers.hh'], install : true, # FIXME(Qyriad): is this right? install_rpath : libdir, @@ -161,6 +162,16 @@ liblixexpr = declare_dependency( link_with : libexpr, ) +# 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('.'), + link_whole : libexpr, + ) +else + liblixexpr_mstatic = liblixexpr +endif + # 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( diff --git a/src/libexpr/primops/fetchClosure.cc b/src/libexpr/primops/fetchClosure.cc index 3804db6eb..a736957eb 100644 --- a/src/libexpr/primops/fetchClosure.cc +++ b/src/libexpr/primops/fetchClosure.cc @@ -51,7 +51,7 @@ static void runFetchClosureWithRewrite(EvalState & state, const PosIdx pos, Stor throw Error({ .msg = HintFmt( "The 'toPath' value '%s' is input-addressed, so it can't possibly be the result of rewriting to a content-addressed path.\n\n" - "Set 'toPath' to an empty string to make Nix report the correct content-addressed path.", + "Set 'toPath' to an empty string to make Lix report the correct content-addressed path.", state.store->printStorePath(toPath)), .pos = state.positions[pos] }); @@ -271,7 +271,7 @@ static RegisterPrimOp primop_fetchClosure({ ``` It is possible to fetch an [input-addressed store path](@docroot@/glossary.md#gloss-input-addressed-store-object) and return it as is. - However, this is the least preferred way of invoking `fetchClosure`, because it requires that the input-addressed paths are trusted by the Nix configuration. + However, this is the least preferred way of invoking `fetchClosure`, because it requires that the input-addressed paths are trusted by the Lix configuration. **`builtins.storePath`** diff --git a/src/libfetchers/github.cc b/src/libfetchers/github.cc index 3129e0d73..60fefd1f3 100644 --- a/src/libfetchers/github.cc +++ b/src/libfetchers/github.cc @@ -322,7 +322,7 @@ struct GitLabInputScheme : GitArchiveInputScheme readFile( store->toRealPath( downloadFile(store, url, "source", false, headers).storePath))); - if (json.is_array() && json.size() == 1 && json[0]["id"] != nullptr) { + if (json.is_array() && json.size() >= 1 && json[0]["id"] != nullptr) { auto rev = Hash::parseAny(std::string(json[0]["id"]), htSHA1); debug("HEAD revision for '%s' is %s", url, rev.gitRev()); return rev; diff --git a/src/libfetchers/meson.build b/src/libfetchers/meson.build index dbb85b84c..ee38b6cda 100644 --- a/src/libfetchers/meson.build +++ b/src/libfetchers/meson.build @@ -30,6 +30,7 @@ libfetchers = library( liblixutil, nlohmann_json, ], + cpp_pch : ['../pch/precompiled-headers.hh'], install : true, # FIXME(Qyriad): is this right? install_rpath : libdir, @@ -55,3 +56,13 @@ liblixfetchers = declare_dependency( include_directories : include_directories('.'), link_with : libfetchers, ) + +# 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('.'), + link_whole : libfetchers, + ) +else + liblixfetchers_mstatic = liblixfetchers +endif diff --git a/src/libmain/common-args.cc b/src/libmain/common-args.cc index af7f46296..20b5befe4 100644 --- a/src/libmain/common-args.cc +++ b/src/libmain/common-args.cc @@ -33,7 +33,7 @@ MixCommonArgs::MixCommonArgs(const std::string & programName) addFlag({ .longName = "option", - .description = "Set the Nix configuration setting *name* to *value* (overriding `nix.conf`).", + .description = "Set the Lix configuration setting *name* to *value* (overriding `nix.conf`).", .category = miscCategory, .labels = {"name", "value"}, .handler = {[this](std::string name, std::string value) { diff --git a/src/libmain/meson.build b/src/libmain/meson.build index b17247a9d..075aa83b2 100644 --- a/src/libmain/meson.build +++ b/src/libmain/meson.build @@ -20,6 +20,7 @@ libmain = library( liblixutil, liblixstore, ], + cpp_pch : ['../pch/precompiled-headers.hh'], install : true, # FIXME(Qyriad): is this right? install_rpath : libdir, diff --git a/src/libmain/shared.hh b/src/libmain/shared.hh index b791980fa..d7d872319 100644 --- a/src/libmain/shared.hh +++ b/src/libmain/shared.hh @@ -124,7 +124,7 @@ void detectStackOverflow(); * * This is called by the handler installed by detectStackOverflow(). * - * This gives Nix library consumers a limit opportunity to report the error + * This gives Lix library consumers a limit opportunity to report the error * condition. The handler should exit the process. * See defaultStackOverflowHandler() for a reference implementation. * diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc index 641910bd7..4b55668cb 100644 --- a/src/libstore/daemon.cc +++ b/src/libstore/daemon.cc @@ -243,7 +243,7 @@ struct ClientSettings } else if (name == settings.pluginFiles.name) { if (tokenizeString<Paths>(value) != settings.pluginFiles.get()) warn("Ignoring the client-specified plugin-files.\n" - "The client specifying plugins to the daemon never made sense, and was removed in Nix >=2.14."); + "The client specifying plugins to the daemon never made sense, and was removed in Nix."); } else if (trusted || name == settings.buildTimeout.name diff --git a/src/libstore/filetransfer.hh b/src/libstore/filetransfer.hh index c692f1485..23105e245 100644 --- a/src/libstore/filetransfer.hh +++ b/src/libstore/filetransfer.hh @@ -40,12 +40,12 @@ struct FileTransferSettings : Config this, 300, "stalled-download-timeout", R"( The timeout (in seconds) for receiving data from servers - during download. Nix cancels idle downloads after this + during download. Lix cancels idle downloads after this timeout's duration. )"}; Setting<unsigned int> tries{this, 5, "download-attempts", - "How often Nix will attempt to download a file before giving up."}; + "How often Lix will attempt to download a file before giving up."}; }; extern FileTransferSettings fileTransferSettings; diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index 993a8cfa5..763dc9158 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -87,7 +87,7 @@ Settings::Settings() /* Set the build hook location - For builds we perform a self-invocation, so Nix has to be self-aware. + For builds we perform a self-invocation, so Lix has to be self-aware. That is, it has to know where it is installed. We don't think it's sentient. Normally, nix is installed according to `nixBinDir`, which is set at compile time, @@ -101,7 +101,7 @@ Settings::Settings() current executable, using `getSelfExe()`. As a last resort, we resort to `PATH`. Hopefully we find a `nix` there that's compatible. - If you're porting Nix to a new platform, that might be good enough for a while, but + If you're porting Lix to a new platform, that might be good enough for a while, but you'll want to improve `getSelfExe()` to work on your platform. */ std::string nixExePath = nixBinDir + "/nix"; diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh index 581de7ff6..ab33efe8a 100644 --- a/src/libstore/globals.hh +++ b/src/libstore/globals.hh @@ -131,7 +131,7 @@ public: Setting<bool> tryFallback{ this, false, "fallback", R"( - If set to `true`, Nix will fall back to building from source if a + If set to `true`, Lix will fall back to building from source if a binary substitute fails. This is equivalent to the `--fallback` flag. The default is `false`. )", @@ -149,9 +149,9 @@ public: MaxBuildJobsSetting maxBuildJobs{ this, 1, "max-jobs", R"( - This option defines the maximum number of jobs that Nix will try to + This option defines the maximum number of jobs that Lix will try to build in parallel. The default is `1`. The special value `auto` - causes Nix to use the number of CPUs in your system. `0` is useful + causes Lix to use the number of CPUs in your system. `0` is useful when using remote builders to prevent any local builds (except for `preferLocalBuild` derivation attribute which executes locally regardless). It can be overridden using the `--max-jobs` (`-j`) @@ -195,11 +195,11 @@ public: Setting<std::string> thisSystem{ this, SYSTEM, "system", R"( - The system type of the current Nix installation. - Nix will only build a given [derivation](@docroot@/language/derivations.md) locally when its `system` attribute equals any of the values specified here or in [`extra-platforms`](#conf-extra-platforms). + The system type of the current Lix installation. + Lix will only build a given [derivation](@docroot@/language/derivations.md) locally when its `system` attribute equals any of the values specified here or in [`extra-platforms`](#conf-extra-platforms). - The default value is set when Nix itself is compiled for the system it will run on. - The following system types are widely used, as [Nix is actively supported on these platforms](@docroot@/contributing/hacking.md#platforms): + The default value is set when Lix itself is compiled for the system it will run on. + The following system types are widely used, as [Lix is actively supported on these platforms](@docroot@/contributing/hacking.md#platforms): - `x86_64-linux` - `x86_64-darwin` @@ -210,7 +210,7 @@ public: - `armv7l-linux` In general, you do not have to modify this setting. - While you can force Nix to run a Darwin-specific `builder` executable on a Linux machine, the result would obviously be wrong. + While you can force Lix to run a Darwin-specific `builder` executable on a Linux machine, the result would obviously be wrong. This value is available in the Nix language as [`builtins.currentSystem`](@docroot@/language/builtin-constants.md#builtins-currentSystem) @@ -252,8 +252,8 @@ public: R"( The path to the helper program that executes remote builds. - Nix communicates with the build hook over `stdio` using a custom protocol to request builds that cannot be performed directly by the Nix daemon. - The default value is the internal Nix binary that implements remote building. + Lix communicates with the build hook over `stdio` using a custom protocol to request builds that cannot be performed directly by the Nix daemon. + The default value is the internal Lix binary that implements remote building. > **Important** > @@ -270,7 +270,7 @@ public: Setting<bool> alwaysAllowSubstitutes{ this, false, "always-allow-substitutes", R"( - If set to `true`, Nix will ignore the `allowSubstitutes` attribute in + If set to `true`, Lix will ignore the `allowSubstitutes` attribute in derivations and always attempt to use available substituters. For more information on `allowSubstitutes`, see [the manual chapter on advanced attributes](../language/advanced-attributes.md). )"}; @@ -278,7 +278,7 @@ public: Setting<bool> buildersUseSubstitutes{ this, false, "builders-use-substitutes", R"( - If set to `true`, Nix will instruct remote build machines to use + If set to `true`, Lix will instruct remote build machines to use their own binary substitutes if available. In practical terms, this means that remote hosts will fetch as many build dependencies as possible from their own substitutes (e.g, from `cache.nixos.org`), @@ -317,7 +317,7 @@ public: Setting<bool> useSubstitutes{ this, true, "substitute", R"( - If set to `true` (default), Nix will use binary substitutes if + If set to `true` (default), Lix will use binary substitutes if available. This option can be disabled to force building from source. )", @@ -326,9 +326,9 @@ public: Setting<std::string> buildUsersGroup{ this, "", "build-users-group", R"( - This options specifies the Unix group containing the Nix build user - accounts. In multi-user Nix installations, builds should not be - performed by the Nix account since that would allow users to + This options specifies the Unix group containing the Lix build user + accounts. In multi-user Lix installations, builds should not be + performed by the Lix account since that would allow users to arbitrarily modify the Nix store and database by supplying specially crafted builders; and they cannot be performed by the calling user since that would allow him/her to influence the build result. @@ -338,11 +338,11 @@ public: of the group specified here (as listed in `/etc/group`). Those user accounts should not be used for any other purpose\! - Nix will never run two builds under the same user account at the + Lix will never run two builds under the same user account at the same time. This is to prevent an obvious security hole: a malicious user writing a Nix expression that modifies the build result of a legitimate Nix expression being built by another user. Therefore it - is good to have as many Nix build user accounts as you can spare. + is good to have as many Lix build user accounts as you can spare. (Remember: uids are cheap.) The build users should have permission to create files in the Nix @@ -351,7 +351,7 @@ public: and its mode should be `1775`. If the build users group is empty, builds will be performed under - the uid of the Nix process (that is, the uid of the caller if + the uid of the Lix process (that is, the uid of the caller if `NIX_REMOTE` is empty, the uid under which the Nix daemon runs if `NIX_REMOTE` is `daemon`). Obviously, this should not be used with a nix daemon accessible to untrusted clients. @@ -405,7 +405,7 @@ public: Setting<bool> keepLog{ this, true, "keep-build-log", R"( - If set to `true` (the default), Nix will write the build log of a + If set to `true` (the default), Lix will write the build log of a derivation (i.e. the standard output and error of its builder) to the directory `/nix/var/log/nix/drvs`. The build log can be retrieved using the command `nix-store -l path`. @@ -468,7 +468,7 @@ public: Setting<bool> autoOptimiseStore{ this, false, "auto-optimise-store", R"( - If set to `true`, Nix automatically detects files in the store + If set to `true`, Lix automatically detects files in the store that have identical contents, and replaces them with hard links to a single copy. This saves disk space. If set to `false` (the default), you can still run `nix-store --optimise` to get rid of @@ -519,7 +519,7 @@ public: network). Currently, sandboxing only work on Linux and macOS. The use of a - sandbox requires that Nix is run as root (so you should use the + sandbox requires that Lix is run as root (so you should use the “build users” feature to perform the actual builds under different users than root). @@ -545,7 +545,7 @@ public: If the source is in the Nix store, then its closure will be added to the sandbox as well. - Depending on how Nix was built, the default value for this option + Depending on how Lix was built, the default value for this option may be empty or provide `/bin/sh` as a bind-mount of `bash`. )", {"build-chroot-dirs", "build-sandbox-paths"}}; @@ -556,7 +556,7 @@ public: Setting<bool> requireDropSupplementaryGroups{this, getuid() == 0, "require-drop-supplementary-groups", R"( Following the principle of least privilege, - Nix will attempt to drop supplementary groups when building with sandboxing. + Lix will attempt to drop supplementary groups when building with sandboxing. However this can fail under some circumstances. For example, if the user lacks the `CAP_SETGID` capability. @@ -642,7 +642,7 @@ public: A whitespace-separated list of public keys. At least one of the following condition must be met - for Nix to accept copying a store object from another + for Lix to accept copying a store object from another Nix store (such as a substituter): - the store object has been signed using a key in the trusted keys list @@ -665,14 +665,14 @@ public: this, 60 * 60, "tarball-ttl", R"( The number of seconds a downloaded tarball is considered fresh. If - the cached tarball is stale, Nix will check whether it is still up - to date using the ETag header. Nix will download a new version if + the cached tarball is stale, Lix will check whether it is still up + to date using the ETag header. Lix will download a new version if the ETag header is unsupported, or the cached ETag doesn't match. - Setting the TTL to `0` forces Nix to always check if the tarball is + Setting the TTL to `0` forces Lix to always check if the tarball is up to date. - Nix caches tarballs in `$XDG_CACHE_HOME/nix/tarballs`. + Lix caches tarballs in `$XDG_CACHE_HOME/nix/tarballs`. Files fetched via `NIX_PATH`, `fetchGit`, `fetchMercurial`, `fetchTarball`, and `fetchurl` respect this TTL. @@ -701,7 +701,7 @@ public: R"( System types of executables that can be run on this machine. - Nix will only build a given [derivation](@docroot@/language/derivations.md) locally when its `system` attribute equals any of the values specified here or in the [`system` option](#conf-system). + Lix will only build a given [derivation](@docroot@/language/derivations.md) locally when its `system` attribute equals any of the values specified here or in the [`system` option](#conf-system). Setting this can be useful to build derivations locally on compatible machines: - `i686-linux` executables can be run on `x86_64-linux` machines (set by default) @@ -748,16 +748,16 @@ public: "substituters", R"( A list of [URLs of Nix stores](@docroot@/command-ref/new-cli/nix3-help-stores.md#store-url-format) to be used as substituters, separated by whitespace. - A substituter is an additional [store](@docroot@/glossary.md#gloss-store) from which Nix can obtain [store objects](@docroot@/glossary.md#gloss-store-object) instead of building them. + A substituter is an additional [store](@docroot@/glossary.md#gloss-store) from which Lix can obtain [store objects](@docroot@/glossary.md#gloss-store-object) instead of building them. Substituters are tried based on their priority value, which each substituter can set independently. Lower value means higher priority. The default is `https://cache.nixos.org`, which has a priority of 40. - At least one of the following conditions must be met for Nix to use a substituter: + At least one of the following conditions must be met for Lix to use a substituter: - The substituter is in the [`trusted-substituters`](#conf-trusted-substituters) list - - The user calling Nix is in the [`trusted-users`](#conf-trusted-users) list + - The user calling Lix is in the [`trusted-users`](#conf-trusted-users) list In addition, each store path should be trusted as described in [`trusted-public-keys`](#conf-trusted-public-keys) )", @@ -866,13 +866,13 @@ public: this, 0, "download-speed", R"( Specify the maximum transfer rate in kilobytes per second you want - Nix to use for downloads. + Lix to use for downloads. )"}; Setting<std::string> netrcFile{ this, fmt("%s/%s", nixConfDir, "netrc"), "netrc-file", R"( - If set to an absolute path to a `netrc` file, Nix will use the HTTP + If set to an absolute path to a `netrc` file, Lix will use the HTTP authentication credentials in this file when trying to download from a remote host through HTTP or HTTPS. Defaults to `$NIX_CONF_DIR/netrc`. @@ -898,7 +898,7 @@ public: this, getDefaultSSLCertFile(), "ssl-cert-file", R"( The path of a file containing CA certificates used to - authenticate `https://` downloads. Nix by default will use + authenticate `https://` downloads. Lix by default will use the first of the following files that exists: 1. `/etc/ssl/certs/ca-certificates.crt` @@ -915,7 +915,7 @@ public: Setting<StringSet> ignoredAcls{ this, {"security.selinux", "system.nfs4_acl", "security.csm"}, "ignored-acls", R"( - A list of ACLs that should be ignored, normally Nix attempts to + A list of ACLs that should be ignored, normally Lix attempts to remove all ACLs from files and directories in the Nix store, but some ACLs like `security.selinux` or `system.nfs4_acl` can't be removed even by root. Therefore it's best to just ignore them. @@ -926,7 +926,7 @@ public: this, {}, "hashed-mirrors", R"( A list of web servers used by `builtins.fetchurl` to obtain files by - hash. Given a hash type *ht* and a base-16 hash *h*, Nix will try to + hash. Given a hash type *ht* and a base-16 hash *h*, Lix will try to download the file from *hashed-mirror*/*ht*/*h*. This allows files to be downloaded even if they have disappeared from their original URI. For example, given an example mirror `http://tarballs.nixos.org/`, @@ -939,7 +939,7 @@ public: } ``` - Nix will attempt to download this file from + Lix will attempt to download this file from `http://tarballs.nixos.org/sha256/2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae` first. If it is not available there, if will try the original URI. )"}; @@ -948,7 +948,7 @@ public: this, 0, "min-free", R"( When free disk space in `/nix/store` drops below `min-free` during a - build, Nix performs a garbage-collection until `max-free` bytes are + build, Lix performs a garbage-collection until `max-free` bytes are available or there is no more garbage. A value of `0` (the default) disables this feature. )"}; @@ -983,7 +983,7 @@ public: itself, they must be DSOs compatible with the instance of Nix running at the time (i.e. compiled against the same headers, not linked to any incompatible libraries). They should not be linked to - any Nix libs directly, as those will be available already at load + any Lix libs directly, as those will be available already at load time. If an entry in the list is a directory, all files in the directory @@ -996,7 +996,7 @@ public: Setting<bool> allowSymlinkedStore{ this, false, "allow-symlinked-store", R"( - If set to `true`, Nix will stop complaining if the store directory + If set to `true`, Lix will stop complaining if the store directory (typically /nix/store) contains symlink components. This risks making some builds "impure" because builders sometimes @@ -1009,13 +1009,13 @@ public: Setting<bool> useXDGBaseDirectories{ this, false, "use-xdg-base-directories", R"( - If set to `true`, Nix will conform to the [XDG Base Directory Specification] for files in `$HOME`. + If set to `true`, Lix will conform to the [XDG Base Directory Specification] for files in `$HOME`. The environment variables used to implement this are documented in the [Environment Variables section](@docroot@/command-ref/env-common.md). [XDG Base Directory Specification]: https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html > **Warning** - > This changes the location of some well-known symlinks that Nix creates, which might break tools that rely on the old, non-XDG-conformant locations. + > This changes the location of some well-known symlinks that Lix creates, which might break tools that rely on the old, non-XDG-conformant locations. In particular, the following locations change: @@ -1025,7 +1025,7 @@ public: | `~/.nix-defexpr` | `$XDG_STATE_HOME/nix/defexpr` | | `~/.nix-channels` | `$XDG_STATE_HOME/nix/channels` | - If you already have Nix installed and are using [profiles](@docroot@/package-management/profiles.md) or [channels](@docroot@/command-ref/nix-channel.md), you should migrate manually when you enable this option. + If you already have Lix installed and are using [profiles](@docroot@/package-management/profiles.md) or [channels](@docroot@/command-ref/nix-channel.md), you should migrate manually when you enable this option. If `$XDG_STATE_HOME` is not set, use `$HOME/.local/state/nix` instead of `$XDG_STATE_HOME/nix`. This can be achieved with the following shell commands: diff --git a/src/libstore/linux/fchmodat2-compat.hh b/src/libstore/linux/fchmodat2-compat.hh index 6ad8a5578..d5ef81e22 100644 --- a/src/libstore/linux/fchmodat2-compat.hh +++ b/src/libstore/linux/fchmodat2-compat.hh @@ -5,7 +5,7 @@ * a glibc git checkout via `rg --pcre2 'define __NR_fchmodat2 (?!452)'`. * * The problem is that glibc 2.39 and libseccomp 2.5.5 are needed to - * get the syscall number. However, a Nix built against nixpkgs 23.11 + * get the syscall number. However, a Lix built against nixpkgs 23.11 * (glibc 2.38) should still have the issue fixed without depending * on the build environment. * diff --git a/src/libstore/local-fs-store.hh b/src/libstore/local-fs-store.hh index d6bda05d1..e03023916 100644 --- a/src/libstore/local-fs-store.hh +++ b/src/libstore/local-fs-store.hh @@ -18,12 +18,12 @@ struct LocalFSStoreConfig : virtual StoreConfig const PathSetting stateDir{this, rootDir.get() ? *rootDir.get() + "/nix/var/nix" : settings.nixStateDir, "state", - "Directory where Nix will store state."}; + "Directory where Lix will store state."}; const PathSetting logDir{this, rootDir.get() ? *rootDir.get() + "/nix/var/log/nix" : settings.nixLogDir, "log", - "directory where Nix will store log files."}; + "directory where Lix will store log files."}; const PathSetting realStoreDir{this, rootDir.get() ? *rootDir.get() + "/nix/store" : storeDir, "real", diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc index 7bcbe3298..f5eaa9f5f 100644 --- a/src/libstore/local-store.cc +++ b/src/libstore/local-store.cc @@ -313,13 +313,13 @@ LocalStore::LocalStore(const Params & params) throw Error( "Your Nix store has a database in Berkeley DB format,\n" "which is no longer supported. To convert to the new format,\n" - "please upgrade Nix to version 0.12 first."); + "please use the original Nix version 0.12 first."); if (curSchema < 6) throw Error( "Your Nix store has a database in flat file format,\n" "which is no longer supported. To convert to the new format,\n" - "please upgrade Nix to version 1.11 first."); + "please use the original Nix version 1.11 first."); if (!lockFile(globalLock.get(), ltWrite, false)) { printInfo("waiting for exclusive access to the Nix store..."); @@ -550,7 +550,12 @@ void LocalStore::openDB(State & state, bool create) if (mode == "wal" ) { /* persist the WAL files when the DB connection is closed. * This allows for read-only connections without any write permissions - * on the state directory to succeed on a closed database. */ + * on the state directory to succeed on a closed database. Setting the + * journal_size_limit to 2^40 bytes results in the WAL files getting + * truncated to 0 on exit and limits the on disk size of the WAL files + * to 2^40 bytes following a checkpoint */ + if (sqlite3_exec(db, "pragma main.journal_size_limit = 1099511627776;", 0, 0, 0) != SQLITE_OK) + SQLiteError::throw_(db, "setting journal_size_limit"); int enable = 1; if (sqlite3_file_control(db, NULL, SQLITE_FCNTL_PERSIST_WAL, &enable) != SQLITE_OK) SQLiteError::throw_(db, "setting persistent WAL mode"); diff --git a/src/libstore/local-store.hh b/src/libstore/local-store.hh index 808fdc202..fd2985a86 100644 --- a/src/libstore/local-store.hh +++ b/src/libstore/local-store.hh @@ -23,6 +23,9 @@ namespace nix { * 0.7. Version 2 was Nix 0.8 and 0.9. Version 3 is Nix 0.10. * Version 4 is Nix 0.11. Version 5 is Nix 0.12-0.16. Version 6 is * Nix 1.0. Version 7 is Nix 1.3. Version 10 is 2.0. + * + * Lix started at 2.90, it cannot ever go past version 10 (Nix 2.18), + * since doing so will break compatibility with future CppNix versions. */ const int nixSchemaVersion = 10; @@ -49,7 +52,7 @@ struct LocalStoreConfig : virtual LocalFSStoreConfig R"( Allow this store to be opened when its [database](@docroot@/glossary.md#gloss-nix-database) is on a read-only filesystem. - Normally Nix will attempt to open the store database in read-write mode, even for querying (when write access is not needed), causing it to fail if the database is on a read-only filesystem. + Normally Lix will attempt to open the store database in read-write mode, even for querying (when write access is not needed), causing it to fail if the database is on a read-only filesystem. Enable read-only mode to disable locking and open the SQLite database with the [`immutable` parameter](https://www.sqlite.org/c3ref/open.html) set. diff --git a/src/libstore/meson.build b/src/libstore/meson.build index f776e9621..7a129d22c 100644 --- a/src/libstore/meson.build +++ b/src/libstore/meson.build @@ -220,6 +220,7 @@ libstore = library( nlohmann_json, ], cpp_args : cpp_args, + cpp_pch : ['../pch/precompiled-headers.hh'], install : true, # FIXME(Qyriad): is this right? install_rpath : libdir, @@ -233,6 +234,16 @@ liblixstore = declare_dependency( link_with : libstore, ) +# 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('.'), + link_whole : libstore, + ) +else + liblixstore_mstatic = liblixstore +endif + # 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( diff --git a/src/libstore/profiles.hh b/src/libstore/profiles.hh index 193c0bf21..9672a17bd 100644 --- a/src/libstore/profiles.hh +++ b/src/libstore/profiles.hh @@ -42,7 +42,7 @@ struct Generation * of the generation. * * These store paths / objects are not unique to the generation - * within a profile. Nix tries to ensure successive generations have + * within a profile. Lix tries to ensure successive generations have * distinct contents to avoid bloat, but nothing stops two * non-adjacent generations from having the same contents. * diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc index cf5f125d4..13a709104 100644 --- a/src/libstore/s3-binary-cache-store.cc +++ b/src/libstore/s3-binary-cache-store.cc @@ -196,7 +196,7 @@ struct S3BinaryCacheStoreConfig : virtual BinaryCacheStoreConfig const Setting<std::string> profile{this, "", "profile", R"( The name of the AWS configuration profile to use. By default - Nix will use the `default` profile. + Lix will use the `default` profile. )"}; const Setting<std::string> region{this, Aws::Region::US_EAST_1, "region", diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc index eb9b5c3ef..952958d51 100644 --- a/src/libstore/store-api.cc +++ b/src/libstore/store-api.cc @@ -1379,9 +1379,9 @@ std::shared_ptr<Store> openFromNonUri(const std::string & uri, const Store::Para } catch (Error & e) { return LocalStore::makeLocalStore(params); } - warn("'%s' does not exist, so Nix will use '%s' as a chroot store", stateDir, chrootStore); + warn("'%s' does not exist, so Lix will use '%s' as a chroot store", stateDir, chrootStore); } else - debug("'%s' does not exist, so Nix will use '%s' as a chroot store", stateDir, chrootStore); + debug("'%s' does not exist, so Lix will use '%s' as a chroot store", stateDir, chrootStore); Store::Params chrootStoreParams; chrootStoreParams["root"] = chrootStore; // FIXME? this ignores *all* store parameters passed to this function? diff --git a/src/libstore/worker-protocol.cc b/src/libstore/worker-protocol.cc index d76a8d2b8..d4954aaa8 100644 --- a/src/libstore/worker-protocol.cc +++ b/src/libstore/worker-protocol.cc @@ -74,7 +74,7 @@ void WorkerProto::Serialise<DerivedPath>::write(const Store & store, WorkerProto GET_PROTOCOL_MINOR(conn.version)); }, [&](std::monostate) { - throw Error("wanted to build a derivation that is itself a build product, but protocols do not support that. Try upgrading the Nix on the other end of this connection"); + throw Error("wanted to build a derivation that is itself a build product, but protocols do not support that. Try upgrading the Nix implementation on the other end of this connection"); }, }, sOrDrvPath); } diff --git a/src/libutil/args.cc b/src/libutil/args.cc index 655b3e82f..1342e7c6a 100644 --- a/src/libutil/args.cc +++ b/src/libutil/args.cc @@ -64,7 +64,7 @@ RootArgs & Args::getRoot() while (p->parent) p = p->parent; - auto * res = dynamic_cast<RootArgs *>(p); + auto res = p->asRootArgs(); assert(res); return *res; } diff --git a/src/libutil/args.hh b/src/libutil/args.hh index 35a5238c0..71f8f88fa 100644 --- a/src/libutil/args.hh +++ b/src/libutil/args.hh @@ -244,6 +244,13 @@ protected: */ virtual void initialFlagsProcessed() {} + /** + * Returns this Args as a RootArgs if it is one, or \ref std::nullopt otherwise. + */ + virtual std::optional<std::reference_wrapper<RootArgs>> asRootArgs() { + return std::nullopt; + } + public: void addFlag(Flag && flag); diff --git a/src/libutil/args/root.hh b/src/libutil/args/root.hh index f8124eaff..499ee6df4 100644 --- a/src/libutil/args/root.hh +++ b/src/libutil/args/root.hh @@ -65,6 +65,10 @@ protected: */ std::set<ExperimentalFeature> flagExperimentalFeatures; + virtual std::optional<std::reference_wrapper<RootArgs>> asRootArgs() override { + return *this; + } + private: std::optional<std::string> needsCompletion(std::string_view s); diff --git a/src/libutil/config.hh b/src/libutil/config.hh index fb433c607..8a4d24456 100644 --- a/src/libutil/config.hh +++ b/src/libutil/config.hh @@ -13,7 +13,7 @@ namespace nix { /** - * The Config class provides Nix runtime configurations. + * The Config class provides Lix runtime configurations. * * What is a Configuration? * A collection of uniquely named Settings. diff --git a/src/libutil/experimental-features.cc b/src/libutil/experimental-features.cc index f1cbfdb16..3a834293a 100644 --- a/src/libutil/experimental-features.cc +++ b/src/libutil/experimental-features.cc @@ -293,7 +293,7 @@ std::set<ExperimentalFeature> parseFeatures(const std::set<std::string> & rawFea } MissingExperimentalFeature::MissingExperimentalFeature(ExperimentalFeature feature) - : Error("experimental Nix feature '%1%' is disabled; use '--extra-experimental-features %1%' to override", showExperimentalFeature(feature)) + : Error("experimental Lix feature '%1%' is disabled; use '--extra-experimental-features %1%' to override", showExperimentalFeature(feature)) , missingFeature(feature) {} diff --git a/src/libutil/logging.hh b/src/libutil/logging.hh index 7b7f69833..64be8bc62 100644 --- a/src/libutil/logging.hh +++ b/src/libutil/logging.hh @@ -41,7 +41,7 @@ struct LoggerSettings : Config Setting<bool> showTrace{ this, false, "show-trace", R"( - Whether Nix should print out a stack trace in case of Nix + Whether Lix should print out a stack trace in case of Nix expression evaluation errors. )"}; }; diff --git a/src/libutil/meson.build b/src/libutil/meson.build index 96450fbe2..8c3377e76 100644 --- a/src/libutil/meson.build +++ b/src/libutil/meson.build @@ -129,6 +129,7 @@ libutil = library( openssl, nlohmann_json, ], + cpp_pch : ['../pch/precompiled-headers.hh'], implicit_include_directories : true, install : true, ) @@ -154,3 +155,13 @@ liblixutil = declare_dependency( include_directories : include_directories('.'), link_with : libutil ) + +# 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('.'), + link_whole : libutil, + ) +else + liblixutil_mstatic = liblixutil +endif diff --git a/src/nix/config.cc b/src/nix/config.cc index 5b280d11d..1a45dc390 100644 --- a/src/nix/config.cc +++ b/src/nix/config.cc @@ -14,7 +14,7 @@ struct CmdConfig : virtual NixMultiCommand std::string description() override { - return "manipulate the Nix configuration"; + return "manipulate the Lix configuration"; } Category category() override { return catUtility; } @@ -41,7 +41,7 @@ struct CmdConfigShow : Command, MixJSON std::string description() override { - return "show the Nix configuration or the value of a specific setting"; + return "show the Lix configuration or the value of a specific setting"; } Category category() override { return catUtility; } diff --git a/src/nix/develop.md b/src/nix/develop.md index e39048bb1..c5a27d08a 100644 --- a/src/nix/develop.md +++ b/src/nix/develop.md @@ -77,7 +77,7 @@ R""( # Description `nix develop` starts a `bash` shell that provides an interactive build -environment nearly identical to what Nix would use to build +environment nearly identical to what Lix would use to build [*installable*](./nix.md#installables). Inside this shell, environment variables and shell functions are set up so that you can interactively and incrementally build your package. diff --git a/src/nix/flake-check.md b/src/nix/flake-check.md index c8307f8d8..058aaa5ec 100644 --- a/src/nix/flake-check.md +++ b/src/nix/flake-check.md @@ -22,7 +22,7 @@ This command verifies that the flake specified by flake reference that the derivations specified by the flake's `checks` output can be built successfully. -If the `keep-going` option is set to `true`, Nix will keep evaluating as much +If the `keep-going` option is set to `true`, Lix will keep evaluating as much as it can and report the errors as it encounters them. Otherwise it will stop at the first error. diff --git a/src/nix/flake-lock.md b/src/nix/flake-lock.md index 6d10258e3..b1ab6994a 100644 --- a/src/nix/flake-lock.md +++ b/src/nix/flake-lock.md @@ -26,7 +26,7 @@ R""( > > When trying to refer to a flake in a subdirectory, write `./another` > instead of `another`. - > Otherwise Nix will try to look up the flake in the registry. + > Otherwise Lix will try to look up the flake in the registry. # Description diff --git a/src/nix/flake-update.md b/src/nix/flake-update.md index 63df3b12a..5a7b25b1a 100644 --- a/src/nix/flake-update.md +++ b/src/nix/flake-update.md @@ -39,7 +39,7 @@ R""( > > When trying to refer to a flake in a subdirectory, write `./another` > instead of `another`. - > Otherwise Nix will try to look up the flake in the registry. + > Otherwise Lix will try to look up the flake in the registry. # Description diff --git a/src/nix/flake.cc b/src/nix/flake.cc index 7b5d8096a..d24f746f8 100644 --- a/src/nix/flake.cc +++ b/src/nix/flake.cc @@ -87,11 +87,13 @@ public: expectArgs({ .label="inputs", .optional=true, - .handler={[&](std::string inputToUpdate){ - auto inputPath = flake::parseInputPath(inputToUpdate); - if (lockFlags.inputUpdates.contains(inputPath)) - warn("Input '%s' was specified multiple times. You may have done this by accident."); - lockFlags.inputUpdates.insert(inputPath); + .handler={[&](std::vector<std::string> inputsToUpdate) { + for (const auto & inputToUpdate : inputsToUpdate) { + auto inputPath = flake::parseInputPath(inputToUpdate); + if (lockFlags.inputUpdates.contains(inputPath)) + warn("Input '%s' was specified multiple times. You may have done this by accident.", inputToUpdate); + lockFlags.inputUpdates.insert(inputPath); + } }}, .completer = {[&](AddCompletions & completions, size_t, std::string_view prefix) { completeFlakeInputPath(completions, getEvalState(), getFlakeRefsForCompletion(), prefix); @@ -132,6 +134,15 @@ struct CmdFlakeLock : FlakeCommand CmdFlakeLock() { + addFlag({ + .longName="update-input", + .description="Replaced with `nix flake update input...`", + .labels={"input-path"}, + .handler={[&](std::string inputToUpdate){ + throw UsageError("`nix flake lock --update-input %1%` has been replaced by `nix flake update %1%`", inputToUpdate); + }} + }); + /* Remove flags that don't make sense. */ removeFlag("no-write-lock-file"); } diff --git a/src/nix/flake.md b/src/nix/flake.md index 92f477917..9188bca74 100644 --- a/src/nix/flake.md +++ b/src/nix/flake.md @@ -98,7 +98,7 @@ Flakes corresponding to a local path can also be referred to by a direct path re The semantic of such a path is as follows: * If the directory is part of a Git repository, then the input will be treated as a `git+file:` URL, otherwise it will be treated as a `path:` url; -* If the directory doesn't contain a `flake.nix` file, then Nix will search for such a file upwards in the file system hierarchy until it finds any of: +* If the directory doesn't contain a `flake.nix` file, then Lix will search for such a file upwards in the file system hierarchy until it finds any of: 1. The Git repository root, or 2. The filesystem root (/), or 3. A folder on a different mount point. @@ -176,7 +176,7 @@ Currently the `type` attribute can be one of the following: The `ref` attribute defaults to resolving the `HEAD` reference. The `rev` attribute must denote a commit that exists in the branch - or tag specified by the `ref` attribute, since Nix doesn't do a full + or tag specified by the `ref` attribute, since Lix doesn't do a full clone of the remote repository by default (and the Git protocol doesn't allow fetching a `rev` without a known `ref`). The default is the commit currently pointed to by `ref`. diff --git a/src/nix/help-stores.md b/src/nix/help-stores.md index 47ba9b94d..33562b031 100644 --- a/src/nix/help-stores.md +++ b/src/nix/help-stores.md @@ -1,6 +1,6 @@ R"( -Nix supports different types of stores. These are described below. +Lix supports different types of stores. These are described below. ## Store URL format @@ -22,11 +22,11 @@ instance, --store ssh://machine.example.org?ssh-key=/path/to/my/key ``` -tells Nix to access the store on a remote machine via the SSH +tells Lix to access the store on a remote machine via the SSH protocol, using `/path/to/my/key` as the SSH private key. The supported settings for each store type are documented below. -The special store URL `auto` causes Nix to automatically select a +The special store URL `auto` causes Lix to automatically select a store as follows: * Use the [local store](#local-store) `/nix/store` if `/nix/var/nix` diff --git a/src/nix/log.md b/src/nix/log.md index 81bfefd96..cd13a1fe3 100644 --- a/src/nix/log.md +++ b/src/nix/log.md @@ -26,7 +26,7 @@ R""( This command prints the log of a previous build of the [*installable*](./nix.md#installables) on standard output. -Nix looks for build logs in two places: +Lix looks for build logs in two places: * In the directory `/nix/var/log/nix/drvs`, which contains logs for locally built derivations. @@ -35,7 +35,7 @@ Nix looks for build logs in two places: should be named `<cache>/log/<base-name-of-store-path>`, where `store-path` is a derivation, e.g. `https://cache.nixos.org/log/dvmig8jgrdapvbyxb1rprckdmdqx08kv-hello-2.10.drv`. - For non-derivation store paths, Nix will first try to determine the + For non-derivation store paths, Lix will first try to determine the deriver by fetching the `.narinfo` file for this store path. )"" diff --git a/src/nix/main.cc b/src/nix/main.cc index 5d92cfd76..074a59049 100644 --- a/src/nix/main.cc +++ b/src/nix/main.cc @@ -365,6 +365,11 @@ void mainWrapped(int argc, char * * argv) setLogFormat("bar"); settings.verboseBuild = false; + if (isatty(STDERR_FILENO)) { + verbosity = lvlNotice; + } else { + verbosity = lvlInfo; + } NixArgs args; diff --git a/src/nix/meson.build b/src/nix/meson.build index e41399b5d..8115a3d08 100644 --- a/src/nix/meson.build +++ b/src/nix/meson.build @@ -81,14 +81,15 @@ nix = executable( nix2_commands_sources, dependencies : [ liblixcmd, - liblixutil, - liblixstore, - liblixexpr, - liblixfetchers, + liblixutil_mstatic, + liblixstore_mstatic, + liblixexpr_mstatic, + liblixfetchers_mstatic, liblixmain, boehm, nlohmann_json, ], + cpp_pch : ['../pch/precompiled-headers.hh'], install : true, # FIXME(Qyriad): is this right? install_rpath : libdir, diff --git a/src/nix/nix.md b/src/nix/nix.md index 0d588cd01..192b1d1c1 100644 --- a/src/nix/nix.md +++ b/src/nix/nix.md @@ -41,10 +41,11 @@ R""( # Description -Nix is a tool for building software, configurations and other +Lix is a tool for building software, configurations and other artifacts in a reproducible and declarative way. For more information, -see the [Nix homepage](https://nixos.org/) or the [Nix -manual](https://nixos.org/manual/nix/stable/). +see the [Lix homepage](https://lix.systems). + +Lix is a fork of the original implementation [CppNix](https://github.com/nixos/nix). # Installables @@ -68,7 +69,7 @@ The following types of installable are supported by most commands: - Specified with `--expr`/`-E` For most commands, if no installable is specified, `.` is assumed. -That is, Nix will operate on the default flake output attribute of the flake in the current directory. +That is, Lix will operate on the default flake output attribute of the flake in the current directory. ### Flake output attribute @@ -99,7 +100,7 @@ way: and `RELATIVE_FLAKE_DIR_PATH` is the path (relative to the directory root) of the closest parent of the given path that contains a `flake.nix` within the git repository. - If no such directory exists, then Nix will error-out. + If no such directory exists, then Lix will error-out. Note that the search will only include files indexed by git. In particular, files which are matched by `.gitignore` or have never been `git add`-ed will not be @@ -120,12 +121,12 @@ way: - If the supplied path is not a git repository, then the url will have the form `path:FLAKE_DIR_PATH` where `FLAKE_DIR_PATH` is the closest parent of the supplied path that contains a `flake.nix` file (within the same file-system). - If no such directory exists, then Nix will error-out. + If no such directory exists, then Lix will error-out. For example, if `/foo/bar/flake.nix` exists, then `/foo/bar/baz/` will resolve to `path:/foo/bar` -If *attrpath* is omitted, Nix tries some default values; for most +If *attrpath* is omitted, Lix tries some default values; for most subcommands, the default is `packages.`*system*`.default` (e.g. `packages.x86_64-linux.default`), but some subcommands have other defaults. If *attrpath* *is* specified, *attrpath* is @@ -243,7 +244,7 @@ operate are determined as follows: … ``` * If you didn't specify the desired outputs, but the derivation has an - attribute `meta.outputsToInstall`, Nix will use those outputs. For + attribute `meta.outputsToInstall`, Lix will use those outputs. For example, since the package `nixpkgs#libxml2` has this attribute: ```console @@ -259,7 +260,7 @@ operate are determined as follows: [store derivation]: ../../glossary.md#gloss-store-derivation -* Otherwise, Nix will use all outputs of the derivation. +* Otherwise, Lix will use all outputs of the derivation. # Nix stores diff --git a/src/nix/optimise-store.md b/src/nix/optimise-store.md index f6fb66f97..0f263bb45 100644 --- a/src/nix/optimise-store.md +++ b/src/nix/optimise-store.md @@ -16,7 +16,7 @@ links to a single instance. Note that you can also set `auto-optimise-store` to `true` in `nix.conf` to perform this optimisation incrementally whenever a new -path is added to the Nix store. To make this efficient, Nix maintains +path is added to the Nix store. To make this efficient, Lix maintains a content-addressed index of all the files in the Nix store in the directory `/nix/store/.links/`. diff --git a/src/nix/ping-store.md b/src/nix/ping-store.md index 8c846791b..1296ef685 100644 --- a/src/nix/ping-store.md +++ b/src/nix/ping-store.md @@ -25,9 +25,9 @@ R""( This command tests whether a particular Nix store (specified by the argument `--store` *url*) can be accessed. What this means is dependent on the type of the store. For instance, for an SSH store it -means that Nix can connect to the specified machine. +means that Lix can connect to the specified machine. -If the command succeeds, Nix returns a exit code of 0 and does not +If the command succeeds, Lix returns a exit code of 0 and does not print any output. )"" diff --git a/src/nix/repl.cc b/src/nix/repl.cc index 9677c1b48..88aeed859 100644 --- a/src/nix/repl.cc +++ b/src/nix/repl.cc @@ -48,7 +48,7 @@ struct CmdRepl : RawInstallablesCommand void applyDefaultInstallables(std::vector<std::string> & rawInstallables) override { if (!experimentalFeatureSettings.isEnabled(Xp::ReplFlake) && !(file) && rawInstallables.size() >= 1) { - warn("future versions of Nix will require using `--file` to load a file"); + warn("future versions of Lix will require using `--file` to load a file"); if (rawInstallables.size() > 1) warn("more than one input file is not currently supported"); auto filePath = rawInstallables[0].data(); diff --git a/src/nix/run.md b/src/nix/run.md index 7639e4d3e..9ed4a87fb 100644 --- a/src/nix/run.md +++ b/src/nix/run.md @@ -26,7 +26,7 @@ R""( ``` Note that `vim` (as of the time of writing of this page) is not an - app but a package. Thus, Nix runs the eponymous file from the `vim` + app but a package. Thus, Lix runs the eponymous file from the `vim` package. * Run `vim` with arguments: diff --git a/src/nix/why-depends.md b/src/nix/why-depends.md index fdbebbedc..8e393c9c4 100644 --- a/src/nix/why-depends.md +++ b/src/nix/why-depends.md @@ -53,18 +53,18 @@ R""( # Description -Nix automatically determines potential runtime dependencies between +Lix automatically determines potential runtime dependencies between store paths by scanning for the *hash parts* of store paths. For instance, if there exists a store path `/nix/store/9df65igwjmf2wbw0gbrrgair6piqjgmi-glibc-2.31`, and a file inside another store path contains the string `9df65igw…`, then the latter store path *refers* to the former, and thus might need it at -runtime. Nix always maintains the existence of the transitive closure +runtime. Lix always maintains the existence of the transitive closure of a store path under the references relationship; it is therefore not possible to install a store path without having all of its references present. -Sometimes Nix packages end up with unexpected runtime dependencies; +Sometimes Lix packages end up with unexpected runtime dependencies; for instance, a reference to a compiler might accidentally end up in a binary, causing the former to be in the latter's closure. This kind of *closure size bloat* is undesirable. diff --git a/precompiled-headers.h b/src/pch/precompiled-headers.hh index f52f1cab8..f52f1cab8 100644 --- a/precompiled-headers.h +++ b/src/pch/precompiled-headers.hh diff --git a/tests/functional/binary-cache.sh b/tests/functional/binary-cache.sh index 7c64a115c..50e23e56c 100644 --- a/tests/functional/binary-cache.sh +++ b/tests/functional/binary-cache.sh @@ -70,7 +70,7 @@ export _NIX_FORCE_HTTP=1 basicDownloadTests -# Test whether Nix notices if the NAR doesn't match the hash in the NAR info. +# Test whether Lix notices if the NAR doesn't match the hash in the NAR info. clearStore nar=$(ls $cacheDir/nar/*.nar.xz | head -n1) diff --git a/tests/functional/build-remote-trustless-should-fail-0.sh b/tests/functional/build-remote-trustless-should-fail-0.sh index 3d4a4b097..1582a7b32 100644 --- a/tests/functional/build-remote-trustless-should-fail-0.sh +++ b/tests/functional/build-remote-trustless-should-fail-0.sh @@ -18,7 +18,7 @@ nix-build build-hook.nix -A passthru.input2 \ --store "$TEST_ROOT/local" \ --option system-features bar -# Now when we go to build that downstream derivation, Nix will try to +# Now when we go to build that downstream derivation, Lix will try to # copy our already-build `input2` to the remote store. That store object # is input-addressed, so this will fail. diff --git a/tests/functional/ca/derivation-json.sh b/tests/functional/ca/derivation-json.sh index c1480fd17..318a32ce0 100644 --- a/tests/functional/ca/derivation-json.sh +++ b/tests/functional/ca/derivation-json.sh @@ -17,7 +17,7 @@ drvPath3=$(nix derivation add --dry-run < $TEST_HOME/foo.json) [[ ! -e "$drvPath3" ]] # But the JSON is rejected without the experimental feature -expectStderr 1 nix derivation add < $TEST_HOME/foo.json --experimental-features nix-command | grepQuiet "experimental Nix feature 'ca-derivations' is disabled" +expectStderr 1 nix derivation add < $TEST_HOME/foo.json --experimental-features nix-command | grepQuiet "experimental Lix feature 'ca-derivations' is disabled" # Without --dry-run it is actually written drvPath4=$(nix derivation add < $TEST_HOME/foo.json) diff --git a/tests/functional/db-migration.sh b/tests/functional/db-migration.sh index 44cd16bc0..7346e32f6 100644 --- a/tests/functional/db-migration.sh +++ b/tests/functional/db-migration.sh @@ -2,7 +2,7 @@ source common.sh -# Only run this if we have an older Nix available +# Only run this if we have an older Lix available # XXX: This assumes that the `daemon` package is older than the `client` one if [[ -z "${NIX_DAEMON_PACKAGE-}" ]]; then skipTest "not using the Nix daemon" diff --git a/tests/functional/fetchTree-file.sh b/tests/functional/fetchTree-file.sh index 6395c133d..7dbc7667c 100644 --- a/tests/functional/fetchTree-file.sh +++ b/tests/functional/fetchTree-file.sh @@ -72,7 +72,7 @@ EOF # old 'tarball' fetcher should still have their type set to 'tarball' assert (nodes.tarball_default_unpack.locked.type == "tarball"); # Unless explicitely specified, the 'unpack' parameter shouldn’t appear here - # because that would break older Nix versions + # because that would break older Nix implementation versions assert (!nodes.tarball_default_unpack.locked ? unpack); assert (nodes.tarball_default_unpack.locked.narHash == "$input_directory_hash"); @@ -94,7 +94,7 @@ EOF [[ -z "${NIX_DAEMON_PACKAGE-}" ]] && return 0 # Ensure that a lockfile generated by the current Nix for tarball inputs - # can still be read by an older Nix + # can still be read by an older Nix implementation cat <<EOF > flake.nix { diff --git a/tests/functional/flakes/flakes.sh b/tests/functional/flakes/flakes.sh index dfa088960..3ef518b23 100644 --- a/tests/functional/flakes/flakes.sh +++ b/tests/functional/flakes/flakes.sh @@ -485,6 +485,16 @@ nix flake lock $flake3Dir nix flake update flake2/flake1 --flake "$flake3Dir" [[ $(jq -r .nodes.flake1_2.locked.rev "$flake3Dir/flake.lock") =~ $hash2 ]] +# Test updating multiple inputs. +nix flake lock "$flake3Dir" --override-input flake1 flake1/master/$hash1 +nix flake lock "$flake3Dir" --override-input flake2/flake1 flake1/master/$hash1 +[[ $(jq -r .nodes.flake1.locked.rev "$flake3Dir/flake.lock") =~ $hash1 ]] +[[ $(jq -r .nodes.flake1_2.locked.rev "$flake3Dir/flake.lock") =~ $hash1 ]] + +nix flake update flake1 flake2/flake1 --flake "$flake3Dir" +[[ $(jq -r .nodes.flake1.locked.rev "$flake3Dir/flake.lock") =~ $hash2 ]] +[[ $(jq -r .nodes.flake1_2.locked.rev "$flake3Dir/flake.lock") =~ $hash2 ]] + # Test 'nix flake metadata --json'. nix flake metadata $flake3Dir --json | jq . diff --git a/tests/functional/impure-derivations.sh b/tests/functional/impure-derivations.sh index 39d053a04..38be4234e 100644 --- a/tests/functional/impure-derivations.sh +++ b/tests/functional/impure-derivations.sh @@ -17,7 +17,7 @@ drvPath2=$(nix derivation add < $TEST_HOME/impure-drv.json) [[ "$drvPath" = "$drvPath2" ]] # But only with the experimental feature! -expectStderr 1 nix derivation add < $TEST_HOME/impure-drv.json --experimental-features nix-command | grepQuiet "experimental Nix feature 'impure-derivations' is disabled" +expectStderr 1 nix derivation add < $TEST_HOME/impure-drv.json --experimental-features nix-command | grepQuiet "experimental Lix feature 'impure-derivations' is disabled" nix build --dry-run --json --file ./impure-derivations.nix impure.all json=$(nix build -L --no-link --json --file ./impure-derivations.nix impure.all) diff --git a/tests/functional/lang/eval-okay-foldlStrict-lazy-initial-accumulator.nix b/tests/functional/lang/eval-okay-foldlStrict-lazy-initial-accumulator.nix index abcd5366a..148e94954 100644 --- a/tests/functional/lang/eval-okay-foldlStrict-lazy-initial-accumulator.nix +++ b/tests/functional/lang/eval-okay-foldlStrict-lazy-initial-accumulator.nix @@ -1,5 +1,5 @@ # Checks that the nul value for the accumulator is not forced unconditionally. -# Some languages provide a foldl' that is strict in this argument, but Nix does not. +# Some languages provide a foldl' that is strict in this argument, but Nix language does not. builtins.foldl' (_: x: x) (throw "This is never forced") diff --git a/tests/functional/lang/eval-okay-fromTOML.nix b/tests/functional/lang/eval-okay-fromTOML.nix index 963932689..4704b62cc 100644 --- a/tests/functional/lang/eval-okay-fromTOML.nix +++ b/tests/functional/lang/eval-okay-fromTOML.nix @@ -89,7 +89,7 @@ bool1 = true bool2 = false - # FIXME: not supported because Nix doesn't have a date/time type. + # FIXME: not supported because Nix language doesn't have a date/time type. #odt1 = 1979-05-27T07:32:00Z #odt2 = 1979-05-27T00:32:00-07:00 #odt3 = 1979-05-27T00:32:00.999999-07:00 diff --git a/tests/functional/nested-sandboxing/command.sh b/tests/functional/nested-sandboxing/command.sh index 69366486c..f35fff9ed 100644 --- a/tests/functional/nested-sandboxing/command.sh +++ b/tests/functional/nested-sandboxing/command.sh @@ -1,5 +1,5 @@ export NIX_BIN_DIR=$(dirname $(type -p nix)) -# TODO Get Nix and its closure more flexibly +# TODO Get Lix and its closure more flexibly export EXTRA_SANDBOX="/nix/store $(dirname $NIX_BIN_DIR)" badStoreUrl () { diff --git a/tests/functional/repl_characterization/test-session.cc b/tests/functional/repl_characterization/test-session.cc index be3d407f3..e59064fc5 100644 --- a/tests/functional/repl_characterization/test-session.cc +++ b/tests/functional/repl_characterization/test-session.cc @@ -173,7 +173,7 @@ void TestSession::runCommand(std::string command) std::cerr << "runCommand " << command << "\n"; } command += "\n"; - // We have to feed a newline into the output parser, since Nix might not + // We have to feed a newline into the output parser, since Lix might not // give us a newline before a prompt in all cases (it might clear line // first, e.g.) outputParser.feed('\n'); diff --git a/tests/installer/default.nix b/tests/installer/default.nix index 49cfd2bcc..6d3e19987 100644 --- a/tests/installer/default.nix +++ b/tests/installer/default.nix @@ -202,7 +202,7 @@ let # use a plain tarpipe instead tar -C ${mockChannel pkgs} -c channel | ssh -p 20022 $ssh_opts vagrant@localhost tar x -f- - echo "Testing Nix installation..." + echo "Testing Lix installation..." $ssh <<EOF set -ex diff --git a/tests/nixos/tarball-flakes.nix b/tests/nixos/tarball-flakes.nix index 2c0df60ee..ca7627bd1 100644 --- a/tests/nixos/tarball-flakes.nix +++ b/tests/nixos/tarball-flakes.nix @@ -5,7 +5,7 @@ let root = pkgs.runCommand "nixpkgs-flake" {} '' - mkdir -p $out/stable + mkdir -p $out/{stable,tags} set -x dir=nixpkgs-${nixpkgs.shortRev} @@ -14,9 +14,13 @@ let find $dir -print0 | xargs -0 touch -h -t ${builtins.substring 0 12 nixpkgs.lastModifiedDate}.${builtins.substring 12 2 nixpkgs.lastModifiedDate} -- tar cfz $out/stable/${nixpkgs.rev}.tar.gz $dir --hard-dereference - echo 'Redirect "/latest.tar.gz" "/stable/${nixpkgs.rev}.tar.gz"' > $out/.htaccess - - echo 'Header set Link "<http://localhost/stable/${nixpkgs.rev}.tar.gz?rev=${nixpkgs.rev}&revCount=1234>; rel=\"immutable\""' > $out/stable/.htaccess + # Set the "Link" header on the redirect but not the final response to + # simulate an S3-like serving environment where the final host cannot set + # arbitrary headers. + cat >$out/tags/.htaccess <<EOF + Redirect "/tags/latest.tar.gz" "/stable/${nixpkgs.rev}.tar.gz" + Header always set Link "<http://localhost/stable/${nixpkgs.rev}.tar.gz?rev=${nixpkgs.rev}&revCount=1234>; rel=\"immutable\"" + EOF ''; in @@ -59,7 +63,7 @@ in machine.wait_for_unit("httpd.service") - out = machine.succeed("nix flake metadata --json http://localhost/latest.tar.gz") + out = machine.succeed("nix flake metadata --json http://localhost/tags/latest.tar.gz") print(out) info = json.loads(out) @@ -74,14 +78,14 @@ in assert rev_count == 1234, f"{rev_count=} != 1234" # Check that fetching with rev/revCount/narHash succeeds. - machine.succeed("nix flake metadata --json http://localhost/latest.tar.gz?rev=" + revision) - machine.succeed("nix flake metadata --json http://localhost/latest.tar.gz?revCount=" + str(rev_count)) - machine.succeed("nix flake metadata --json http://localhost/latest.tar.gz?narHash=" + info["locked"]["narHash"]) + machine.succeed("nix flake metadata --json http://localhost/tags/latest.tar.gz?rev=" + revision) + machine.succeed("nix flake metadata --json http://localhost/tags/latest.tar.gz?revCount=" + str(rev_count)) + machine.succeed("nix flake metadata --json http://localhost/tags/latest.tar.gz?narHash=" + info["locked"]["narHash"]) # Check that fetching fails if we provide incorrect attributes. - machine.fail("nix flake metadata --json http://localhost/latest.tar.gz?rev=493300eb13ae6fb387fbd47bf54a85915acc31c0") - machine.fail("nix flake metadata --json http://localhost/latest.tar.gz?revCount=789") - machine.fail("nix flake metadata --json http://localhost/latest.tar.gz?narHash=sha256-tbudgBSg+bHWHiHnlteNzN8TUvI80ygS9IULh4rklEw=") + machine.fail("nix flake metadata --json http://localhost/tags/latest.tar.gz?rev=493300eb13ae6fb387fbd47bf54a85915acc31c0") + machine.fail("nix flake metadata --json http://localhost/tags/latest.tar.gz?revCount=789") + machine.fail("nix flake metadata --json http://localhost/tags/latest.tar.gz?narHash=sha256-tbudgBSg+bHWHiHnlteNzN8TUvI80ygS9IULh4rklEw=") ''; } diff --git a/tests/unit/meson.build b/tests/unit/meson.build index 35a11a5d3..06aff4626 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build @@ -64,10 +64,11 @@ libutil_tester = executable( gtest, boehm, liblixutil, - liblixexpr, + liblixexpr_mstatic, liblixutil_test_support, nlohmann_json, ], + cpp_pch : ['../../src/pch/precompiled-headers.hh'], ) test( @@ -102,6 +103,7 @@ libstore_test_support = library( include_directories : include_directories( 'libstore-support', ), + cpp_pch : ['../../src/pch/precompiled-headers.hh'], ) liblixstore_test_support = declare_dependency( include_directories : include_directories('libstore-support'), @@ -129,12 +131,13 @@ libstore_tester = executable( dependencies : [ liblixstore_test_support, liblixutil_test_support, - liblixstore, + liblixstore_mstatic, liblixutil, rapidcheck, gtest, nlohmann_json, ], + cpp_pch : ['../../src/pch/precompiled-headers.hh'], ) test( @@ -166,6 +169,7 @@ libexpr_test_support = library( include_directories : include_directories( 'libexpr-support', ), + cpp_pch : ['../../src/pch/precompiled-headers.hh'], ) liblixexpr_test_support = declare_dependency( include_directories : include_directories('libexpr-support'), @@ -190,15 +194,16 @@ libexpr_tester = executable( dependencies : [ liblixexpr_test_support, liblixstore_test_support, - liblixstore, + liblixstore_mstatic, liblixutil, - liblixexpr, - liblixfetchers, + liblixexpr_mstatic, + liblixfetchers_mstatic, rapidcheck, boehm, gtest, nlohmann_json, ], + cpp_pch : ['../../src/pch/precompiled-headers.hh'], ) test( @@ -220,11 +225,12 @@ libcmd_tester = executable( liblixcmd, liblixutil, liblixmain, - liblixexpr, - liblixstore, + liblixexpr_mstatic, + liblixstore_mstatic, gtest, boost, ], + cpp_pch : ['../../src/pch/precompiled-headers.hh'], ) test( |