primops: Run iwyu and update includes

Change-Id: Ic3f48d6fca6ca1ae444475f7ccdee6220da946de
primops: Explicit registering of primops
2024-05-30 13:13:00 +02:00 · 2024-05-30 12:57:17 +02:00 · 2024-05-30 12:57:17 +02:00 · 2024-05-30 12:56:04 +02:00 · 2024-05-30 12:56:04 +02:00 · 2024-05-30 12:56:04 +02:00
456 changed files with 12881 additions and 13278 deletions
@@ -24,3 +24,8 @@ indent_size = 4
 # Match diffs, avoid to trim trailing whitespace
 [*.{diff,patch}]
 trim_trailing_whitespace = false
+
+[*.md]
+indent_style = space
+indent_size = 2
+max_line_length = 0
@@ -1,76 +1,53 @@
-# Contributing to Nix
+# Contributing to Lix

-Welcome and thank you for your interest in contributing to Nix!
-We appreciate your support.
+Welcome and thank you for considering contributing to Lix! We're currently in a soft release phase, and your support means a lot to us.

-Reading and following these guidelines will help us make the contribution process easy and effective for everyone involved.
+To ensure a smooth and effective contribution process, here is a summary of our guidelines:
+
+## Getting help?
+
+If you have any question regarding getting started or reporting bugs, feel free
+to reach out to us.
+
+On Matrix, we have a space at `#space:lix.systems`, composed of:
+
+- [`#discuss:lix.systems`](https://matrix.to/#/#discuss:lix.systems) for discussions on Lix.
+- [`#dev:lix.systems`](https://matrix.to/#/#dev:lix.systems) for the development channel on Lix.

 ## Report a bug

-1. Check on the [GitHub issue tracker](https://github.com/NixOS/nix/issues) if your bug was already reported.
+- Check if your bug has already been reported in the [issue tracker](https://git.lix.systems/lix-project/lix/issues).
+- If you can't find the bug or feature, please open a new issue.

-2. If you were not able to find the bug or feature [open a new issue](https://github.com/NixOS/nix/issues/new/choose)
-
-3. The issue templates will guide you in specifying your issue.
-   The more complete the information you provide, the more likely it can be found by others and the more useful it is in the future.
-   Make sure reported bugs can be reproduced easily.
-
-4. Once submitted, do not expect issues to be picked up or solved right away.
-   The only way to ensure this, is to [work on the issue yourself](#making-changes-to-nix).
+We maintain a copy of the upstream Nix bugs. Their organisation can be read about [here](https://wiki.lix.systems/books/lix-contributors/page/bug-tracker-organisation).

 ## Report a security vulnerability

-Check out the [security policy](https://github.com/NixOS/nix/security/policy).
+For security vulnerabilities, reach out by email at `security at lix dot systems`.

-## Making changes to Nix
+## Making changes to Lix

-1. Check for [pull requests](https://github.com/NixOS/nix/pulls) that might already cover the contribution you are about to make.
-   There are many open pull requests that might already do what you intent to work on.
-   You can use [labels](https://github.com/NixOS/nix/labels) to filter for relevant topics.
+Before diving into making changes, we want to engage with you and your ideas.

-2. Search for related issues that cover what you're going to work on. It could help to mention there that you will work on the issue.
+We have a few policies in effect; please take the time to familiarize yourself:

-   Issues labeled [good first issue](https://github.com/NixOS/nix/labels/good-first-issue) should be relatively easy to fix and are likely to get merged quickly.
-   Pull requests addressing issues labeled [idea approved](https://github.com/NixOS/nix/labels/idea%20approved) are especially welcomed by maintainers and will receive prioritised review.
+- [Style guide on code](https://wiki.lix.systems/books/lix-contributors/page/code)
+- [Freeze policy and recommended contributions](https://wiki.lix.systems/books/lix-contributors/page/freezes-and-recommended-contributions)

-3. Check the [Nix reference manual](https://nixos.org/manual/nix/unstable/contributing/hacking.html) for information on building Nix and running its tests.
+To avoid duplication of effort, it may be a good idea to check out the list of
+[pending pull requests](https://gerrit.lix.systems/q/status:open+-is:wip) (or "change lists", as Gerrit calls them). Once you have
+an idea of what you might want to do, we recommend dropping a message on our
+Matrix to ensure your contribution fits with our current schedule and plans

-   For contributions to the command line interface, please check the [CLI guidelines](https://nixos.org/manual/nix/unstable/contributing/cli-guideline.html).
+When you're ready and your changes are ready to go:

-4. Make your changes!
+- Submit your code.
+  - Submitting a GitHub PR [on our mirror](https://github.com/lix-project/lix) is totally ok if that's easier for you and your change is relatively small (300 lines or so).

-5. [Create a pull request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request) for your changes.
-   * Link related issues in your pull request to inform interested parties and future contributors about your change.
-   * Make sure to have [a clean history of commits on your branch by using rebase](https://www.digitalocean.com/community/tutorials/how-to-rebase-and-update-a-pull-request).
-     If your pull request closes one or multiple issues, note that in the description using `Closes: #<number>`, as it will then happen automatically when your change is merged.
-   * [Mark the pull request as draft](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request) if you're not done with the changes.
+    We may ask you to resubmit it as a Gerrit CL if it is necessary for the change you're making.
+  - Our primary code review system is [our Gerrit instance](https://gerrit.lix.systems), where you can open a change list (CL).
+    If you're new to Gerrit, check out [our wiki page about Gerrit](https://wiki.lix.systems/books/lix-contributors/page/gerrit).
+- Make sure to link any related issues.
+- If needed, indicate that the change is 'work in progress'.

-6. Do not expect your pull request to be reviewed immediately.
-   Nix maintainers follow a [structured process for reviews and design decisions](https://github.com/NixOS/nix/tree/master/maintainers#project-board-protocol), which may or may not prioritise your work.
-
-   Following this checklist will make the process smoother for everyone:
-
-   - [ ] Fixes an [idea approved](https://github.com/NixOS/nix/labels/idea%20approved) issue
-   - [ ] Tests, as appropriate:
-     - Functional tests – [`tests/functional/**.sh`](./tests/functional)
-     - Unit tests – [`src/*/tests`](./src/)
-     - Integration tests – [`tests/nixos/*`](./tests/nixos)
-   - [ ] User documentation in the [manual](..doc/manual/src)
-   - [ ] API documentation in header files
-   - [ ] Code and comments are self-explanatory
-   - [ ] Commit message explains **why** the change was made
-   - [ ] New feature or incompatible change: updated [release notes](./doc/manual/src/release-notes/rl-next.md)
-
-7. If you need additional feedback or help to getting pull request into shape, ask other contributors using [@mentions](https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax#mentioning-people-and-teams).
-
-## Making changes to the Nix manual
-
-The Nix reference manual is hosted on https://nixos.org/manual/nix.
-The underlying source files are located in [`doc/manual/src`](./doc/manual/src).
-For small changes you can [use GitHub to edit these files](https://docs.github.com/en/repositories/working-with-files/managing-files/editing-files)
-For larger changes see the [Nix reference manual](https://nixos.org/manual/nix/unstable/contributing/hacking.html).
-
-## Getting help
-
-Whenever you're stuck or do not know how to proceed, you can always ask for help.
-The appropriate channels to do so can be found on the [NixOS Community](https://nixos.org/community/) page.
+You can obtain an account on our platforms by clicking "Sign In with GitHub" on the sign-in page.
@@ -1,71 +0,0 @@
-include mk/build-dir.mk
-
-include $(buildprefix)Makefile.config
-clean-files += $(buildprefix)Makefile.config
-
-ifeq ($(ENABLE_BUILD), yes)
-makefiles = \
-  mk/precompiled-headers.mk \
-  local.mk \
-  src/libutil/local.mk \
-  src/libstore/local.mk \
-  src/libfetchers/local.mk \
-  src/libmain/local.mk \
-  src/libexpr/local.mk \
-  src/libcmd/local.mk \
-  src/nix/local.mk \
-  src/resolve-system-dependencies/local.mk \
-  scripts/local.mk \
-  misc/bash/local.mk \
-  misc/fish/local.mk \
-  misc/zsh/local.mk \
-  misc/systemd/local.mk \
-  misc/launchd/local.mk
-endif
-
-ifeq ($(ENABLE_BUILD)_$(ENABLE_TESTS), yes_yes)
-UNIT_TEST_ENV = _NIX_TEST_UNIT_DATA=unit-test-data
-makefiles += \
-  tests/unit/libutil/local.mk \
-  tests/unit/libutil-support/local.mk \
-  tests/unit/libstore/local.mk
-endif
-
-ifeq ($(ENABLE_TESTS), yes)
-makefiles += \
-  tests/unit/libstore-support/local.mk \
-  tests/unit/libexpr/local.mk \
-  tests/unit/libexpr-support/local.mk \
-  tests/functional/local.mk \
-  tests/functional/ca/local.mk \
-  tests/functional/dyn-drv/local.mk \
-  tests/functional/test-libstoreconsumer/local.mk \
-  tests/functional/repl_characterization/local.mk \
-  tests/functional/plugins/local.mk
-else
-makefiles += \
-  mk/disable-tests.mk
-endif
-
-# Some makefiles require access to built programs and must be included late.
-makefiles-late =
-
-ifeq ($(ENABLE_BUILD), yes)
-makefiles-late += doc/manual/local.mk
-makefiles-late += doc/internal-api/local.mk
-endif
-
-# Miscellaneous global Flags
-
-OPTIMIZE = 1
-
-ifeq ($(OPTIMIZE), 1)
-  GLOBAL_CXXFLAGS += -O2 $(CXXLTO)
-  GLOBAL_LDFLAGS += $(CXXLTO)
-else
-  GLOBAL_CXXFLAGS += -O0 -U_FORTIFY_SOURCE
-endif
-
-include mk/lib.mk
-
-GLOBAL_CXXFLAGS += -g -Wall -Wimplicit-fallthrough -include $(buildprefix)config.h -std=c++2a -I src
@@ -1,52 +0,0 @@
-AR = @AR@
-BDW_GC_LIBS = @BDW_GC_LIBS@
-BOOST_LDFLAGS = @BOOST_LDFLAGS@
-BUILD_SHARED_LIBS = @BUILD_SHARED_LIBS@
-CC = @CC@
-CFLAGS = @CFLAGS@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CXXLTO = @CXXLTO@
-EDITLINE_LIBS = @EDITLINE_LIBS@
-ENABLE_S3 = @ENABLE_S3@
-GTEST_LIBS = @GTEST_LIBS@
-HAVE_LIBCPUID = @HAVE_LIBCPUID@
-HAVE_SECCOMP = @HAVE_SECCOMP@
-HOST_OS = @host_os@
-LDFLAGS = @LDFLAGS@
-LIBARCHIVE_LIBS = @LIBARCHIVE_LIBS@
-LIBBROTLI_LIBS = @LIBBROTLI_LIBS@
-LIBCURL_LIBS = @LIBCURL_LIBS@
-LIBSECCOMP_LIBS = @LIBSECCOMP_LIBS@
-LOWDOWN_LIBS = @LOWDOWN_LIBS@
-NIXDOC_LIBS = -llix_doc
-OPENSSL_LIBS = @OPENSSL_LIBS@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-RAPIDCHECK_HEADERS = @RAPIDCHECK_HEADERS@
-SHELL = @bash@
-SODIUM_LIBS = @SODIUM_LIBS@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-bash = @bash@
-bindir = @bindir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-doc_generate = @doc_generate@
-docdir = @docdir@
-embedded_sandbox_shell = @embedded_sandbox_shell@
-exec_prefix = @exec_prefix@
-includedir = @includedir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-lsof = @lsof@
-mandir = @mandir@
-pkglibdir = $(libdir)/$(PACKAGE_NAME)
-prefix = @prefix@
-sandbox_shell = @sandbox_shell@
-storedir = @storedir@
-sysconfdir = @sysconfdir@
-system = @system@
-ENABLE_BUILD = @ENABLE_BUILD@
-ENABLE_TESTS = @ENABLE_TESTS@
-internal_api_docs = @internal_api_docs@
@@ -22,7 +22,7 @@ See our [Hacking guide](https://git.lix.systems/lix-project/lix/src/branch/main/
 ## Additional Resources

 - [Our wiki](https://wiki.lix.systems)
- [Matrix - #nix:nixos.org](https://matrix.to/#/#space:lix.systems)
+- [Matrix - #space:lix.systems](https://matrix.to/#/#space:lix.systems)

 ## License

@@ -44,32 +44,41 @@ void FixIncludesCallbacks::LexedFileChanged(FileID, LexedFileChangeReason,
 }

 void FixIncludesCallbacks::InclusionDirective(
-    SourceLocation, const Token &, StringRef, bool,
+    SourceLocation, const Token &, StringRef FileName, bool IsAngled,
    CharSourceRange FilenameRange, OptionalFileEntryRef File, StringRef,
    StringRef, const Module *, SrcMgr::CharacteristicKind) {
  if (Ignore)
    return;

  // FIXME: this is kinda evil, but this is a one-time fixup
-  const std::string SourceDir = "src/";
+  const std::vector<std::string> SourceDirs = {"src/", "include/lix/"};

-  if (File && File->getNameAsRequested().contains(SourceDir)) {
-    StringRef Name = File->getNameAsRequested();
-    auto Idx = Name.find(SourceDir);
-    assert(Idx != std::string::npos);
-    StringRef Suffix = Name.drop_front(Idx + SourceDir.length());
+  const auto Bracketize = [IsAngled](StringRef s) {
+    return IsAngled ? ("<" + s + ">").str() : ("\"" + s + "\"").str();
+  };

-    if (!Suffix.starts_with("lib")) {
-      llvm::dbgs() << "ignored: " << Suffix << "\n";
-      return;
+  for (const auto &SourceDir : SourceDirs) {
+    const bool IsAlreadyFixed = FileName.starts_with("lix/lib");
+    if (File && File->getNameAsRequested().contains(SourceDir) &&
+        !IsAlreadyFixed) {
+      StringRef Name = File->getNameAsRequested();
+      auto Idx = Name.find(SourceDir);
+      assert(Idx != std::string::npos);
+      std::string Suffix = Name.drop_front(Idx + SourceDir.length()).str();
+
+      if (!Suffix.starts_with("lib")) {
+        llvm::dbgs() << "ignored: " << Suffix << "\n";
+        return;
+      }
+
+      Suffix = "lix/" + Suffix;
+
+      auto Diag = Check.diag(FilenameRange.getBegin(),
+                             "include needs to specify the source subdir");
+
+      Diag << FilenameRange
+           << FixItHint::CreateReplacement(FilenameRange, Bracketize(Suffix));
    }
-
-    auto Diag = Check.diag(FilenameRange.getBegin(),
-                           "include needs to specify the source subdir");
-
-    Diag << FilenameRange
-         << FixItHint::CreateReplacement(FilenameRange,
-                                         ("\"" + Suffix + "\"").str());
  }
 }

@@ -1,6 +1,6 @@
-# Clang tidy lints for Nix
+# Clang tidy lints for Lix

-This is a skeleton of a clang-tidy lints library for Nix.
+This is a skeleton of a clang-tidy lints library for Lix.

 Currently there is one check (which is already obsolete as it has served its
 goal and is there as an example), `HasPrefixSuffixCheck`.
@@ -10,13 +10,13 @@ goal and is there as an example), `HasPrefixSuffixCheck`.
 One file:

 ```
-ninja -C build && clang-tidy --checks='-*,nix-*' --load=build/libnix-clang-tidy.so -p ../compile_commands.json --fix ../src/libcmd/installables.cc
+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
 ```

 Several files, in parallel:

 ```
-ninja -C build && run-clang-tidy -checks='-*,nix-*' -load=build/libnix-clang-tidy.so -p .. -fix ../src | tee -a clang-tidy-result
+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
 ```

 ## Resources
@@ -1,396 +0,0 @@
-AC_INIT([nix],[m4_esyscmd(bash -c "echo -n $(cat ./.version)$VERSION_SUFFIX")])
-AC_CONFIG_MACRO_DIRS([m4])
-AC_CONFIG_SRCDIR(README.md)
-AC_CONFIG_AUX_DIR(config)
-
-AC_PROG_SED
-
-# Construct a Nix system name (like "i686-linux"):
-# https://www.gnu.org/software/autoconf/manual/html_node/Canonicalizing.html#index-AC_005fCANONICAL_005fHOST-1
-# The inital value is produced by the `config/config.guess` script:
-# upstream: https://git.savannah.gnu.org/cgit/config.git/tree/config.guess
-# It has the following form, which is not documented anywhere:
-# <cpu>-<vendor>-<os>[<version>][-<abi>]
-# If `./configure` is passed any of the `--host`, `--build`, `--target` options, the value comes from `config/config.sub` instead:
-# upstream: https://git.savannah.gnu.org/cgit/config.git/tree/config.sub
-AC_CANONICAL_HOST
-AC_MSG_CHECKING([for the canonical Nix system name])
-
-AC_ARG_WITH(system, AS_HELP_STRING([--with-system=SYSTEM],[Platform identifier (e.g., `i686-linux').]),
-  [system=$withval],
-  [case "$host_cpu" in
-     i*86)
-        machine_name="i686";;
-     amd64)
-        machine_name="x86_64";;
-     armv6|armv7)
-        machine_name="${host_cpu}l";;
-     *)
-        machine_name="$host_cpu";;
-   esac
-
-   case "$host_os" in
-     linux-gnu*|linux-musl*)
-        # For backward compatibility, strip the `-gnu' part.
-        system="$machine_name-linux";;
-     *)
-        # Strip the version number from names such as `gnu0.3',
-        # `darwin10.2.0', etc.
-        system="$machine_name-`echo $host_os | "$SED" -e's/@<:@0-9.@:>@*$//g'`";;
-   esac])
-
-AC_MSG_RESULT($system)
-AC_SUBST(system)
-AC_DEFINE_UNQUOTED(SYSTEM, ["$system"], [platform identifier ('cpu-os')])
-
-
-# State should be stored in /nix/var, unless the user overrides it explicitly.
-test "$localstatedir" = '${prefix}/var' && localstatedir=/nix/var
-
-# Assign a default value to C{,XX}FLAGS as the default configure script sets them
-# to -O2 otherwise, which we don't want to have hardcoded
-CFLAGS=${CFLAGS-""}
-CXXFLAGS=${CXXFLAGS-""}
-
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_CPP
-
-AC_CHECK_TOOL([AR], [ar])
-
-# Use 64-bit file system calls so that we can support files > 2 GiB.
-AC_SYS_LARGEFILE
-
-
-# Solaris-specific stuff.
-AC_STRUCT_DIRENT_D_TYPE
-case "$host_os" in
-  solaris*)
-    # Solaris requires -lsocket -lnsl for network functions
-    LDFLAGS="-lsocket -lnsl $LDFLAGS"
-    ;;
-esac
-
-
-ENSURE_NO_GCC_BUG_80431
-
-
-# Check for pubsetbuf.
-AC_MSG_CHECKING([for pubsetbuf])
-AC_LANG_PUSH(C++)
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <iostream>
-using namespace std;
-static char buf[1024];]],
-    [[cerr.rdbuf()->pubsetbuf(buf, sizeof(buf));]])],
-    [AC_MSG_RESULT(yes) AC_DEFINE(HAVE_PUBSETBUF, 1, [Whether pubsetbuf is available.])],
-    AC_MSG_RESULT(no))
-AC_LANG_POP(C++)
-
-
-AC_CHECK_FUNCS([statvfs pipe2])
-
-
-# Check for lutimes, optionally used for changing the mtime of
-# symlinks.
-AC_CHECK_FUNCS([lutimes])
-
-
-# Check whether the store optimiser can optimise symlinks.
-AC_MSG_CHECKING([whether it is possible to create a link to a symlink])
-ln -s bla tmp_link
-if ln tmp_link tmp_link2 2> /dev/null; then
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(CAN_LINK_SYMLINK, 1, [Whether link() works on symlinks.])
-else
-    AC_MSG_RESULT(no)
-fi
-rm -f tmp_link tmp_link2
-
-
-# Check for <locale>.
-AC_LANG_PUSH(C++)
-AC_CHECK_HEADERS([locale])
-AC_LANG_POP(C++)
-
-
-AC_DEFUN([NEED_PROG],
-[
-AC_PATH_PROG($1, $2)
-if test -z "$$1"; then
-    AC_MSG_ERROR([$2 is required])
-fi
-])
-
-NEED_PROG(bash, bash)
-AC_PATH_PROG(flex, flex, false)
-AC_PATH_PROG(bison, bison, false)
-AC_PATH_PROG(dot, dot)
-AC_PATH_PROG(lsof, lsof, lsof)
-NEED_PROG(jq, jq)
-
-
-AC_SUBST(coreutils, [$(dirname $(type -p cat))])
-
-
-AC_ARG_WITH(store-dir, AS_HELP_STRING([--with-store-dir=PATH],[path of the Nix store (defaults to /nix/store)]),
-  storedir=$withval, storedir='/nix/store')
-AC_SUBST(storedir)
-
-
-# Look for boost, a required dependency.
-# Note that AX_BOOST_BASE only exports *CPP* BOOST_CPPFLAGS, no CXX flags,
-# and CPPFLAGS are not passed to the C++ compiler automatically.
-# Thus we append the returned CPPFLAGS to the CXXFLAGS here.
-AX_BOOST_BASE([1.66], [CXXFLAGS="$BOOST_CPPFLAGS $CXXFLAGS"], [AC_MSG_ERROR([Nix requires boost.])])
-# For unknown reasons, setting this directly in the ACTION-IF-FOUND above
-# ends up with LDFLAGS being empty, so we set it afterwards.
-LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"
-
-# On some platforms, new-style atomics need a helper library
-AC_MSG_CHECKING(whether -latomic is needed)
-AC_LINK_IFELSE([AC_LANG_SOURCE([[
-#include <stdint.h>
-uint64_t v;
-int main() {
-    return (int)__atomic_load_n(&v, __ATOMIC_ACQUIRE);
-}]])], GCC_ATOMIC_BUILTINS_NEED_LIBATOMIC=no, GCC_ATOMIC_BUILTINS_NEED_LIBATOMIC=yes)
-AC_MSG_RESULT($GCC_ATOMIC_BUILTINS_NEED_LIBATOMIC)
-if test "x$GCC_ATOMIC_BUILTINS_NEED_LIBATOMIC" = xyes; then
-    LDFLAGS="-latomic $LDFLAGS"
-fi
-
-# Running the functional tests without building Nix is useful for testing
-# different pre-built versions of Nix against each other.
-AC_ARG_ENABLE(build, AS_HELP_STRING([--disable-build],[Do not build nix]),
-  ENABLE_BUILD=$enableval, ENABLE_BUILD=yes)
-AC_SUBST(ENABLE_BUILD)
-# Building without tests is useful for bootstrapping with a smaller footprint
-# or running the tests in a separate derivation. Otherwise, we do compile and
-# run them.
-AC_ARG_ENABLE(tests, AS_HELP_STRING([--disable-tests],[Do not build the tests]),
-  ENABLE_TESTS=$enableval, ENABLE_TESTS=yes)
-AC_SUBST(ENABLE_TESTS)
-
-# Building without API docs is the default as Nix' C++ interfaces are internal and unstable.
-AC_ARG_ENABLE(internal_api_docs, AS_HELP_STRING([--enable-internal-api-docs],[Build API docs for Nix's internal unstable C++ interfaces]),
-  internal_api_docs=$enableval, internal_api_docs=no)
-AC_SUBST(internal_api_docs)
-
-# LTO is currently broken with clang for unknown reasons; ld segfaults in the llvm plugin
-AC_ARG_ENABLE(lto, AS_HELP_STRING([--enable-lto],[Enable LTO (only supported with GCC) [default=no]]),
-  lto=$enableval, lto=no)
-if test "$lto" = yes; then
-    if $CXX --version | grep -q GCC; then
-        AC_SUBST(CXXLTO, [-flto=jobserver])
-    else
-        echo "error: LTO is only supported with GCC at the moment" >&2
-        exit 1
-    fi
-else
-    AC_SUBST(CXXLTO, [""])
-fi
-
-PKG_PROG_PKG_CONFIG
-
-AC_ARG_ENABLE(shared, AS_HELP_STRING([--enable-shared],[Build shared libraries for Nix [default=yes]]),
-  shared=$enableval, shared=yes)
-if test "$shared" = yes; then
-  AC_SUBST(BUILD_SHARED_LIBS, 1, [Whether to build shared libraries.])
-else
-  AC_SUBST(BUILD_SHARED_LIBS, 0, [Whether to build shared libraries.])
-  PKG_CONFIG="$PKG_CONFIG --static"
-fi
-
-# Look for OpenSSL, a required dependency. FIXME: this is only (maybe)
-# used by S3BinaryCacheStore.
-PKG_CHECK_MODULES([OPENSSL], [libcrypto >= 1.1.1], [CXXFLAGS="$OPENSSL_CFLAGS $CXXFLAGS"])
-
-
-# Look for libarchive.
-PKG_CHECK_MODULES([LIBARCHIVE], [libarchive >= 3.1.2], [CXXFLAGS="$LIBARCHIVE_CFLAGS $CXXFLAGS"])
-# Workaround until https://github.com/libarchive/libarchive/issues/1446 is fixed
-if test "$shared" != yes; then
-    LIBARCHIVE_LIBS+=' -lz'
-fi
-
-# Look for SQLite, a required dependency.
-PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= 3.6.19], [CXXFLAGS="$SQLITE3_CFLAGS $CXXFLAGS"])
-
-# Look for libcurl, a required dependency.
-PKG_CHECK_MODULES([LIBCURL], [libcurl], [CXXFLAGS="$LIBCURL_CFLAGS $CXXFLAGS"])
-
-# Look for editline, a required dependency.
-# The the libeditline.pc file was added only in libeditline >= 1.15.2,
-# see https://github.com/troglobit/editline/commit/0a8f2ef4203c3a4a4726b9dd1336869cd0da8607,
-# but e.g. Ubuntu 16.04 has an older version, so we fall back to searching for
-# editline.h when the pkg-config approach fails.
-PKG_CHECK_MODULES([EDITLINE], [libeditline], [CXXFLAGS="$EDITLINE_CFLAGS $CXXFLAGS"], [
-  AC_CHECK_HEADERS([editline.h], [true],
-    [AC_MSG_ERROR([Nix requires libeditline; it was found neither via pkg-config nor its normal header.])])
-  AC_SEARCH_LIBS([readline read_history], [editline], [],
-    [AC_MSG_ERROR([Nix requires libeditline; it was not found via pkg-config, but via its header, but required functions do not work. Maybe it is too old? >= 1.14 is required.])])
-])
-
-# Look for libsodium.
-PKG_CHECK_MODULES([SODIUM], [libsodium], [CXXFLAGS="$SODIUM_CFLAGS $CXXFLAGS"])
-
-# Look for libbrotli{enc,dec}.
-PKG_CHECK_MODULES([LIBBROTLI], [libbrotlienc libbrotlidec], [CXXFLAGS="$LIBBROTLI_CFLAGS $CXXFLAGS"])
-
-# Look for libcpuid.
-have_libcpuid=
-if test "$machine_name" = "x86_64"; then
-    AC_ARG_ENABLE([cpuid],
-                  AS_HELP_STRING([--disable-cpuid], [Do not determine microarchitecture levels with libcpuid (relevant to x86_64 only)]))
-    if test "x$enable_cpuid" != "xno"; then
-      PKG_CHECK_MODULES([LIBCPUID], [libcpuid],
-        [CXXFLAGS="$LIBCPUID_CFLAGS $CXXFLAGS"
-         have_libcpuid=1
-         AC_DEFINE([HAVE_LIBCPUID], [1], [Use libcpuid])]
-      )
-    fi
-fi
-AC_SUBST(HAVE_LIBCPUID, [$have_libcpuid])
-
-
-# Look for libseccomp, required for Linux sandboxing.
-case "$host_os" in
-  linux*)
-    AC_ARG_ENABLE([seccomp-sandboxing],
-                  AS_HELP_STRING([--disable-seccomp-sandboxing],[Don't build support for seccomp sandboxing (only recommended if your arch doesn't support libseccomp yet!)
-                                ]))
-    if test "x$enable_seccomp_sandboxing" != "xno"; then
-      PKG_CHECK_MODULES([LIBSECCOMP], [libseccomp],
-                        [CXXFLAGS="$LIBSECCOMP_CFLAGS $CXXFLAGS"])
-      have_seccomp=1
-      AC_DEFINE([HAVE_SECCOMP], [1], [Whether seccomp is available and should be used for sandboxing.])
-    else
-      have_seccomp=
-    fi
-    ;;
-  *)
-    have_seccomp=
-    ;;
-esac
-AC_SUBST(HAVE_SECCOMP, [$have_seccomp])
-
-
-# Look for aws-cpp-sdk-s3.
-AC_LANG_PUSH(C++)
-AC_CHECK_HEADERS([aws/s3/S3Client.h],
-  [AC_DEFINE([ENABLE_S3], [1], [Whether to enable S3 support via aws-sdk-cpp.]) enable_s3=1],
-  [AC_DEFINE([ENABLE_S3], [0], [Whether to enable S3 support via aws-sdk-cpp.]) enable_s3=])
-AC_SUBST(ENABLE_S3, [$enable_s3])
-AC_LANG_POP(C++)
-
-if test -n "$enable_s3"; then
-  declare -a aws_version_tokens=($(printf '#include <aws/core/VersionConfig.h>\nAWS_SDK_VERSION_STRING' | $CPP $CPPFLAGS - | grep -v '^#.*' | sed 's/"//g' | tr '.' ' '))
-  AC_DEFINE_UNQUOTED([AWS_VERSION_MAJOR], ${aws_version_tokens@<:@0@:>@}, [Major version of aws-sdk-cpp.])
-  AC_DEFINE_UNQUOTED([AWS_VERSION_MINOR], ${aws_version_tokens@<:@1@:>@}, [Minor version of aws-sdk-cpp.])
-  AC_DEFINE_UNQUOTED([AWS_VERSION_PATCH], ${aws_version_tokens@<:@2@:>@}, [Patch version of aws-sdk-cpp.])
-fi
-
-
-# Whether to use the Boehm garbage collector.
-AC_ARG_ENABLE(gc, AS_HELP_STRING([--enable-gc],[enable garbage collection in the Nix expression evaluator (requires Boehm GC) [default=yes]]),
-  gc=$enableval, gc=yes)
-if test "$gc" = yes; then
-  PKG_CHECK_MODULES([BDW_GC], [bdw-gc])
-  CXXFLAGS="$BDW_GC_CFLAGS $CXXFLAGS"
-  AC_DEFINE(HAVE_BOEHMGC, 1, [Whether to use the Boehm garbage collector.])
-fi
-
-
-if test "$ENABLE_TESTS" = yes; then
-
-# Look for gtest.
-PKG_CHECK_MODULES([GTEST], [gtest_main gmock_main])
-
-
-# Look for rapidcheck.
-AC_ARG_VAR([RAPIDCHECK_HEADERS], [include path of gtest headers shipped by RAPIDCHECK])
-# No pkg-config yet, https://github.com/emil-e/rapidcheck/issues/302
-AC_LANG_PUSH(C++)
-AC_SUBST(RAPIDCHECK_HEADERS)
-[CXXFLAGS="-I $RAPIDCHECK_HEADERS $CXXFLAGS"]
-[LIBS="-lrapidcheck -lgtest $LIBS"]
-AC_CHECK_HEADERS([rapidcheck/gtest.h], [], [], [#include <gtest/gtest.h>])
-dnl AC_CHECK_LIB doesn't work for C++ libs with mangled symbols
-AC_LINK_IFELSE([
-    AC_LANG_PROGRAM([[
-      #include <gtest/gtest.h>
-      #include <rapidcheck/gtest.h>
-    ]], [[
-      return RUN_ALL_TESTS();
-    ]])
-  ],
-  [],
-  [AC_MSG_ERROR([librapidcheck is not found.])])
-AC_LANG_POP(C++)
-
-fi
-
-# Look for nlohmann/json.
-PKG_CHECK_MODULES([NLOHMANN_JSON], [nlohmann_json >= 3.9])
-
-
-# documentation generation switch
-AC_ARG_ENABLE(doc-gen, AS_HELP_STRING([--disable-doc-gen],[disable documentation generation]),
-  doc_generate=$enableval, doc_generate=yes)
-AC_SUBST(doc_generate)
-
-# Look for lowdown library.
-PKG_CHECK_MODULES([LOWDOWN], [lowdown >= 0.9.0], [CXXFLAGS="$LOWDOWN_CFLAGS $CXXFLAGS"])
-
-# Look for toml11, a required dependency.
-AC_ARG_VAR([TOML11_HEADERS], [include path of toml11 headers])
-AC_LANG_PUSH(C++)
-[CXXFLAGS="-I $TOML11_HEADERS $CXXFLAGS"]
-AC_CHECK_HEADER([toml.hpp], [], [AC_MSG_ERROR([toml11 is not found.])])
-AC_LANG_POP(C++)
-
-# Setuid installations.
-AC_CHECK_FUNCS([setresuid setreuid lchown])
-
-
-# Nice to have, but not essential.
-AC_CHECK_FUNCS([strsignal posix_fallocate sysconf])
-
-
-AC_ARG_WITH(sandbox-shell, AS_HELP_STRING([--with-sandbox-shell=PATH],[path of a statically-linked shell to use as /bin/sh in sandboxes]),
-  sandbox_shell=$withval)
-AC_SUBST(sandbox_shell)
-if test ${cross_compiling:-no} = no && ! test -z ${sandbox_shell+x}; then
-  AC_MSG_CHECKING([whether sandbox-shell has the standalone feature])
-  # busybox shell sometimes allows executing other busybox applets,
-  # even if they are not in the path, breaking our sandbox
-  if PATH= $sandbox_shell -c "busybox" 2>&1 | grep -qv "not found"; then
-    AC_MSG_RESULT(enabled)
-    AC_MSG_ERROR([Please disable busybox FEATURE_SH_STANDALONE])
-  else
-    AC_MSG_RESULT(disabled)
-  fi
-fi
-
-AC_ARG_ENABLE(embedded-sandbox-shell, AS_HELP_STRING([--enable-embedded-sandbox-shell],[include the sandbox shell in the Nix binary [default=no]]),
-  embedded_sandbox_shell=$enableval, embedded_sandbox_shell=no)
-AC_SUBST(embedded_sandbox_shell)
-if test "$embedded_sandbox_shell" = yes; then
-  AC_DEFINE(HAVE_EMBEDDED_SANDBOX_SHELL, 1, [Include the sandbox shell in the Nix binary.])
-fi
-
-
-# Expand all variables in config.status.
-test "$prefix" = NONE && prefix=$ac_default_prefix
-test "$exec_prefix" = NONE && exec_prefix='${prefix}'
-for name in $ac_subst_vars; do
-    declare $name="$(eval echo "${!name}")"
-    declare $name="$(eval echo "${!name}")"
-    declare $name="$(eval echo "${!name}")"
-done
-
-rm -f Makefile.config
-
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([])
-AC_OUTPUT
@@ -1,19 +0,0 @@
-.PHONY: internal-api-html
-
-ifeq ($(internal_api_docs), yes)
-
-$(docdir)/internal-api/html/index.html $(docdir)/internal-api/latex: $(d)/doxygen.cfg
-	mkdir -p $(docdir)/internal-api
-	{ cat $< ; echo "OUTPUT_DIRECTORY=$(docdir)/internal-api" ; } | doxygen -
-
-# Generate the HTML API docs for Nix's unstable internal interfaces.
-internal-api-html: $(docdir)/internal-api/html/index.html
-
-else
-
-# Make a nicer error message
-internal-api-html:
-	@echo "Internal API docs are disabled. Configure with '--enable-internal-api-docs', or avoid calling 'make internal-api-html'."
-	@exit 1
-
-endif
@@ -28,6 +28,7 @@ internal_api_docs = custom_target(
  output : 'html',
  install : true,
  install_dir : datadir / 'doc/nix/internal-api',
+  build_always_stale : true,
 )

 alias_target('internal-api-html', internal_api_docs)
@@ -1,5 +1,5 @@
 [book]
-title = "Nix Reference Manual"
+title = "Lix Reference Manual"

 [build]
 create-missing = false
@@ -7,8 +7,14 @@ create-missing = false
 [output.html]
 additional-css = ["custom.css"]
 additional-js = ["redirects.js"]
-edit-url-template = "https://github.com/NixOS/nix/tree/master/doc/manual/{path}"
-git-repository-url = "https://github.com/NixOS/nix"
+# Using our GitHub mirror enables easier typo fixes since there is no easy way
+# to just submit a Gerrit CL by the web for trivial stuff.
+edit-url-template = "https://github.com/lix-project/lix/tree/main/doc/manual/{path}"
+git-repository-url = "https://git.lix.systems/lix-project/lix"
+# Folding by default would prevent things like "Ctrl+F for nix-env" from working
+# trivially, but the user should be able to fold if they want to.
+fold.enable = true
+fold.level = 30

 # Handles replacing @docroot@ with a path to ./src relative to that markdown file,
 # {{#include handlebars}}, and the @generated@ syntax used within these. it mostly
@@ -0,0 +1,115 @@
+# This file is a mapping of metadata for change authors, sort of like
+# maintainer-list.nix in nixpkgs.
+#
+# It's used for crediting people accurately in release notes. The release notes
+# script will link to forgejo, then to GitHub if forgejo is not present.
+9999years:
+  display_name: wiggles
+  forgejo: rbt
+  github: 9999years
+
+Artturin:
+  github: Artturin
+
+DavHau:
+  github: DavHau
+
+Kha:
+  github: Kha
+
+Lunaphied:
+  forgejo: Lunaphied
+  github: Lunaphied
+
+Qyriad:
+  forgejo: Qyriad
+  github: Qyriad
+
+SharzyL:
+  github: SharzyL
+
+alois31:
+  forgejo: alois31
+  github: alois31
+
+artemist:
+  display_name: Artemis Tosini
+  forgejo: artemist
+
+cole-h:
+  display_name: Cole Helbling
+  github: cole-h
+
+edolstra:
+  display_name: Eelco Dolstra
+  github: edolstra
+
+ericson:
+  display_name: John Ericson
+  github: ericson2314
+
+horrors:
+  display_name: eldritch horrors
+  forgejo: pennae
+  github: pennae
+
+iFreilicht:
+  github: iFreilicht
+
+jade:
+  forgejo: jade
+  github: lf-
+
+lovesegfault:
+  github: lovesegfault
+
+ma27:
+  forgejo: ma27
+  github: ma27
+
+matthewbauer:
+  github: matthewbauer
+
+midnightveil:
+  display_name: julia
+  forgejo: midnightveil
+  github: midnightveil
+
+ncfavier:
+  github: ncfavier
+
+puck:
+  display_name: puck
+  forgejo: puck
+  github: puckipedia
+
+r-vdp:
+  github: r-vdp
+
+raito:
+  display_name: Raito Bezarius
+  forgejo: raito
+  github: RaitoBezarius
+
+roberth:
+  display_name: Robert Hensing
+  github: roberth
+
+thufschmitt:
+  display_name: Théophane Hufschmitt
+  github: thufschmitt
+
+tomberek:
+  display_name: Tom Bereknyei
+  github: tomberek
+
+valentin:
+  display_name: Valentin Gagarin
+  github: fricklerhandwerk
+
+winter:
+  forgejo: winter
+  github: winterqt
+
+yshui:
+  github: yshui
@@ -1,178 +0,0 @@
-ifeq ($(doc_generate),yes)
-
-# The version of Nix used to generate the doc. Can also be
-# `$(nix_INSTALL_PATH)` or just `nix` (to grap ambient from the `PATH`),
-# if one prefers.
-doc_nix = $(nix_PATH)
-
-MANUAL_SRCS := \
-	$(call rwildcard, $(d)/src, *.md) \
-	$(call rwildcard, $(d)/src, */*.md)
-
-man-pages := $(foreach n, \
-	nix-env.1 nix-store.1 \
-	nix-build.1 nix-shell.1 nix-instantiate.1 \
-	nix-collect-garbage.1 \
-	nix-prefetch-url.1 nix-channel.1 \
-	nix-hash.1 nix-copy-closure.1 \
-	nix.conf.5 nix-daemon.8 \
-	nix-profiles.5 \
-, doc/manual/generated/in/$(n))
-
-# man pages for subcommands
-# convert from `$(d)/src/command-ref/nix-{1}/{2}.md` to `$(d)/nix-{1}-{2}.1`
-# FIXME: unify with how nix3-cli man pages are generated
-man-pages += $(foreach subcommand, \
-	$(filter-out %opt-common.md %env-common.md, $(wildcard $(d)/src/command-ref/nix-*/*.md)), \
-	doc/manual/generated/in/$(subst /,-,$(subst $(d)/src/command-ref/,,$(subst .md,.1,$(subcommand)))))
-
-clean-files += $(d)/*.1 $(d)/*.5 $(d)/*.8
-
-# Provide a dummy environment for nix, so that it will not access files outside the macOS sandbox.
-# Set cores to 0 because otherwise nix config show resolves the cores based on the current machine
-dummy-env = env -i \
-	HOME=/dummy \
-	NIX_CONF_DIR=/dummy \
-	NIX_SSL_CERT_FILE=/dummy/no-ca-bundle.crt \
-	NIX_STATE_DIR=/dummy \
-	NIX_CONFIG='cores = 0'
-
-nix-eval = $(dummy-env) $(doc_nix) eval --experimental-features nix-command -I nix/corepkgs=corepkgs --store dummy:// --impure --raw
-
-doc/manual/generated/in/nix-env-%.1: doc/manual/generated/out
-	$(trace-gen) doc/manual/render-manpage.sh \
-		--out-no-smarty "$(subst nix-env-,nix-env --,$$(basename "$@" .1))" 1 \
-		doc/manual/generated/out/markdown/command-ref/nix-env/$*.md \
-		$@
-
-doc/manual/generated/in/nix-store-%.1: doc/manual/generated/out
-	$(trace-gen) doc/manual/render-manpage.sh \
-		--out-no-smarty "$(subst nix-store-,nix-store --,$$(basename "$@" .1))" 1 \
-		doc/manual/generated/out/markdown/command-ref/nix-store/$*.md \
-		$@
-
-
-doc/manual/generated/in/%.1: doc/manual/generated/out
-	$(trace-gen) doc/manual/render-manpage.sh "$$(basename $@ .1)" 1 \
-		doc/manual/generated/out/markdown/command-ref/$*.md \
-		$@
-
-doc/manual/generated/in/%.8: doc/manual/generated/out
-	$(trace-gen) doc/manual/render-manpage.sh "$$(basename $@ .8)" 8 \
-		doc/manual/generated/out/markdown/command-ref/$*.md \
-		$@
-
-doc/manual/generated/in/nix.conf.5: doc/manual/generated/out
-	$(trace-gen) doc/manual/render-manpage.sh "$$(basename $@ .5)" 5 \
-		doc/manual/generated/out/markdown/command-ref/conf-file.md \
-		$@
-
-doc/manual/generated/in/nix-profiles.5: doc/manual/generated/out
-	$(trace-gen) doc/manual/render-manpage.sh "$$(basename $@ .5)" 5 \
-		doc/manual/generated/out/markdown/command-ref/files/profiles.md \
-		$@
-
-doc/manual/generated/in/command-ref/new-cli: doc/manual/generated/in/nix.json $(d)/utils.nix $(d)/generate-manpage.nix $(doc_nix)
-	@mkdir -p doc/manual/generated/in/command-ref
-	@rm -rf $@ $@.tmp
-	$(trace-gen) $(nix-eval) --write-to $@.tmp --expr 'import doc/manual/generate-manpage.nix true (builtins.readFile $<)'
-	@mv $@.tmp $@
-
-doc/manual/generated/in/command-ref/conf-file.md: doc/manual/generated/in/conf-file.json $(d)/utils.nix doc/manual/generated/in/command-ref/experimental-features-shortlist.md $(doc_nix)
-	@mkdir -p doc/manual/generated/in/command-ref
-	$(trace-gen) $(nix-eval) --expr '(import doc/manual/utils.nix).showSettings { inlineHTML = true; } (builtins.fromJSON (builtins.readFile $<))' >> $@
-
-doc/manual/generated/in/nix.json: $(doc_nix)
-	@mkdir -p doc/manual/generated/in
-	$(trace-gen) $(dummy-env) $(doc_nix) __dump-cli > $@.tmp
-	@mv $@.tmp $@
-
-doc/manual/generated/in/conf-file.json: $(doc_nix)
-	@mkdir -p doc/manual/generated/in
-	$(trace-gen) $(dummy-env) $(doc_nix) config show --json --experimental-features nix-command > $@.tmp
-	@mv $@.tmp $@
-
-doc/manual/generated/in/contributing/experimental-feature-descriptions.md: doc/manual/generated/in/xp-features.json $(d)/utils.nix $(d)/generate-xp-features.nix $(doc_nix)
-	@mkdir -p doc/manual/generated/in/contributing
-	@rm -rf $@ $@.tmp
-	$(trace-gen) $(nix-eval) --write-to $@.tmp --expr 'import doc/manual/generate-xp-features.nix (builtins.fromJSON (builtins.readFile $<))'
-	@mv $@.tmp $@
-
-doc/manual/generated/in/command-ref/experimental-features-shortlist.md: doc/manual/generated/in/xp-features.json $(d)/utils.nix $(d)/generate-xp-features-shortlist.nix $(doc_nix)
-	@mkdir -p doc/manual/generated/in/command-ref
-	@rm -rf $@ $@.tmp
-	$(trace-gen) $(nix-eval) --write-to $@.tmp --expr 'import doc/manual/generate-xp-features-shortlist.nix (builtins.fromJSON (builtins.readFile $<))'
-	@mv $@.tmp $@
-
-doc/manual/generated/in/xp-features.json: $(doc_nix)
-	$(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs $(doc_nix) __dump-xp-features > $@.tmp
-	@mv $@.tmp $@
-
-doc/manual/generated/in/language/builtins.md: doc/manual/generated/in/language.json $(d)/generate-builtins.nix $(doc_nix)
-	@mkdir -p doc/manual/generated/in/language
-	$(trace-gen) $(nix-eval) --expr 'import doc/manual/generate-builtins.nix (builtins.fromJSON (builtins.readFile $<)).builtins' >> $@
-
-doc/manual/generated/in/language/builtin-constants.md: doc/manual/generated/in/language.json $(d)/generate-builtin-constants.nix $(doc_nix)
-	@mkdir -p doc/manual/generated/in/language
-	$(trace-gen) $(nix-eval) --expr 'import doc/manual/generate-builtin-constants.nix (builtins.fromJSON (builtins.readFile $<)).constants' >> $@
-
-doc/manual/generated/in/language.json: $(doc_nix)
-	@mkdir -p doc/manual/generated/in
-	$(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs $(doc_nix) __dump-language > $@.tmp
-	@mv $@.tmp $@
-
-# Generate "Upcoming release" notes (or clear it and remove from menu)
-doc/manual/generated/in/release-notes/rl-next-generated.md: $(d)/rl-next $(d)/rl-next/*
-	@mkdir -p doc/manual/generated/in/release-notes
-	@if type -p build-release-notes > /dev/null; then \
-		echo "  GEN   " $@; \
-		build-release-notes doc/manual/rl-next > $@; \
-	else \
-		echo "  NULL  " $@; \
-		true > $@; \
-	fi
-
-# Generate the HTML manual.
-.PHONY: manual-html
-manual-html: $(docdir)/manual/index.html
-install: $(docdir)/manual/index.html
-
-# Generate 'nix' manpages.
-install: $(mandir)/man1/nix3-manpages
-man: doc/manual/generated/man1/nix3-manpages
-all: doc/manual/generated/man1/nix3-manpages
-
-# FIXME: unify with how the other man pages are generated.
-# this one works differently and does not use any of the amenities provided by `/mk/lib.mk`.
-$(mandir)/man1/nix3-manpages: doc/manual/generated/man1/nix3-manpages
-	@mkdir -p $(DESTDIR)$$(dirname $@)
-	$(trace-install) install -m 0644 $$(dirname $<)/* $(DESTDIR)$$(dirname $@)
-
-doc/manual/generated/man1/nix3-manpages: doc/manual/generated/out
-	@mkdir -p $(DESTDIR)$$(dirname $@)
-	$(trace-gen) for i in doc/manual/generated/out/markdown/command-ref/new-cli/*.md; do \
-		name=$$(basename $$i .md); \
-		tmpFile=$$(mktemp); \
-		if [[ $$name = SUMMARY ]]; then continue; fi; \
-		printf "Title: %s\n\n" "$$name" > $$tmpFile; \
-		cat $$i >> $$tmpFile; \
-		lowdown -sT man --nroff-nolinks -M section=1 $$tmpFile -o $(DESTDIR)$$(dirname $@)/$$name.1; \
-		rm $$tmpFile; \
-	done
-	@touch $@
-
-doc/manual/generated/out: $(MANUAL_SRCS) $(d)/book.toml $(d)/anchors.jq $(d)/custom.css $(d)/src/SUMMARY.md doc/manual/generated/in/command-ref/new-cli doc/manual/generated/in/command-ref/experimental-features-shortlist.md doc/manual/generated/in/contributing/experimental-feature-descriptions.md doc/manual/generated/in/command-ref/conf-file.md doc/manual/generated/in/language/builtins.md doc/manual/generated/in/language/builtin-constants.md doc/manual/generated/in/release-notes/rl-next-generated.md $(d)/substitute.py
-	@rm -rf $@
-	$(trace-gen) \
-		MDBOOK_SUBSTITUTE_SEARCH=doc/manual/generated/in \
-		RUST_LOG=warn \
-		mdbook build doc/manual -d generated/out 2>&1 \
-			| { grep -Fv "because fragment resolution isn't implemented" || :; }
-	@find $@ -iname meson.build -delete
-
-$(docdir)/manual/index.html: doc/manual/generated/out
-	@mkdir -p $(DESTDIR)$(docdir)
-	@rm -rf $(DESTDIR)$(docdir)/manual
-	@cp -r $</html $(DESTDIR)$(docdir)/manual
-
-endif
@@ -0,0 +1,8 @@
+[lix-docs]
+type = s3
+provider = Other
+env_auth = true
+endpoint = https://s3.lix.systems
+location_constraint = garage
+region = garage
+acl = private
@@ -24,7 +24,6 @@ const redirects = {
    "chap-writing-nix-expressions": "language/index.html",
    "part-command-ref": "command-ref/command-ref.html",
    "conf-allow-import-from-derivation": "command-ref/conf-file.html#conf-allow-import-from-derivation",
-    "conf-allow-new-privileges": "command-ref/conf-file.html#conf-allow-new-privileges",
    "conf-allowed-uris": "command-ref/conf-file.html#conf-allowed-uris",
    "conf-allowed-users": "command-ref/conf-file.html#conf-allowed-users",
    "conf-auto-optimise-store": "command-ref/conf-file.html#conf-auto-optimise-store",
@@ -0,0 +1,14 @@
+---
+synopsis: "Add a builtin `addDrvOutputDependencies`"
+prs: 9216
+issues: 7910
+credits: [ericson, horrors]
+category: Features
+---
+
+This builtin allows taking a `drvPath`-like string and turning it into a string
+with context such that, when it lands in a derivation, it will create
+dependencies on *all the outputs* in its closure (!). Although `drvPath` does this
+today, this builtin starts forming a path to migrate to making `drvPath` have a
+more normal and less surprising string context behaviour (see linked issue and
+PR for more details).
@@ -0,0 +1,13 @@
+---
+synopsis: "Add an option `always-allow-substitutes` to ignore `allowSubstitutes` in derivations"
+prs: 8047
+credits: [lovesegfault, horrors]
+category: Improvements
+---
+
+You can set this setting to force a system to always allow substituting even
+trivial derivations like `pkgs.writeText`. This is useful for
+[`nix-fast-build --skip-cached`][skip-cached] and similar to be able to also
+ignore trivial derivations.
+
+[skip-cached]: https://github.com/Mic92/nix-fast-build?tab=readme-ov-file#avoiding-redundant-package-downloads
@@ -2,6 +2,8 @@
 synopsis: Concise error printing in `nix repl`
 prs: 9928
 cls: 811
+category: Improvements
+credits: 9999years
 ---

 Previously, if an element of a list or attribute set threw an error while
@@ -0,0 +1,6 @@
+---
+synopsis: Show all FOD errors with `nix build --keep-going`
+---
+
+`nix build --keep-going` now behaves consistently with `nix-build --keep-going`. This means
+that if e.g. multiple FODs fail to build, all hash mismatches are displayed.
@@ -0,0 +1,21 @@
+---
+synopsis: "Fix CVE-2024-27297 (GHSA-2ffj-w4mj-pg37)"
+cls: 266
+credits: [puck, jade, thufschmitt, tomberek, valentin]
+category: Fixes
+---
+
+Since Lix fixed-output derivations run in the host network namespace (which we
+wish to change in the future, see
+[lix#285](https://git.lix.systems/lix-project/lix/issues/285)), they may open
+abstract-namespace Unix sockets to each other and to programs on the host. Lix
+contained a now-fixed time-of-check/time-of-use vulnerability where one
+derivation could send writable handles to files in their final location in the
+store to another over an abstract-namespace Unix socket, exit, then the other
+derivation could wait for Lix to hash the paths and overwrite them.
+
+The impact of this vulnerability is that two malicious fixed-output derivations
+could create a poisoned path for the sources to Bash or similarly important
+software containing a backdoor, leading to local privilege execution.
+
+CppNix advisory: https://github.com/NixOS/nix/security/advisories/GHSA-2ffj-w4mj-pg37
@@ -2,6 +2,8 @@
 synopsis: "`--debugger` can now access bindings from `let` expressions"
 prs: 9918
 issues: 8827
+category: Fixes
+credits: 9999years
 ---

 Breakpoints and errors in the bindings of a `let` expression can now access
@@ -1,6 +1,8 @@
 ---
 synopsis: Enter the `--debugger` when `builtins.trace` is called if `debugger-on-trace` is set
 prs: 9914
+category: Features
+credits: 9999years
 ---

 If the `debugger-on-trace` option is set and `--debugger` is given,
@@ -0,0 +1,16 @@
+---
+synopsis: "Deprecate the online flake registries and vendor the default registry"
+cls: 1127
+credits: midnightveil
+issues: [fj#183, fj#110, fj#116, 8953, 9087]
+category: Breaking Changes
+---
+
+The online flake registry [https://channels.nixos.org/flake-registry.json](https://channels.nixos.org/flake-registry.json) is not pinned in any way,
+and the targets of the indirections can both update or change entirely at any
+point. Furthermore, it is refetched on every use of a flake reference, even if
+there is a local flake reference, and even if you are offline (which breaks).
+
+For now, we deprecate the (any) online flake registry, and vendor a copy of the
+current online flake registry. This makes it work offline, and ensures that
+it won't change in the future.
@@ -1,6 +1,8 @@
 ---
 synopsis: Stop vendoring toml11
 cls: 675
+category: Packaging
+credits: winter
 ---

 We don't apply any patches to it, and vendoring it locks users into
@@ -1,6 +1,8 @@
 ---
 synopsis: Fix handling of truncated `.drv` files.
 prs: 9673
+category: Fixes
+credits: horrors
 ---

 Previously a `.drv` that was truncated in the middle of a string would case nix to enter an infinite loop, eventually exhausting all memory and crashing.
@@ -1,6 +1,8 @@
 ---
 synopsis: Duplicate attribute reports are more accurate
 cls: 557
+credits: horrors
+category: Improvements
 ---

 Duplicate attribute errors are now more accurate, showing the path at which an error was detected rather than the full, possibly longer, path that caused the error.
@@ -1,6 +1,8 @@
 ---
 synopsis: Disallow empty search regex in `nix search`
 prs: 9481
+credits: [iFreilicht, horrors]
+category: Miscellany
 ---

 [`nix search`](@docroot@/command-ref/new-cli/nix3-search.md) now requires a search regex to be passed. To show all packages, use `^`.
@@ -0,0 +1,13 @@
+---
+synopsis: "Add an option `enable-core-dumps` that enables core dumps from builds"
+cls: 1088
+credits: midnightveil
+category: Features
+---
+
+In the past, Lix disabled core dumps by setting the soft `RLIMIT_CORE` to 0
+unconditionally. Although this rlimit could be altered from the builder since
+it is just the soft limit, this was kind of annoying to do. By passing
+`--option enable-core-dumps true` to an offending build, one can now cause the
+core dumps to be handled by the system in the normal way (winding up in
+`coredumpctl`, say, on Linux).
@@ -2,6 +2,8 @@
 synopsis: The `--debugger` will start more reliably in `let` expressions and function calls
 prs: 9917
 issues: 6649
+credits: [9999years, horrors]
+category: Fixes
 ---

 Previously, if you attempted to evaluate this file with the debugger:
@@ -18,8 +20,8 @@ in
  b
 ```

-Nix would correctly enter the debugger at `builtins.break a`, but if you asked
+Lix would correctly enter the debugger at `builtins.break a`, but if you asked
 it to `:continue`, it would skip over the `builtins.break "hello"` expression
 entirely.

-Now, Nix will correctly enter the debugger at both breakpoints.
+Now, Lix will correctly enter the debugger at both breakpoints.
@@ -1,6 +1,9 @@
 ---
 synopsis: Reduce eval memory usage and wall time
 prs: 9658
+cls: 207
+credits: horrors
+category: Improvements
 ---

 Reduce the size of the `Env` struct used in the evaluator by a pointer, or 8 bytes on most modern machines.
@@ -1,12 +1,14 @@
 ---
 synopsis: Add new `eval-system` setting
 prs: 4093
+credits: [matthewbauer, horrors]
+category: Features
 ---

 Add a new `eval-system` option.
 Unlike `system`, it just overrides the value of `builtins.currentSystem`.
 This is more useful than overriding `system`, because you can build these derivations on remote builders which can work on the given system.
-In contrast, `system` also effects scheduling which will cause Nix to build those derivations locally even if that doesn't make sense.
+In contrast, `system` also effects scheduling which will cause Lix to build those derivations locally even if that doesn't make sense.

 `eval-system` only takes effect if it is non-empty.
 If empty (the default) `system` is used as before, so there is no breakage.
@@ -1,6 +1,8 @@
 ---
 synopsis: Creating setuid/setgid binaries with fchmodat2 is now prohibited by the build sandbox
 prs: 10501
+credits: ma27
+category: Fixes
 ---

 The build sandbox blocks any attempt to create setuid/setgid binaries, but didn't check
@@ -2,6 +2,9 @@
 synopsis: Fix nested flake input `follows`
 prs: 6621
 cls: 994
+credits: [Kha, ma27]
+category: Fixes
+significance: significant
 ---

 Previously nested-input overrides were ignored; that is, the following did not
@@ -0,0 +1,30 @@
+---
+synopsis: Warn on unknown settings anywhere in the command line
+prs: 10701
+credits: [cole-h]
+category: Improvements
+---
+
+All `nix` commands will now properly warn when an unknown option is specified anywhere in the command line.
+
+Before:
+
+```console
+$ nix-instantiate --option foobar baz --expr '{}'
+warning: unknown setting 'foobar'
+$ nix-instantiate '{}' --option foobar baz --expr
+$ nix eval --expr '{}' --option foobar baz
+{ }
+```
+
+After:
+
+```console
+$ nix-instantiate --option foobar baz --expr '{}'
+warning: unknown setting 'foobar'
+$ nix-instantiate '{}' --option foobar baz --expr
+warning: unknown setting 'foobar'
+$ nix eval --expr '{}' --option foobar baz
+warning: unknown setting 'foobar'
+{ }
+```
@@ -1,6 +1,8 @@
 ---
 synopsis: Nested debuggers are no longer supported
 prs: 9920
+credits: 9999years
+category: Improvements
 ---

 Previously, evaluating an expression that throws an error in the debugger would
@@ -1,6 +1,8 @@
 ---
 synopsis: consistent order of lambda formals in printed expressions
 prs: 9874
+credits: horrors
+category: Fixes
 ---

 Always print lambda formals in lexicographic order rather than the internal, creation-time based symbol order.
@@ -0,0 +1,8 @@
+---
+synopsis: Find GC roots using libproc on Darwin
+cls: 723
+credits: artemist
+category: Improvements
+---
+
+Previously, the garbage collector found runtime roots on Darwin by shelling out to `lsof -n -w -F n` then parsing the result. The version of `lsof` packaged in Nixpkgs is very slow on Darwin, so Lix now uses `libproc` directly to speed up GC root discovery, in some tests taking 250ms now instead of 40s.
@@ -1,6 +1,8 @@
 ---
 synopsis: fix duplicate attribute error positions for `inherit`
 prs: 9874
+credits: horrors
+category: Fixes
 ---

-When an inherit caused a duplicate attribute error the position of the error was not reported correctly, placing the error with the inherit itself or at the start of the bindings block instead of the offending attribute name.
+When an inherit caused a duplicate attribute error, the position of the error was not reported correctly, placing the error with the inherit itself or at the start of the bindings block instead of the offending attribute name.
@@ -1,6 +1,8 @@
 ---
 synopsis: "`inherit (x) ...` evaluates `x` only once"
 prs: 9847
+category: Fixes
+credits: horrors
 ---

 `inherit (x) a b ...` now evaluates the expression `x` only once for all inherited attributes rather than once for each inherited attribute.
@@ -2,6 +2,8 @@
 synopsis: Store paths are allowed to start with `.`
 issues: 912
 prs: [9867, 9091, 9095, 9120, 9121, 9122, 9130, 9219, 9224]
+credits: [roberth, horrors]
+category: Fixes
 ---

 Leading periods were allowed by accident in Nix 2.4. The Nix team has considered this to be a bug, but this behavior has since been relied on by users, leading to unnecessary difficulties.
@@ -0,0 +1,12 @@
+---
+synopsis: Enforce syscall filtering and no-new-privileges on Linux
+cls: 1063
+category: Breaking Changes
+credits: alois31
+---
+
+In order to improve consistency of the build environment, system call filtering and no-new-privileges are now unconditionally enabled on Linux.
+The `filter-syscalls` and `allow-new-privileges` options which could be used to disable these features under some circumstances have been removed.
+
+In order to support building on architectures without libseccomp support, the option to disable syscall filtering at build time remains.
+However, other uses of this option are heavily discouraged, since it would reduce the security of the sandbox substantially.
@@ -0,0 +1,9 @@
+---
+synopsis: Increase default stack size on macOS
+prs: 9860
+credits: 9999years
+category: Improvements
+---
+
+Increase the default stack size on macOS to the same value as on Linux, subject to system restrictions to maximum stack size.
+This should reduce the number of stack overflow crashes on macOS when evaluating Nix code with deep call stacks.
@@ -0,0 +1,9 @@
+---
+synopsis: Show more log context for failed builds
+prs: 9670
+credits: DavHau
+category: Improvements
+---
+
+Show 25 lines of log tail instead of 10 for failed builds.
+This increases the chances of having useful information in the shown logs.
@@ -1,6 +1,9 @@
 ---
 synopsis: Lix turns more internal bugs into crashes
 cls: [797, 626]
+credits: jade
+category: Packaging
+significance: significant
 ---

 Lix now enables build options such as trapping on signed overflow and enabling
@@ -2,6 +2,11 @@
 synopsis: rename 'nix show-config' to 'nix config show'
 issues: 7672
 prs: 9477
+cls: 993
+credits: [thufschmitt, ma27]
+category: Improvements
 ---

 `nix show-config` was renamed to `nix config show` to be more consistent with the rest of the command-line interface.
+
+Running `nix show-config` will now print a deprecation warning saying to use `nix config show` instead.
@@ -1,6 +1,8 @@
 ---
 synopsis: Fix `nix-env --query --drv-path --json`
 prs: 9257
+credits: [Artturin, horrors]
+category: Fixes
 ---

 Fixed a bug where `nix-env --query` ignored `--drv-path` when `--json` was set.
@@ -0,0 +1,9 @@
+---
+synopsis: Print derivation paths in `nix eval`
+cls: 446
+credits: 9999years
+category: Improvements
+---
+
+`nix eval` previously printed derivations as attribute sets, so commands that print derivations (e.g. `nix eval nixpkgs#bash`) would infinitely loop and segfault.
+It now prints the `.drv` path the derivation generates instead.
@@ -2,6 +2,10 @@
 synopsis: "`nix flake check` logs the checks"
 issues: 8882
 prs: 8893
+cls: [259, 260, 261, 262]
+credits: [9999years, raito, horrors]
+category: Improvements
+significance: significant
 ---

 `nix flake check` now logs the checks it runs and the derivations it evaluates:
@@ -1,6 +1,8 @@
 ---
-synopsis: "`Overhaul `nix flake update` and `nix flake lock` UX"
+synopsis: "Overhaul `nix flake update` and `nix flake lock` UX"
 prs: 8817
+credits: [iFreilicht, Lunaphied, thufschmitt]
+category: Breaking Changes
 ---

 The interface for creating and updating lock files has been overhauled:
@@ -2,8 +2,10 @@
 synopsis: "`nix profile` now allows referring to elements by human-readable name, and no longer accepts indices"
 prs: 8678
 cls: [978, 980]
+category: Breaking Changes
+credits: [iFreilicht, Qyriad, edolstra]
 ---

 [`nix profile`](@docroot@/command-ref/new-cli/nix3-profile.md) now uses names to refer to installed packages when running [`list`](@docroot@/command-ref/new-cli/nix3-profile-list.md), [`remove`](@docroot@/command-ref/new-cli/nix3-profile-remove.md) or [`upgrade`](@docroot@/command-ref/new-cli/nix3-profile-upgrade.md) as opposed to indices. Indices have been removed. Profile element names are generated when a package is installed and remain the same until the package is removed.

-**Warning**: The `manifest.nix` file used to record the contents of profiles has changed. Nix will automatically upgrade profiles to the new version when you modify the profile. After that, the profile can no longer be used by older versions of Nix.
+**Warning**: The `manifest.nix` file used to record the contents of profiles has changed. Lix will automatically upgrade profiles to the new version when you modify the profile. After that, the profile can no longer be used by older versions of Lix.
@@ -0,0 +1,18 @@
+---
+synopsis: "Add an option `--unpack` to unpack archives in `nix store prefetch-file`"
+prs: 9805
+cls: 224
+credits: [yshui, horrors]
+category: Improvements
+---
+
+It is now possible to fetch an archive then NAR-hash it (as in, hash it in the
+same manner as `builtins.fetchTarball` or fixed-output derivations with
+recursive hash type) in one command.
+
+Example:
+
+```
+~ » nix store prefetch-file --name source --unpack https://git.lix.systems/lix-project/lix/archive/2.90-beta.1.tar.gz
+Downloaded 'https://git.lix.systems/lix-project/lix/archive/2.90-beta.1.tar.gz' to '/nix/store/yvfqnq52ryjc3janw02ziv7kr6gd0cs1-source' (hash 'sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=').
+```
@@ -1,11 +1,17 @@
 ---
-synopsis: "`builtins.nixVersion` now returns a fixed value \"2.18.3-lix\""
-cls: 558
+synopsis: "`builtins.nixVersion` and `builtins.langVersion` return fixed values"
+cls: [558, 1144]
+credits: jade
+category: Breaking Changes
 ---

-`builtins.nixVersion` now returns a fixed value `"2.18.3-lix"`. This prevents
-feature detection assuming that features that exist in Nix post-Lix-branch-off
-might exist, even though the Lix version is greater than the Nix version.
+`builtins.nixVersion` now returns a fixed value `"2.18.3-lix"`.
+
+`builtins.langVersion` returns a fixed value `6`, matching CppNix 2.18.
+
+This prevents feature detection assuming that features that exist in Nix
+post-Lix-branch-off might exist, even though the Lix version is greater than
+the Nix version.

 In the future, check for builtins for feature detection. If a feature cannot be
 detected by *those* means, please file a Lix bug.
@@ -1,6 +1,8 @@
 ---
 synopsis: re-evaluate cached evaluation errors
 cls: 771
+credits: Qyriad
+category: Fixes
 ---

 "cached failure of [expr]" errors have been removed: expressions already in the
@@ -0,0 +1,55 @@
+---
+synopsis: "REPL printing improvements"
+prs: [9931, 10208]
+cls: [375, 492]
+credits: [9999years, horrors]
+category: Improvements
+---
+
+The REPL printer has been improved to do the following:
+- If a string is passed to `:print`, it is printed literally to the screen
+- Structures will be printed as multiple lines when necessary
+
+Before:
+
+```
+nix-repl> { attrs = { a = { b = { c = { }; }; }; }; list = [ 1 ]; list' = [ 1 2 3 ]; }
+{ attrs = { ... }; list = [ ... ]; list' = [ ... ]; }
+
+nix-repl> :p { attrs = { a = { b = { c = { }; }; }; }; list = [ 1 ]; list' = [ 1 2 3 ]; }
+{ attrs = { a = { b = { c = { }; }; }; }; list = [ 1 ]; list' = [ 1 2 3 ]; }
+
+nix-repl> :p "meow"
+"meow"
+```
+
+After:
+
+```
+nix-repl> { attrs = { a = { b = { c = { }; }; }; }; list = [ 1 ]; list' = [ 1 2 3 ]; }
+{
+  attrs = { ... };
+  list = [ ... ];
+  list' = [ ... ];
+}
+
+nix-repl> :p { attrs = { a = { b = { c = { }; }; }; }; list = [ 1 ]; list' = [ 1 2 3 ]; }
+{
+  attrs = {
+    a = {
+      b = {
+        c = { };
+      };
+    };
+  };
+  list = [ 1 ];
+  list' = [
+    1
+    2
+    3
+  ];
+}
+
+nix-repl> :p "meow"
+meow
+```
@@ -2,6 +2,8 @@
 synopsis: Coercion errors include the failing value
 issues: 561
 prs: 9754
+credits: [9999years, horrors]
+category: Improvements
 ---

 The `error: cannot coerce a <TYPE> to a string` message now includes the value
@@ -0,0 +1,20 @@
+---
+synopsis: New-cli flake commands that expect derivations now print the failing value and its type
+credits: Qyriad
+category: Improvements
+cls: 1177
+---
+
+In errors like `flake output attribute 'legacyPackages.x86_64-linux.lib' is not a derivation or path`, the message now includes the failing value and type.
+
+Before:
+
+```
+    error: flake output attribute 'nixosConfigurations.yuki.config' is not a derivation or path
+````
+
+After:
+
+```
+    error: expected flake output attribute 'nixosConfigurations.yuki.config' to be a derivation or path but found a set: { appstream = «thunk»; assertions = «thunk»; boot = { bcache = «thunk»; binfmt = «thunk»; binfmtMiscRegistrations = «thunk»; blacklistedKernelModules = «thunk»; bootMount = «thunk»; bootspec = «thunk»; cleanTmpDir = «thunk»; consoleLogLevel = «thunk»; «43 attributes elided» }; «48 attributes elided» }
+```
@@ -2,6 +2,8 @@
 synopsis: Type errors include the failing value
 issues: 561
 prs: 9753
+credits: [9999years, horrors]
+category: Improvements
 ---

 In errors like `value is an integer while a list was expected`, the message now
@@ -1,6 +1,8 @@
 ---
 synopsis: "Visual clutter in `--debugger` is reduced"
 prs: 9919
+category: Improvements
+credits: [9999years, horrors]
 ---

 Before:
@@ -0,0 +1,31 @@
+---
+synopsis: Rename all the libraries nixexpr, nixstore, etc to lixexpr, lixstore, etc
+credits: jade
+category: Breaking Changes
+---
+
+The Lix C++ API libraries have had the following changes:
+- Includes moved from `include/nix/` to `include/lix/`
+- `pkg-config` files renamed from `nix-expr` to `lix-expr` and so on.
+- Libraries renamed from `libnixexpr.so` to `liblixexpr.so` and so on.
+
+There are other changes between Nix 2.18 and Lix, since these APIs are not
+stable. However, this change in particular is a deliberate compatibility break
+to force downstreams linking to Lix to specifically handle Lix and avoid Lix
+accidentally getting ensnared in compatibility code for newer CppNix.
+
+Migration path:
+
+- expr.hh      -> lix/libexpr/expr.hh
+- nix/config.h -> lix/config.h
+
+To apply this migration automatically, remove all `<nix/>` from includes, so `#include <nix/expr.hh>` -> `#include <expr.hh>`.
+Then, the correct paths will be resolved from the tangled mess, and the clang-tidy automated fix will work.
+
+Then run the following for out of tree projects (header filter is set to only fix instances in headers in `../src` relative to the compiler's working directory, as would be the case in nix-eval-jobs or other things built with meson, e.g.):
+
+```console
+lix_root=$HOME/lix
+(cd $lix_root/clang-tidy && nix develop -c 'meson setup build && ninja -C build')
+run-clang-tidy -checks='-*,lix-fixincludes' -load=$lix_root/clang-tidy/build/liblix-clang-tidy.so -p build/ -header-filter '\.\./src/.*\.h' -fix src
+```
@@ -1,6 +1,9 @@
 ---
 synopsis: Experimental REPL support for documentation comments using `:doc`
 cls: 564
+category: Features
+credits: [Lunaphied, jade]
+significance: significant
 ---

 Using `:doc` in the REPL now supports showing documentation comments when defined on a function.
@@ -0,0 +1,9 @@
+---
+synopsis: "`nix repl` history is saved more reliably"
+cls: 1164
+credits: puck
+---
+
+`nix repl` now saves its history file after each line, rather than at the end
+of the session; ensuring that it will remember what you typed even after it
+crashes.
@@ -0,0 +1,10 @@
+---
+synopsis: Interrupting builds in the REPL works more than once
+cls: 1097
+category: Fixes
+credits: alois31
+---
+
+Builds in the REPL can be interrupted by pressing Ctrl+C.
+Previously, this only worked once per REPL session; further attempts would be ignored.
+This issue is now fixed, so that builds can be canceled consistently.
@@ -2,6 +2,9 @@
 synopsis: Add `repl-overlays` option
 prs: 10203
 cls: 504
+credits: 9999years
+significance: significant
+category: Features
 ---

 A `repl-overlays` option has been added, which specifies files that can overlay
@@ -0,0 +1,7 @@
+---
+synopsis: "REPL now supports CTRL+Z to suspend"
+credits: [Qyriad]
+category: Improvements
+---
+
+Editline is now built with SIGTSTP support, so now typing CTRL+Z in the REPL will suspend the REPL and allow it to be resumed later or backgrounded.
@@ -0,0 +1,13 @@
+---
+synopsis: Allow single quotes in nix-shell shebangs
+prs: 8470
+credits: [ncfavier, horrors]
+category: Improvements
+---
+
+Example:
+
+```bash
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash --packages 'terraform.withPlugins (plugins: [ plugins.openstack ])'
+```
@@ -1,9 +1,11 @@
 ---
 synopsis: reintroduce shortened `-E` form for `--expr` to new CLI
 cls: 605
+credits: Lunaphied
+category: Improvements
 ---

-In the past, it was possible to supply a shorter `-E` flag instead of fully
+In the old CLI, it was possible to supply a shorter `-E` flag instead of fully
 specifying `--expr` every time you wished to provide an expression that would
 be evaluated to produce the given command's input. This was retained for the
 `--file` flag when the new CLI utilities were written with `-f`, but `-E` was
@@ -1,6 +1,8 @@
 ---
 synopsis: "In the debugger, `while evaluating the attribute` errors now include position information"
 prs: 9915
+credits: 9999years
+category: Fixes
 ---

 Before:
@@ -2,6 +2,8 @@
 synopsis: Source locations are printed more consistently in errors
 issues: 561
 prs: 9555
+credits: [9999years, horrors]
+category: Improvements
 ---

 Source location information is now included in error messages more
@@ -0,0 +1,8 @@
+---
+synopsis: Include phase reporting in log file for ssh-ng builds
+prs: 9280
+credits: r-vdp
+category: Fixes
+---
+
+Store phase information of remote builds run via `ssh-ng` remotes in the local log file, matching logging behavior of local builds.
@@ -0,0 +1,9 @@
+---
+synopsis: Fix `ssh-ng://` remotes not respecting `--substitute-on-destination`
+prs: 9600
+credits: SharzyL
+category: Fixes
+---
+
+`nix copy ssh-ng://` now respects `--substitute-on-destination`, as does `nix-copy-closure` and other commands that operate on remote `ssh-ng` stores.
+Previously this was always set by `builders-use-substitutes` setting.
@@ -2,6 +2,9 @@
 synopsis: Some stack overflow segfaults are fixed
 issues: 9616
 prs: 9617
+cls: 205
+category: Improvements
+credits: [9999years, horrors]
 ---

 The number of nested function calls has been restricted, to detect and report
@@ -1,6 +1,8 @@
 ---
-synopsis: add --store-path argument to `nix upgrade-nix`, to manually specify the Nix to upgrade to
+synopsis: add `--store-path` argument to `nix upgrade-nix`, to manually specify the Nix to upgrade to
 cls: 953
+credits: Qyriad
+category: Features
 ---

 `nix upgrade-nix` by default downloads a manifest to find the new Nix version to upgrade to, but now you can specify `--store-path` to upgrade Nix to an arbitrary version from the Nix store.
@@ -1,6 +1,8 @@
 ---
 synopsis: using `nix profile` on `/nix/var/nix/profiles/default` no longer breaks `nix upgrade-nix`
 cls: 952
+credits: Qyriad
+category: Fixes
 ---

 On non-NixOS, Nix is conventionally installed into a `nix-env` style profile at /nix/var/nix/profiles/default.
@@ -1,6 +1,8 @@
 ---
 synopsis: Upstart scripts removed
 cls: 574
+category: Packaging
+credits: jade
 ---

 Upstart scripts have been removed from Lix, since Upstart is obsolete and has
@@ -0,0 +1,9 @@
+---
+synopsis: Warn about ignored client settings
+cls: 1026
+credits: jade
+category: Improvements
+---
+
+Emit a warning for every client-provided setting the daemon ignores because the requesting client is not run by a trusted user.
+Previously this was only a debug message.
@@ -1,6 +1,9 @@
 ---
 synopsis: Better error reporting for `with` expressions
 prs: 9658
+cls: 207
+credits: horrors
+category: Improvements
 ---

 `with` expressions using non-attrset values to resolve variables are now reported with proper positions.
@@ -5,17 +5,17 @@
 - [Installation](installation/installation.md)
  - [Supported Platforms](installation/supported-platforms.md)
  - [Installing a Binary Distribution](installation/installing-binary.md)
-  - [Installing Nix from Source](installation/installing-source.md)
+  - [Installing Lix from Source](installation/installing-source.md)
    - [Prerequisites](installation/prerequisites-source.md)
    - [Obtaining a Source Distribution](installation/obtaining-source.md)
-    - [Building Nix from Source](installation/building-source.md)
-  - [Using Nix within Docker](installation/installing-docker.md)
+    - [Building Lix from Source](installation/building-source.md)
+  - [Using Lix within Docker](installation/installing-docker.md)
  - [Security](installation/nix-security.md)
    - [Single-User Mode](installation/single-user.md)
    - [Multi-User Mode](installation/multi-user.md)
  - [Environment Variables](installation/env-variables.md)
-  - [Upgrading Nix](installation/upgrading.md)
-  - [Uninstalling Nix](installation/uninstall.md)
+  - [Upgrading Lix](installation/upgrading.md)
+  - [Uninstalling Lix](installation/uninstall.md)
 - [Package Management](package-management/package-management.md)
  - [Basic Package Management](package-management/basic-package-mgmt.md)
  - [Profiles](package-management/profiles.md)
@@ -1,13 +1,13 @@
 # Tuning Cores and Jobs

-Nix has two relevant settings with regards to how your CPU cores will
+Lix has two relevant settings with regards to how your CPU cores will
 be utilized: `cores` and `max-jobs`. This chapter will talk about what
 they are, how they interact, and their configuration trade-offs.

  - `max-jobs`\
    Dictates how many separate derivations will be built at the same
    time. If you set this to zero, the local machine will do no
-    builds.  Nix will still substitute from binary caches, and build
+    builds.  Lix will still substitute from binary caches, and build
    remotely if remote builders are configured.

  - `cores`\
@@ -1,6 +1,6 @@
 # Verifying Build Reproducibility

-You can use Nix's `diff-hook` setting to compare build results. Note
+You can use Lix's `diff-hook` setting to compare build results. Note
 that this hook is only executed if the results differ; it is not used
 for determining if the results are the same.

@@ -44,7 +44,7 @@ built.
 Verify a path which already exists in the Nix store by passing `--check`
 to the build command.

-If the build passes and is deterministic, Nix will exit with a status
+If the build passes and is deterministic, Lix will exit with a status
 code of 0:

 ```console
@@ -59,7 +59,7 @@ checking outputs of '/nix/store/z98fasz2jqy9gs0xbvdj939p27jwda38-stable.drv'...
 /nix/store/yyxlzw3vqaas7wfp04g0b1xg51f2czgq-stable
 ```

-If the build is not deterministic, Nix will exit with a status code of
+If the build is not deterministic, Lix will exit with a status code of
 1:

 ```console
@@ -75,7 +75,7 @@ error: derivation '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv' may
 not be deterministic: output '/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cap-unstable' differs
 ```

-In the Nix daemon's log, we will now see:
+In the Lix daemon's log, we will now see:

 ```
 For derivation /nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv:
@@ -85,7 +85,7 @@ For derivation /nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv:
 > 30204
 ```

-Using `--check` with `--keep-failed` will cause Nix to keep the second
+Using `--check` with `--keep-failed` will cause Lix to keep the second
 build's output in a special, `.check` path:

 ```console
@@ -98,7 +98,7 @@ from '/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cap-unstable.check'
 ```

 In particular, notice the
-`/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cap-unstable.check` output. Nix
+`/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cap-unstable.check` output. Lix
 has copied the build results to that directory where you can examine it.

 > []{#check-dirs-are-unregistered} **Note**
@@ -114,7 +114,7 @@ has copied the build results to that directory where you can examine it.
 > build was not deterministic and also a check path does not exist.

 `--check` is only usable if the derivation has been built on the system
-already. If the derivation has not been built Nix will fail with the
+already. If the derivation has not been built Lix will fail with the
 error:

    error: some outputs of '/nix/store/hzi1h60z2qf0nb85iwnpvrai3j2w7rr6-unstable.drv'
@@ -1,10 +1,10 @@
 # Remote Builds

-Nix supports remote builds, where a local Nix installation can forward
+Lix supports remote builds, where a local Lix installation can forward
 Nix builds to other machines. This allows multiple builds to be
-performed in parallel and allows Nix to perform multi-platform builds in
+performed in parallel and allows Lix to perform multi-platform builds in
 a semi-transparent way. For instance, if you perform a build for a
-`x86_64-darwin` on an `i686-linux` machine, Nix can automatically
+`x86_64-darwin` on an `i686-linux` machine, Lix can automatically
 forward the build to a `x86_64-darwin` machine, if available.

 To forward a build to a remote machine, it’s required that the remote
@@ -38,12 +38,15 @@ contains Nix.

 > **Warning**
 >
-> If you are building via the Nix daemon, it is the Nix daemon user account (that is, `root`) that should have SSH access to a user (not necessarily `root`) on the remote machine.
+> If you are building via the Lix daemon (default on Linux and macOS), it is the Lix daemon user account (that is, `root`) that should have SSH access to a user (not necessarily `root`) on the remote machine.
+>
+> Furthermore, `root` needs to have the public host keys for the remote system in its `.ssh/known_hosts`.
+> To add them to `known_hosts` for root, do `ssh-keyscan USER@HOST | sudo tee -a ~root/.ssh/known_hosts`.
 >
 > If you can’t or don’t want to configure `root` to be able to access the remote machine, you can use a private Nix store instead by passing e.g. `--store ~/my-nix` when running a Nix command from the local machine.

 The list of remote machines can be specified on the command line or in
-the Nix configuration file. The former is convenient for testing. For
+the Lix configuration file. The former is convenient for testing. For
 example, the following command allows you to build a derivation for
 `x86_64-darwin` on a Linux machine:

@@ -84,17 +87,17 @@ default, set it to `-`.
 3.  The SSH identity file to be used to log in to the remote machine. If
    omitted, SSH will use its regular identities.

-4.  The maximum number of builds that Nix will execute in parallel on
+4.  The maximum number of builds that Lix will execute in parallel on
    the machine. Typically this should be equal to the number of CPU
    cores. For instance, the machine `itchy` in the example will execute
    up to 8 builds in parallel.

 5.  The “speed factor”, indicating the relative speed of the machine. If
-    there are multiple machines of the right type, Nix will prefer the
+    there are multiple machines of the right type, Lix will prefer the
    fastest, taking load into account.

 6.  A comma-separated list of *supported features*. If a derivation has
-    the `requiredSystemFeatures` attribute, then Nix will only perform
+    the `requiredSystemFeatures` attribute, then Lix will only perform
    the derivation on a machine that has the specified features. For
    instance, the attribute

@@ -8,7 +8,7 @@ simple and working example, but it is not suitable for all use cases.
 The post build hook program runs after each executed build, and blocks
 the build loop. The build loop exits if the hook program fails.

-Concretely, this implementation will make Nix slow or unusable when the
+Concretely, this implementation will make Lix slow or unusable when the
 internet is slow or unreliable.

 A more advanced implementation might pass the store paths to a
@@ -76,7 +76,7 @@ Then make sure the hook program is executable by the `root` user:
 # chmod +x /etc/nix/upload-to-cache.sh
 ```

-# Updating Nix Configuration
+# Updating Lix Configuration

 Edit `/etc/nix/nix.conf` to run our hook, by adding the following
 configuration snippet at the end:
@@ -119,7 +119,7 @@ warning: you did not specify '--add-root'; the result might be removed by the ga

 # Conclusion

-We now have a Nix installation configured to automatically sign and
+We now have a Lix installation configured to automatically sign and
 upload every local build to a remote binary cache.

 Before deploying this to production, be sure to consider the
@@ -1,7 +1,7 @@
 # Architecture

 This chapter describes how Nix works.
-It should help users understand why Nix behaves as it does, and it should help developers understand how to modify Nix and how to write similar tools.
+It should help users understand why Lix behaves as it does, and it should help developers understand how to modify Lix and how to write similar tools.

 ## Overview

@@ -21,8 +21,8 @@ The following [concept map] shows its main components (rectangles), the objects
           |              passed to
           |                   |
 +----------|-------------------|--------------------------------+
-| Nix      |                   V                                |
-|          |      +-------------------------+                   |
+| Nix impl.|                   V                                |
+| (Lix)    |      +-------------------------+                   |
 |          |      | commmand line interface |------.            |
 |          |      +-------------------------+      |            |
 |          |                   |                   |            |
@@ -1,6 +1,6 @@
 # File System Object

-Nix uses a simplified model of the file system, which consists of file system objects.
+Nix implementations use a simplified model of the file system, which consists of file system objects.
 Every file system object is one of the following:

 - File
@@ -15,7 +15,7 @@ Every file system object is one of the following:
 - [Symbolic link](https://en.m.wikipedia.org/wiki/Symbolic_link)

   An arbitrary string.
-   Nix does not assign any semantics to symbolic links.
+   Nix implementations do not assign any semantics to symbolic links.

 File system objects and their children form a tree.
 A bare file or symlink can be a root file system object.
@@ -1,2 +1,2 @@
 This section lists commands and options that you can use when you work
-with Nix.
+with Lix.
@@ -1,14 +1,14 @@
 # Name

-`nix.conf` - Nix configuration file
+`nix.conf` - Lix configuration file

 # Description

-Nix supports a variety of configuration settings, which are read from configuration files or taken as command line flags.
+Lix supports a variety of configuration settings, which are read from configuration files or taken as command line flags.

 ## Configuration file

-By default Nix reads settings from the following places, in that order:
+By default Lix reads settings from the following places, in that order:

 1. The system-wide configuration file `sysconfdir/nix/nix.conf` (i.e. `/etc/nix/nix.conf` on most systems), or `$NIX_CONF_DIR/nix.conf` if [`NIX_CONF_DIR`](./env-common.md#env-NIX_CONF_DIR) is set.

@@ -1,6 +1,6 @@
 # Common Environment Variables

-Most Nix commands interpret the following environment variables:
+Most commands in Lix interpret the following environment variables:

  - <span id="env-IN_NIX_SHELL">[`IN_NIX_SHELL`](#env-IN_NIX_SHELL)</span>\
    Indicator that tells if the current environment was set up by
@@ -13,7 +13,7 @@ Most Nix commands interpret the following environment variables:
    e.g. `/home/eelco/Dev:/etc/nixos`. It can be extended using the
    [`-I` option](@docroot@/command-ref/opt-common.md#opt-I).

-    If `NIX_PATH` is not set at all, Nix will fall back to the following list in [impure](@docroot@/command-ref/conf-file.md#conf-pure-eval) and [unrestricted](@docroot@/command-ref/conf-file.md#conf-restrict-eval) evaluation mode:
+    If `NIX_PATH` is not set at all, Lix will fall back to the following list in [impure](@docroot@/command-ref/conf-file.md#conf-pure-eval) and [unrestricted](@docroot@/command-ref/conf-file.md#conf-restrict-eval) evaluation mode:

      1. `$HOME/.nix-defexpr/channels`
      2. `nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixpkgs`
@@ -50,28 +50,28 @@ Most Nix commands interpret the following environment variables:
    Overrides the location of the Nix store (default `prefix/store`).

  - <span id="env-NIX_DATA_DIR">[`NIX_DATA_DIR`](#env-NIX_DATA_DIR)</span>\
-    Overrides the location of the Nix static data directory (default
+    Overrides the location of the Lix static data directory (default
    `prefix/share`).

  - <span id="env-NIX_LOG_DIR">[`NIX_LOG_DIR`](#env-NIX_LOG_DIR)</span>\
-    Overrides the location of the Nix log directory (default
+    Overrides the location of the Lix log directory (default
    `prefix/var/log/nix`).

  - <span id="env-NIX_STATE_DIR">[`NIX_STATE_DIR`](#env-NIX_STATE_DIR)</span>\
-    Overrides the location of the Nix state directory (default
+    Overrides the location of the Lix state directory (default
    `prefix/var/nix`).

  - <span id="env-NIX_CONF_DIR">[`NIX_CONF_DIR`](#env-NIX_CONF_DIR)</span>\
-    Overrides the location of the system Nix configuration directory
+    Overrides the location of the system Lix configuration directory
    (default `prefix/etc/nix`).

  - <span id="env-NIX_CONFIG">[`NIX_CONFIG`](#env-NIX_CONFIG)</span>\
-    Applies settings from Nix configuration from the environment.
-    The content is treated as if it was read from a Nix configuration file.
+    Applies settings from Lix configuration from the environment.
+    The content is treated as if it was read from a Lix configuration file.
    Settings are separated by the newline character.

  - <span id="env-NIX_USER_CONF_FILES">[`NIX_USER_CONF_FILES`](#env-NIX_USER_CONF_FILES)</span>\
-    Overrides the location of the Nix user configuration files to load from.
+    Overrides the location of the Lix user configuration files to load from.

    The default are the locations according to the [XDG Base Directory Specification].
    See the [XDG Base Directories](#xdg-base-directories) sub-section for details.
@@ -84,19 +84,19 @@ Most Nix commands interpret the following environment variables:
    substantial amounts of disk space. The default is `/tmp`.

  - <span id="env-NIX_REMOTE">[`NIX_REMOTE`](#env-NIX_REMOTE)</span>\
-    This variable should be set to `daemon` if you want to use the Nix
+    This variable should be set to `daemon` if you want to use the Lix
    daemon to execute Nix operations. This is necessary in [multi-user
-    Nix installations](@docroot@/installation/multi-user.md). If the Nix
+    Nix installations](@docroot@/installation/multi-user.md). If the Lix
    daemon's Unix socket is at some non-standard path, this variable
    should be set to `unix://path/to/socket`. Otherwise, it should be
    left unset.

  - <span id="env-NIX_SHOW_STATS">[`NIX_SHOW_STATS`](#env-NIX_SHOW_STATS)</span>\
-    If set to `1`, Nix will print some evaluation statistics, such as
+    If set to `1`, Lix will print some evaluation statistics, such as
    the number of values allocated.

  - <span id="env-NIX_COUNT_CALLS">[`NIX_COUNT_CALLS`](#env-NIX_COUNT_CALLS)</span>\
-    If set to `1`, Nix will print how often functions were called during
+    If set to `1`, Lix will print how often functions were called during
    Nix expression evaluation. This is useful for profiling your Nix
    expressions.

@@ -108,9 +108,9 @@ Most Nix commands interpret the following environment variables:

 ## XDG Base Directories

-Nix follows the [XDG Base Directory Specification].
+Lix follows the [XDG Base Directory Specification].

-For backwards compatibility, Nix commands will follow the standard only when [`use-xdg-base-directories`] is enabled.
+For backwards compatibility, commands in Lix will follow the standard only when [`use-xdg-base-directories`] is enabled.
 [New Nix commands](@docroot@/command-ref/new-cli/nix.md) (experimental) conform to the standard by default.

 The following environment variables are used to determine locations of various state and configuration files:
@@ -1,4 +1,4 @@
 # Files

 This section lists configuration files that you can use when you work
-with Nix.
+with Lix.
@@ -21,7 +21,7 @@ lrwxrwxrwx 1 alice users 51 Oct 29 13:20 /home/alice/.local/state/nix/profiles/p
 lrwxrwxrwx 1 alice users 51 Nov 25 14:35 /home/alice/.local/state/nix/profiles/profile-7-link -> /nix/store/mp0x6xnsg0b8qhswy6riqvimai4gm677-profile
 ```

-Each of these symlinks is a root for the Nix garbage collector.
+Each of these symlinks is a root for the Lix garbage collector.

 The contents of the store path corresponding to each version of the
 profile is a tree of symlinks to the files of the installed packages,
@@ -1,4 +1,4 @@
 # Main Commands

 This section lists commands and options that you can use when you work
-with Nix.
+with Lix.
@@ -14,9 +14,8 @@

 # Disambiguation

-This man page describes the command `nix-build`, which is distinct from `nix
-build`. For documentation on the latter, run `nix build --help` or see `man
-nix3-build`.
+This man page describes the command `nix-build`, which is distinct from [`nix build`](./new-cli/nix3-build.md).
+For documentation on the latter, run `nix build --help` or see `man nix3-build`.

 # Description

@@ -37,7 +37,9 @@ Instead, it looks in a few locations, and acts on all profiles it finds there:
   > Not stable; subject to change
   >
   > Do not rely on this functionality; it just exists for migration purposes and is may change in the future.
-   > These deprecated paths remain a private implementation detail of Nix.
+   > These deprecated paths remain a private implementation detail of Lix.
+
+   <!-- FIXME(Qyriad): this is inconsistent with https://git.lix.systems/lix-project/lix/issues/215, needs updating when that happens -->

   `$NIX_STATE_DIR/profiles` and `$NIX_STATE_DIR/profiles/per-user`.

@@ -1,6 +1,6 @@
 # Name

-`nix-daemon` - Nix multi-user support daemon
+`nix-daemon` - Lix multi-user support daemon

 # Synopsis

@@ -8,6 +8,6 @@

 # Description

-The Nix daemon is necessary in multi-user Nix installations. It runs
+The Lix daemon is necessary in multi-user Lix installations. It runs
 build tasks and other operations on the Nix store on behalf of
 unprivileged users.
@@ -1,6 +1,6 @@
 # Common Options

-Most Nix commands accept the following command-line options:
+Most commands in Lix accept the following command-line options:

 - <span id="opt-help">[`--help`](#opt-help)</span>

@@ -8,12 +8,12 @@ Most Nix commands accept the following command-line options:

 - <span id="opt-version">[`--version`](#opt-version)</span>

-  Prints out the Nix version number on standard output and exits.
+  Prints out the Lix version number on standard output and exits.

 - <span id="opt-verbose">[`--verbose`](#opt-verbose)</span> / `-v`

  Increases the level of verbosity of diagnostic messages printed on standard error.
-  For each Nix operation, the information printed on standard output is well-defined;
+  For each Lix operation, the information printed on standard output is well-defined;
  any diagnostic information is printed on standard error, never on standard output.

  This option may be specified repeatedly.
@@ -21,11 +21,11 @@ Most Nix commands accept the following command-line options:

  - `0` “Errors only”

-    Only print messages explaining why the Nix invocation failed.
+    Only print messages explaining why the Lix invocation failed.

  - `1` “Informational”

-    Print *useful* messages about what Nix is doing.
+    Print *useful* messages about what Lix is doing.
    This is the default.

  - `2` “Talkative”
@@ -80,13 +80,13 @@ Most Nix commands accept the following command-line options:

 - <span id="opt-no-build-output">[`--no-build-output`](#opt-no-build-output)</span> / `-Q`

-  By default, output written by builders to standard output and standard error is echoed to the Nix command's standard error.
+  By default, output written by builders to standard output and standard error is echoed to the Lix command's standard error.
  This option suppresses this behaviour.
  Note that the builder's standard output and error are always written to a log file in `prefix/nix/var/log/nix`.

 - <span id="opt-max-jobs">[`--max-jobs`](#opt-max-jobs)</span> / `-j` *number*

-  Sets the maximum number of build jobs that Nix will perform in parallel to the specified number.
+  Sets the maximum number of build jobs that Lix will perform in parallel to the specified number.
  Specify `auto` to use the number of CPUs in the system.
  The default is specified by the `max-jobs` configuration setting, which itself defaults to `1`.
  A higher value is useful on SMP systems or to exploit I/O latency.
@@ -116,8 +116,8 @@ Most Nix commands accept the following command-line options:
 - <span id="opt-keep-going">[`--keep-going`](#opt-keep-going)</span> / `-k`

  Keep going in case of failed builds, to the greatest extent possible.
-  That is, if building an input of some derivation fails, Nix will still build the other inputs, but not the derivation itself.
-  Without this option, Nix stops if any build fails (except for builds of substitutes), possibly killing builds in progress (in case of parallel or distributed builds).
+  That is, if building an input of some derivation fails, Lix will still build the other inputs, but not the derivation itself.
+  Without this option, Lix stops if any build fails (except for builds of substitutes), possibly killing builds in progress (in case of parallel or distributed builds).

 - <span id="opt-keep-failed">[`--keep-failed`](#opt-keep-failed)</span> / `-K`

@@ -126,18 +126,24 @@ Most Nix commands accept the following command-line options:

 - <span id="opt-fallback">[`--fallback`](#opt-fallback)</span>

-  Whenever Nix attempts to build a derivation for which substitutes are known for each output path, but realising the output paths through the substitutes fails, fall back on building the derivation.
+  Whenever Lix attempts to build a derivation for which substitutes are known for each output path, but realising the output paths through the substitutes fails, fall back on building the derivation.

  The most common scenario in which this is useful is when we have registered substitutes in order to perform binary distribution from, say, a network repository.
  If the repository is down, the realisation of the derivation will fail.
-  When this option is specified, Nix will build the derivation instead.
+  When this option is specified, Lix will build the derivation instead.
  Thus, installation from binaries falls back on installation from source.
  This option is not the default since it is generally not desirable for a transient failure in obtaining the substitutes to lead to a full build from source (with the related consumption of resources).

 - <span id="opt-readonly-mode">[`--readonly-mode`](#opt-readonly-mode)</span>

-  When this option is used, no attempt is made to open the Nix database.
-  Most Nix operations do need database access, so those operations will fail.
+  When this option is used, no attempt is made to open the Lix database.
+  Most Lix operations do need database access, so those operations will fail.
+
+  <div class="warning">
+
+  FIXME(Lix): sometimes you want `--store dummy` instead, because this option sometimes doesn't work. Document why this is.
+
+  </div>

 - <span id="opt-arg">[`--arg`](#opt-arg)</span> *name* *value*

@@ -195,8 +201,8 @@ Most Nix commands accept the following command-line options:

 - <span id="opt-option">[`--option`](#opt-option)</span> *name* *value*

-  Set the Nix configuration option *name* to *value*.
-  This overrides settings in the Nix configuration file (see nix.conf5).
+  Set the Lix configuration option *name* to *value*.
+  This overrides settings in the Lix configuration file (see nix.conf(5)).

 - <span id="opt-repair">[`--repair`](#opt-repair)</span>

@@ -1,3 +1,3 @@
 # Utilities

-This section lists utilities that you can use when you work with Nix.
+This section lists utilities that you can use when you work with Lix.
@@ -11,12 +11,12 @@ follow to ensure a consistent and approachable user experience.
 `nix` command provides a single entry to a number of sub-commands that help
 **developers and system administrators** in the life-cycle of a software
 project. We particularly need to pay special attention to help and assist new
-users of Nix.
+users of Lix.

 # Naming the `COMMANDS`

 Words matter. Naming is an important part of the usability. Users will be
-interacting with Nix on a regular basis so we should **name things for ease of
+interacting with Lix on a regular basis so we should **name things for ease of
 understanding**.

 We recommend following the [Principle of Least
@@ -184,7 +184,7 @@ Initializing Nix project at `/path/to/here`.
 ### Next steps

 It can be invaluable to newcomers to show what a possible next steps and what
-is the usual development workflow with Nix. For example:
+is the usual development workflow with Lix. For example:


 ```shell
@@ -317,7 +317,7 @@ compromise between being terse and being verbose, between showing help to
 beginners and annoying advance users. For this it is important that we know
 what are the priorities.

-Nix command line should be first and foremost written with beginners in mind.
+Lix command line should be first and foremost written with beginners in mind.
 But users won't stay beginners for long and what was once useful might quickly
 become annoying. There is no golden rule that we can give in this guideline
 that would make it easier how to draw a line and find best compromise.
@@ -331,7 +331,7 @@ certain `OPTIONS`, etc…)

 ## Follow best practices

-Needless to say we Nix must be a good citizen and follow best practices in
+Needless to say we Lix must be a good citizen and follow best practices in
 command line.

 In short: **STDOUT is for output, STDERR is for (human) messaging.**
@@ -462,7 +462,7 @@ However, simply converting everything to records is not enough, because the orde
 { "outputs": { "bin": {}, "out": {} } }
 ```

-The first item is the default output. Deriving this information from the outputs ordering is not great, but this is how Nix currently happens to work.
+The first item is the default output. Deriving this information from the outputs ordering is not great, but this is how Lix currently happens to work.
 While it is possible for a JSON parser to preserve the order of fields, we can not rely on this capability to be present in all JSON libraries.

 This representation is extensible and preserves the ordering:
@@ -1,4 +1,11 @@
-This section describes the notion of *experimental features*, and how it fits into the big picture of the development of Nix.
+This section describes the notion of *experimental features*, and how it fits into the big picture of the development of Lix.
+
+<div class="warning">
+
+This section has not been updated for Lix *development practices* and should not be considered authoritative with respect to those; see the Lix wiki for more up-to-date information as it gets written <https://wiki.lix.systems/books/lix-contributors>. The technical content on this page is correct.
+
+</div>
+

 # What are experimental features?

@@ -12,7 +19,7 @@ This was a source of confusion and controversy.

 # When should a new feature be marked experimental?

-A change in the Nix codebase should be guarded by an experimental feature flag if it is considered likely to be reverted or adapted in a backwards-incompatible manner after gathering more experience with it in practice.
+A change in the Lix codebase should be guarded by an experimental feature flag if it is considered likely to be reverted or adapted in a backwards-incompatible manner after gathering more experience with it in practice.

 Examples:

@@ -1,6 +1,6 @@
 # Hacking

-This section provides some notes on how to hack on Nix. To get the latest version of Lix from Forgejo:
+This section provides some notes on how to hack on Lix. To get the latest version of Lix from Forgejo:

 ```console
 $ git clone https://git.lix.systems/lix-project/lix
@@ -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/libnixexpr.so
+$ meson compile -C build src/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/libnixexpr.so.p/nixexpr.cc.o
+$ ninja -C build src/libexpr/liblixexpr.so.p/nixexpr.cc.o
 ```

 To inspect the canonical source of truth on what the state of the buildsystem configuration is, use:
@@ -120,13 +120,13 @@ $ meson introspect

 ## Building Lix outside of development shells

-To build a release version of Nix for the current operating system and CPU architecture:
+To build a release version of Lix for the current operating system and CPU architecture:

 ```console
 $ nix build
 ```

-You can also build Nix for one of the [supported platforms](#platforms).
+You can also build Lix for one of the [supported platforms](#platforms).

 > **Note**
 >
@@ -135,7 +135,7 @@ You can also build Nix for one of the [supported platforms](#platforms).

 ## Platforms

-Nix can be built for various platforms, as specified in [`flake.nix`]:
+Lix can be built for various platforms, as specified in [`flake.nix`]:

 [`flake.nix`]: https://github.com/nixos/nix/blob/master/flake.nix

@@ -147,7 +147,7 @@ Nix can be built for various platforms, as specified in [`flake.nix`]:
 - `armv6l-linux`
 - `armv7l-linux`

-In order to build Nix for a different platform than the one you're currently
+In order to build Lix for a different platform than the one you're currently
 on, you need a way for your current Nix installation to build code for that
 platform. Common solutions include [remote builders] and [binary format emulation]
 (only supported on NixOS).
@@ -196,7 +196,7 @@ Lix uses a string with the following format to identify the *system type* or *pl
 <cpu>-<os>[-<abi>]
 ```

-It is set when Nix is compiled for the given system, and determined by [Meson's `host_machine.cpu_family()` and `host_machine.system()` values](https://mesonbuild.com/Reference-manual_builtin_host_machine.html).
+It is set when Lix is compiled for the given system, and determined by [Meson's `host_machine.cpu_family()` and `host_machine.system()` values](https://mesonbuild.com/Reference-manual_builtin_host_machine.html).

 For historic reasons and backward-compatibility, some CPU and OS identifiers are translated from the GNU Autotools naming convention in [`meson.build`](https://git.lix.systems/lix-project/lix/blob/main/meson.build) as follows:

@@ -212,7 +212,7 @@ For historic reasons and backward-compatibility, some CPU and OS identifiers are

 ## Compilation environments

-Nix can be compiled using multiple environments:
+Lix can be compiled using multiple environments:

 - `stdenv`: default;
 - `gccStdenv`: force the use of `gcc` compiler;
@@ -325,8 +325,13 @@ Here's what a complete entry looks like. The file name is not incorporated in th
 ```
 ---
 synopsis: Basically a title
-issues: 1234
+# 1234 or gh#1234 will refer to CppNix GitHub, fj#1234 will refer to a Lix forgejo issue.
+issues: [1234, fj#1234]
+# Use this *only* if there is a CppNix pull request associated with this change
 prs: 1238
+# List of Lix Gerrit changelist numbers; if there is an associated Lix GitHub
+# PR, just put in the Gerrit CL number.
+cls: [123]
 ---

 Here's one or more paragraphs that describe the change.
@@ -32,7 +32,9 @@ The unit tests are defined using the [googletest] and [rapidcheck] frameworks.
 > …
 > ```

-The unit tests for each Nix library (`libnixexpr`, `libnixstore`, etc..) live inside a directory `src/${library_shortname}/tests` within the directory for the library (`src/${library_shortname}`).
+<!-- FIXME(Lix): this might get renamed to liblixexpr, etc? -->
+
+The unit tests for each Lix library (`libnixexpr`, `libnixstore`, etc..) live inside a directory `src/${library_shortname}/tests` within the directory for the library (`src/${library_shortname}`).

 The data is in `unit-test-data`, with one subdir per library, with the same name as where the code goes.
 For example, `libnixstore` code is in `src/libstore`, and its test data is in `unit-test-data/libstore`.
@@ -45,8 +47,13 @@ The path to the `unit-test-data` directory is passed to the unit test executable

 ### Running tests

-You can run the whole testsuite with `make check`, or the tests for a specific component with `make libfoo-tests_RUN`.
-Finer-grained filtering is also possible using the [--gtest_filter](https://google.github.io/googletest/advanced.html#running-a-subset-of-the-tests) command-line option, or the `GTEST_FILTER` environment variable.
+You can run the whole testsuite with `just test` (see justfile for exact invocation of meson), and if you want to run just one test suite, use `just test --suite installcheck functional-init` where `installcheck` is the name of the test suite in this case and `functional-init` is the name of the test.
+
+To get a list of tests, use `meson test -C build --list`.
+
+For `installcheck` specifically, first run `just install` before running the test suite (this is due to meson limitations that don't let us put a dependency on installing before doing the test).
+
+Finer-grained filtering within a test suite is also possible using the [--gtest_filter](https://google.github.io/googletest/advanced.html#running-a-subset-of-the-tests) command-line option to a test suite executable, or the `GTEST_FILTER` environment variable.

 ### Unit test support libraries

@@ -85,6 +92,11 @@ Each test is a bash script.

 ### Running the whole test suite

+<div class="warning">
+FIXME(meson): this section is wrong for meson and commented out accordingly. See "Running Tests" above, and ask the Lix team if you need further clarification.
+</div>
+
+<!--
 The whole test suite can be run with:

 ```shell-session
@@ -148,6 +160,8 @@ output from bar

 The test script will then be traced with `set -x` and the output displayed as it happens, regardless of whether the test succeeds or fails.

+-->
+
 ### Debugging failing functional tests

 When a functional test fails, it usually does so somewhere in the middle of the script.
@@ -170,6 +184,10 @@ edit it like so:
 bar
 ```

+<div class="warning">
+FIXME(meson): the command here may be incorrect for meson.
+</div>
+
 Then, running the test with `./mk/debug-test.sh` will drop you into GDB once the script reaches that point:

 ```shell-session
@@ -186,11 +204,15 @@ For example, enter `run` to start the Nix invocation.

 ### Characterization testing

-Occasionally, Nix utilizes a technique called [Characterization Testing](https://en.wikipedia.org/wiki/Characterization_test) as part of the functional tests.
-This technique is to include the exact output/behavior of a former version of Nix in a test in order to check that Nix continues to produce the same behavior going forward.
+Occasionally, Lix utilizes a technique called [Characterization Testing](https://en.wikipedia.org/wiki/Characterization_test) as part of the functional tests.
+This technique is to include the exact output/behavior of a former version of Nix in a test in order to check that Lix continues to produce the same behavior going forward.

 For example, this technique is used for the language tests, to check both the printed final value if evaluation was successful, and any errors and warnings encountered.

+<div class="warning">
+FIXME(meson): this is incorrect for meson. `_NIX_TEST_ACCEPT=1` is still valid but the test invocation needs to change.
+</div>
+
 It is frequently useful to regenerate the expected output.
 To do that, rerun the failed test(s) with `_NIX_TEST_ACCEPT=1`.
 For example:
@@ -214,14 +236,21 @@ To ensure that characterization testing doesn't make it harder to intentionally
 ## Integration tests

 The integration tests are defined in the Nix flake under the `hydraJobs.tests` attribute.
-These tests include everything that needs to interact with external services or run Nix in a non-trivial distributed setup.
+These tests include everything that needs to interact with external services or run Lix in a non-trivial distributed setup.
 Because these tests are expensive and require more than what the standard github-actions setup provides, they only run on the master branch (on <https://hydra.nixos.org/jobset/nix/master>).

 You can run them manually with `nix build .#hydraJobs.tests.{testName}` or `nix-build -A hydraJobs.tests.{testName}`

+<div class="warning">
+
+Installer tests section is outdated and commented out, see https://git.lix.systems/lix-project/lix/issues/33
+
+</div>
+
+<!--
 ## Installer tests

-After a one-time setup, the Nix repository's GitHub Actions continuous integration (CI) workflow can test the installer each time you push to a branch.
+After a one-time setup, the Lix repository's GitHub Actions continuous integration (CI) workflow can test the installer each time you push to a branch.

 Creating a Cachix cache for your installer tests and adding its authorization token to GitHub enables [two installer-specific jobs in the CI workflow](https://github.com/NixOS/nix/blob/88a45d6149c0e304f6eb2efcc2d7a4d0d569f8af/.github/workflows/ci.yml#L50-L91):

@@ -261,7 +290,7 @@ After the CI run completes, you can check the output to extract the installer UR
    curl -L <install_url> | sh -s -- --tarball-url-prefix https://<github-username>-nix-install-tests.cachix.org/serve
    ```

-<!-- #### Manually generating test installers
+<!~~ #### Manually generating test installers

 There's obviously a manual way to do this, and it's still the only way for
 platforms that lack GA runners.
@@ -288,4 +317,6 @@ search/replaced in it for each new build.

 The installer now supports a `--tarball-url-prefix` flag which _may_ have
 solved this need?
+~~>
+
 -->
@@ -57,12 +57,12 @@
  The location in the file system where store objects live. Typically
  `/nix/store`.

-  From   the  perspective   of   the  location   where  Nix   is
+  From   the  perspective   of   the  location   where  Lix   is
  invoked, the  Nix store can be  referred to
  as a "_local_" or a "_remote_" one:

  + A [local store]{#gloss-local-store} exists on the filesystem of
-    the machine where Nix is  invoked. You can use other
+    the machine where Lix is  invoked. You can use other
    local stores  by passing  the `--store` flag  to the
    `nix` command.  Local stores can be used for building derivations.

@@ -133,7 +133,7 @@

 - [substituter]{#gloss-substituter}

-  An additional [store]{#gloss-store} from which Nix can obtain store objects instead of building them.
+  An additional [store]{#gloss-store} from which Lix can obtain store objects instead of building them.
  Often the substituter is a [binary cache](#gloss-binary-cache), but any store can serve as substituter.

  See the [`substituters` configuration option](./command-ref/conf-file.md#conf-substituters) for details.
@@ -159,7 +159,7 @@
 - [Nix expression]{#gloss-nix-expression}

  A high-level description of software packages and compositions
-  thereof. Deploying software using Nix entails writing Nix
+  thereof. Deploying software using Lix entails writing Nix
  expressions for your packages. Nix expressions are translated to
  derivations that are stored in the Nix store. These derivations can
  then be built.
@@ -1,6 +1,13 @@
-# Building Nix from Source
+# Building Lix from Source

-After cloning Nix's Git repository, issue the following commands:
+<div class="warning">
+
+FIXME(meson): This section is outdated for meson and has been commented out. See https://git.lix.systems/lix-project/lix/issues/258
+
+</div>
+
+<!--
+After cloning Lix's Git repository, issue the following commands:

 ```console
 $ autoreconf -vfi
@@ -29,3 +36,4 @@ Nix keeps its *store* (the place where packages are stored) in

 Nix keeps state (such as its database and log files) in `/nix/var` by
 default. This can be changed using `--localstatedir=path`.
+-->
--- a/Show More
+++ b/Show More