Merge "fix: eval error of .#devShells.x86_64-linux.x86_64-freebsd13" into main

This is broken and our resident nixbsd maintainers say it should
probably just be temporarily removed till we switch to 24.05 instead of
diagnosing it.

Originally introduced in: https://github.com/nixos/nix/pull/8887

Fixes: lix-project/lix#277
Change-Id: I1e7db8859620024a7b37dbd0cc1c5ec139b9e5cb

.version

@@ -1 +1 @@
-2.90.0-beta.0
+2.90.0

CONTRIBUTING.md

@@ -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.

Makefile

@@ -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

Makefile.config.in

@@ -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@

README.md

@@ -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
 

configure.ac

@@ -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

doc/internal-api/local.mk

@@ -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

doc/manual/book.toml

@@ -1,5 +1,5 @@
 [book]
-title = "Nix Reference Manual"
+title = "Lix Reference Manual"
 
 [build]
 create-missing = false
@@ -7,8 +7,10 @@ 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"
 
 # Handles replacing @docroot@ with a path to ./src relative to that markdown file,
 # {{#include handlebars}}, and the @generated@ syntax used within these. it mostly

doc/manual/local.mk

@@ -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

doc/manual/rl-next/enter-debugger-more-reliably-in-let-and-calls.md

@@ -18,8 +18,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.

doc/manual/rl-next/eval-system.md

@@ -6,7 +6,7 @@ prs: 4093
 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.

doc/manual/rl-next/nix-profile-names.md

@@ -6,4 +6,4 @@ cls: [978, 980]
 
 [`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.

doc/manual/src/SUMMARY.md

@@ -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)

doc/manual/src/advanced-topics/cores-vs-jobs.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`\

doc/manual/src/advanced-topics/diff-hook.md

@@ -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'

doc/manual/src/advanced-topics/distributed-builds.md

@@ -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
 

doc/manual/src/advanced-topics/post-build-hook.md

@@ -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

doc/manual/src/architecture/architecture.md

@@ -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 |------.            |
 |          |      +-------------------------+      |            |
 |          |                   |                   |            |

doc/manual/src/architecture/file-system-object.md

@@ -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.

doc/manual/src/command-ref/command-ref.md

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

doc/manual/src/command-ref/conf-file.md

@@ -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.
 

doc/manual/src/command-ref/env-common.md

@@ -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:

doc/manual/src/command-ref/files.md

@@ -1,4 +1,4 @@
 # Files
 
 This section lists configuration files that you can use when you work
-with Nix.
+with Lix.

doc/manual/src/command-ref/files/profiles.md

@@ -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,

doc/manual/src/command-ref/main-commands.md

@@ -1,4 +1,4 @@
 # Main Commands
 
 This section lists commands and options that you can use when you work
-with Nix.
+with Lix.

doc/manual/src/command-ref/nix-collect-garbage.md

@@ -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`.
 

doc/manual/src/command-ref/nix-daemon.md

@@ -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.

doc/manual/src/command-ref/opt-common.md

@@ -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>
 

doc/manual/src/command-ref/utilities.md

@@ -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.

doc/manual/src/contributing/cli-guideline.md

@@ -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:

doc/manual/src/contributing/experimental-features.md

@@ -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:
 

doc/manual/src/contributing/hacking.md

@@ -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
@@ -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.

doc/manual/src/contributing/testing.md

@@ -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?
+~~>
+
 -->

doc/manual/src/glossary.md

@@ -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.

doc/manual/src/installation/building-source.md

@@ -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`.
+-->

doc/manual/src/installation/env-variables.md

@@ -1,6 +1,6 @@
 # Environment Variables
 
-To use Nix, some environment variables should be set. In particular,
+To use Lix, some environment variables should be set. In particular,
 `PATH` should contain the directories `prefix/bin` and
 `~/.nix-profile/bin`. The first directory contains the Nix tools
 themselves, while `~/.nix-profile` is a symbolic link to the current
@@ -16,20 +16,30 @@ source prefix/etc/profile.d/nix.sh
 
 # `NIX_SSL_CERT_FILE`
 
+<div class="warning">
+
+FIXME(Lix): This section is undoubtedly wrong due to the Lix installer being replaced. The definitely-wrong install section has been commented out.
+
+</div>
+
 If you need to specify a custom certificate bundle to account for an
 HTTPS-intercepting man in the middle proxy, you must specify the path to
 the certificate bundle in the environment variable `NIX_SSL_CERT_FILE`.
 
-If you don't specify a `NIX_SSL_CERT_FILE` manually, Nix will install
+If you don't specify a `NIX_SSL_CERT_FILE` manually, Lix will install
 and use its own certificate bundle.
 
-Set the environment variable and install Nix
+<!--
+
+Set the environment variable and install Lix
 
 ```console
 $ export NIX_SSL_CERT_FILE=/etc/ssl/my-certificate-bundle.crt
 $ curl -L https://nixos.org/nix/install | sh
 ```
 
+-->
+
 In the shell profile and rc files (for example, `/etc/bashrc`,
 `/etc/zshrc`), add the following line:
 
@@ -39,10 +49,10 @@ export NIX_SSL_CERT_FILE=/etc/ssl/my-certificate-bundle.crt
 
 > **Note**
 >
-> You must not add the export and then do the install, as the Nix
+> You must not add the export and then do the install, as the Lix
 > installer will detect the presence of Nix configuration, and abort.
 
-If you use the Nix daemon, you should also add the following to
+If you use the Lix daemon, you should also add the following to
 `/etc/nix/nix.conf`:
 
 ```
@@ -51,11 +61,11 @@ ssl-cert-file = /etc/ssl/my-certificate-bundle.crt
 
 ## Proxy Environment Variables
 
-The Nix installer has special handling for these proxy-related
+The Lix installer has special handling for these proxy-related
 environment variables: `http_proxy`, `https_proxy`, `ftp_proxy`,
 `no_proxy`, `HTTP_PROXY`, `HTTPS_PROXY`, `FTP_PROXY`, `NO_PROXY`.
 
-If any of these variables are set when running the Nix installer, then
+If any of these variables are set when running the Lix installer, then
 the installer will create an override file at
 `/etc/systemd/system/nix-daemon.service.d/override.conf` so `nix-daemon`
 will use them.

doc/manual/src/installation/installation.md

@@ -1,38 +1,15 @@
 # Installation
 
-This section describes how to install and configure Nix for first-time use.
+See https://lix.systems/install/ for more details.
 
-The current recommended option on Linux and MacOS is [multi-user](#multi-user).
+<!--
 
-## Multi-user
-
-This installation offers better sharing, improved isolation, and more security
-over a single user installation.
-
-This option requires either:
-
-* Linux running systemd, with SELinux disabled
-* MacOS
-
-```console
-$ bash <(curl -L https://nixos.org/nix/install) --daemon
-```
-
-## Single-user
-
-> Single-user is not supported on Mac.
-
-This installation has less requirements than the multi-user install, however it
-cannot offer equivalent sharing, isolation, or security.
-
-This option is suitable for systems without systemd.
-
-```console
-$ bash <(curl -L https://nixos.org/nix/install) --no-daemon
-```
+FIXME(Lix): Distributions section is probably good but is definitely outdated as of this writing given nobody has packaged Lix yet (2024-05-05)
 
 ## Distributions
 
 The Nix community maintains installers for several distributions.
 
 They can be found in the [`nix-community/nix-installers`](https://github.com/nix-community/nix-installers) repository.
+
+-->

doc/manual/src/installation/installing-binary.md

@@ -1,5 +1,11 @@
 # Installing a Binary Distribution
 
+See https://lix.systems/install/ for more details.
+
+<!--
+
+FIXME(Lix): There are a bunch of technical details on *how* nix is installed in here that we want to keep but it would need serious rewriting.
+
 The easiest way to install Nix is to run the following command:
 
 ```console
@@ -81,7 +87,7 @@ extension. The installer will also create `/etc/profile.d/nix.sh`.
 # macOS Installation
 
 []{#sect-macos-installation-change-store-prefix}[]{#sect-macos-installation-encrypted-volume}[]{#sect-macos-installation-symlink}[]{#sect-macos-installation-recommended-notes}
-<!-- Note: anchors above to catch permalinks to old explanations -->
+<!~~ Note: anchors above to catch permalinks to old explanations ~~>
 
 We believe we have ironed out how to cleanly support the read-only root
 on modern macOS. New installs will do this automatically.
@@ -101,7 +107,7 @@ this to run the installer, but it may help if you run into trouble:
   - `nobrowse`: prevent the Nix Store volume from showing up on your
     desktop; also keeps Spotlight from spending resources to index
     this volume
-  <!-- TODO:
+  <!~~ TODO:
   - `suid`: honor setuid? surely not? ...
   - `owners`: honor file ownership on the volume
 
@@ -117,7 +123,7 @@ this to run the installer, but it may help if you run into trouble:
     new reports from coming in. But I hesitate to celebrate because we
     haven't really named and catalogued the behavior, understood what
     we're fixing, and validated that all 3 components are essential.
-  -->
+  ~~>
 - if you have FileVault enabled
     - generate an encryption password
     - put it in your system Keychain
@@ -156,3 +162,5 @@ $ ./install
 If you need to edit the multi-user installation script to use different
 group ID or a different user ID range, modify the variables set in the
 file named `install-multi-user`.
+
+-->

doc/manual/src/installation/installing-docker.md

@@ -1,6 +1,10 @@
-# Using Nix within Docker
+# Using Lix within Docker
 
-To run the latest stable release of Nix with Docker run the following command:
+Currently the Lix project doesn't ship docker images. However, we have the infrastructure to do it, it's just not yet been done. See https://git.lix.systems/lix-project/lix/issues/252
+
+<!--
+
+To run the latest stable release of Lix with Docker run the following command:
 
 ```console
 $ docker run -ti nixos/nix
@@ -16,7 +20,7 @@ nix (Nix) 2.3.12
 35ca4ada6e96:/# exit
 ```
 
-# What is included in Nix's Docker image?
+# What is included in Lix's Docker image?
 
 The official Docker image is created using `pkgs.dockerTools.buildLayeredImage`
 (and not with `Dockerfile` as it is usual with Docker images). You can still
@@ -24,7 +28,7 @@ base your custom Docker image on it as you would do with any other Docker
 image.
 
 The Docker image is also not based on any other image and includes minimal set
-of runtime dependencies that are required to use Nix:
+of runtime dependencies that are required to use Lix:
 
  - pkgs.nix
  - pkgs.bashInteractive
@@ -40,7 +44,7 @@ of runtime dependencies that are required to use Nix:
  - pkgs.cacert.out
  - pkgs.findutils
 
-# Docker image with the latest development version of Nix
+# Docker image with the latest development version of Lix
 
 To get the latest image that was built by [Hydra](https://hydra.nixos.org) run
 the following command:
@@ -57,3 +61,4 @@ $ nix build ./\#hydraJobs.dockerImage.x86_64-linux
 $ docker load -i ./result/image.tar.gz
 $ docker run -ti nix:2.5pre20211105
 ```
+-->

doc/manual/src/installation/installing-source.md

@@ -1,4 +1,4 @@
-# Installing Nix from Source
+# Installing Lix from Source
 
-If no binary package is available or if you want to hack on Nix, you
-can build Nix from its Git repository.
+If no binary package is available or if you want to hack on Lix, you
+can build Lix from its Git repository.

doc/manual/src/installation/nix-security.md

@@ -1,15 +1,15 @@
 # Security
 
-Nix has two basic security models. First, it can be used in “single-user
+Lix has two basic security models. First, it can be used in “single-user
 mode”, which is similar to what most other package management tools do:
 there is a single user (typically root) who performs all package
 management operations. All other users can then use the installed
 packages, but they cannot perform package management operations
 themselves.
 
-Alternatively, you can configure Nix in “multi-user mode”. In this
+Alternatively, you can configure Lix in “multi-user mode”. In this
 model, all users can perform package management operations — for
 instance, every user can install software without requiring root
-privileges. Nix ensures that this is secure. For instance, it’s not
+privileges. Lix ensures that this is secure. For instance, it’s not
 possible for one user to overwrite a package used by another user with a
 Trojan horse.

doc/manual/src/installation/prerequisites-source.md

@@ -1,5 +1,15 @@
 # Prerequisites
 
+<div class="warning">
+
+FIXME(meson): This section is very wrong with respect to meson and we have commented it out.
+We are sorry.
+The most current alternative to this section is to read `package.nix` and see which things are being depended on.
+
+</div>
+
+<!--
+
   - GNU Autoconf (<https://www.gnu.org/software/autoconf/>) and the
     autoconf-archive macro collection
     (<https://www.gnu.org/software/autoconf-archive/>). These are
@@ -76,3 +86,5 @@
     RapidCheck are required, which are available at
     <https://google.github.io/googletest/> and
     <https://github.com/emil-e/rapidcheck> respectively.
+
+-->

doc/manual/src/installation/supported-platforms.md

@@ -1,7 +1,11 @@
 # Supported Platforms
 
-Nix is currently supported on the following platforms:
+Lix is currently supported on the following platforms:
 
-  - Linux (i686, x86\_64, aarch64).
+  - Linux (i686 (tier 2), x86\_64 (tier 1), aarch64 (tier 1)).
 
-  - macOS (x86\_64, aarch64).
+  - macOS (x86\_64 (tier 2 [(issue to make tier 1)](https://git.lix.systems/lix-project/lix/issues/269)), aarch64 (tier 1)).
+
+
+Tier 2 platforms aren't checked in CI, so may break without notice; such breakage *is* however considered a bug.
+We would like for them to work but they are a secondary priority.

doc/manual/src/installation/uninstall.md

@@ -1,8 +1,18 @@
-# Uninstalling Nix
+# Uninstalling Lix
+
+<div class="warning">
+
+FIXME(Lix): This section is outdated and commented out due to the Lix installer being replaced such that it has an actual uninstaller.
+
+See https://git.lix.systems/lix-project/lix-installer#uninstalling for up-to-date uninstallation instructions using the installer.
+
+</div>
+
+<!--
 
 ## Single User
 
-If you have a [single-user installation](./installing-binary.md#single-user-installation) of Nix, uninstall it by running:
+If you have a [single-user installation](./installing-binary.md#single-user-installation) of Lix, uninstall it by running:
 
 ```console
 $ rm -rf /nix
@@ -10,7 +20,7 @@ $ rm -rf /nix
 
 ## Multi User
 
-Removing a [multi-user installation](./installing-binary.md#multi-user-installation) of Nix is more involved, and depends on the operating system.
+Removing a [multi-user installation](./installing-binary.md#multi-user-installation) of Lix is more involved, and depends on the operating system.
 
 ### Linux
 
@@ -24,7 +34,7 @@ If you are on Linux with systemd:
    sudo systemctl daemon-reload
    ```
 
-Remove files created by Nix:
+Remove files created by Lix:
 
 ```console
 sudo rm -rf /etc/nix /etc/profile.d/nix.sh /etc/tmpfiles.d/nix-daemon.conf /nix ~root/.nix-channels ~root/.nix-defexpr ~root/.nix-profile
@@ -39,7 +49,7 @@ done
 sudo groupdel nixbld
 ```
 
-There may also be references to Nix in
+There may also be references to Lix in
 
 - `/etc/bash.bashrc`
 - `/etc/bashrc`
@@ -145,3 +155,4 @@ which you may remove.
 > complete. macOS (Catalina+) directly controls root directories and its
 > read-only root will prevent you from manually deleting the empty `/nix`
 > mountpoint.
+-->

doc/manual/src/installation/upgrading.md

@@ -1,14 +1,23 @@
-# Upgrading Nix
+# Upgrading Lix
 
-Multi-user Nix users on macOS can upgrade Nix by running: `sudo -i sh -c
-'nix-channel --update &&
-nix-env --install --attr nixpkgs.nix &&
-launchctl remove org.nixos.nix-daemon &&
-launchctl load /Library/LaunchDaemons/org.nixos.nix-daemon.plist'`
+<div class="warning">
 
-Single-user installations of Nix should run this: `nix-channel --update;
-nix-env --install --attr nixpkgs.nix nixpkgs.cacert`
+FIXME(Lix): does Lix forward to the installer for `nix upgrade-nix`? Should it, if present? Lix *should* restart the daemon for you [but currently doesn't (issue)](https://git.lix.systems/lix-project/lix/issues/267).
 
-Multi-user Nix users on Linux should run this with sudo: `nix-channel
---update; nix-env --install --attr nixpkgs.nix nixpkgs.cacert; systemctl
-daemon-reload; systemctl restart nix-daemon`
+</div>
+
+**For instructions to switch to Lix**, see <https://lix.systems/install>.
+
+Lix may be upgraded by running `nix upgrade-nix` and then restarting the Nix daemon.
+
+## Restarting daemon on Linux
+
+`sudo systemctl daemon-reload && sudo systemctl restart nix-daemon`
+
+## Restarting daemon on macOS
+
+<div class="warning">
+
+FIXME(Lix): Write instructions that, according to the [beta installation guide](https://wiki.lix.systems/link/1) do not sometimes crash macOS (?!)
+
+</div>

doc/manual/src/introduction.md

@@ -1,12 +1,8 @@
 # Introduction
 
-Nix is a _purely functional package manager_.  This means that it
-treats packages like values in purely functional programming languages
-such as Haskell — they are built by functions that don’t have
-side-effects, and they never change after they have been built.  Nix
-stores packages in the _Nix store_, usually the directory
-`/nix/store`, where each package has its own unique subdirectory such
-as
+Lix is an implementation of Nix, a powerful, _purely functional_ package management system.
+This means that it treats packages like values in purely functional programming languages such as Haskell — they are built by functions that don’t have side-effects, and they never change after they have been built.
+Lix stores packages in the _Nix store_, usually the directory `/nix/store`, where each package has its own unique subdirectory such as
 
     /nix/store/b6gvzjyb2pg0kjfwrjmg1vfhh54ad73z-firefox-33.1/
 
@@ -31,7 +27,7 @@ used by other packages.
 
 ## Complete dependencies
 
-Nix helps you make sure that package dependency specifications are
+Lix helps you make sure that package dependency specifications are
 complete.  In general, when you’re making a package for a package
 management system like RPM, you have to specify for each package what
 its dependencies are, but there are no guarantees that this
@@ -40,7 +36,7 @@ package will build and work correctly on _your_ machine if you have
 the dependency installed, but not on the end user's machine if it's
 not there.
 
-Since Nix on the other hand doesn’t install packages in “global”
+Since Lix on the other hand doesn’t install packages in “global”
 locations like `/usr/bin` but in package-specific directories, the
 risk of incomplete dependencies is greatly reduced.  This is because
 tools such as compilers don’t search in per-packages directories such
@@ -54,13 +50,11 @@ This sounds risky, but it works extremely well.
 
 ## Multi-user support
 
-Nix has multi-user support.  This means that non-privileged users can
-securely install software.  Each user can have a different _profile_,
-a set of packages in the Nix store that appear in the user’s `PATH`.
-If a user installs a package that another user has already installed
-previously, the package won’t be built or downloaded a second time.
-At the same time, it is not possible for one user to inject a Trojan
-horse into a package that might be used by another user.
+Lix has multi-user support.
+This means that non-privileged users can securely install software, and it is considered a bug if users can trample on each other.
+Each user can have a different _profile_, a set of packages in the Nix store that appear in the user’s `PATH`.
+If a user installs a package that another user has already installed previously, the package won’t be built or downloaded a second time.
+At the same time, it is not possible for one user to inject a Trojan horse into a package that might be used by another user.
 
 ## Atomic upgrades and rollbacks
 
@@ -106,7 +100,7 @@ Packages are built from _Nix expressions_, which is a simple
 functional language.  A Nix expression describes everything that goes
 into a package build task (a “derivation”): other packages, sources,
 the build script, environment variables for the build script, etc.
-Nix tries very hard to ensure that Nix expressions are
+Lix tries very hard to ensure that Nix expressions are
 _deterministic_: building a Nix expression twice should yield the same
 result.
 
@@ -130,22 +124,21 @@ also all its dependencies (all the way up to the C library and the
 compiler) would have to be built, at least if they are not already in the
 Nix store.  This is a _source deployment model_.  For most users,
 building from source is not very pleasant as it takes far too long.
-However, Nix can automatically skip building from source and instead
+However, Lix can automatically skip building from source and instead
 use a _binary cache_, a web server that provides pre-built
 binaries. For instance, when asked to build
-`/nix/store/b6gvzjyb2pg0…-firefox-33.1` from source, Nix would first
+`/nix/store/b6gvzjyb2pg0…-firefox-33.1` from source, Lix would first
 check if the file `https://cache.nixos.org/b6gvzjyb2pg0….narinfo`
 exists, and if so, fetch the pre-built binary referenced from there;
 otherwise, it would fall back to building from source.
 
 ## Nix Packages collection
 
-We provide a large set of Nix expressions containing hundreds of
-existing Unix packages, the _Nix Packages collection_ (Nixpkgs).
+We provide a large set of Nix expressions containing tens of thousands of existing Unix packages, the _Nix Packages collection_ (Nixpkgs).
 
 ## Managing build environments
 
-Nix is extremely useful for developers as it makes it easy to
+Lix is extremely useful for developers as it makes it easy to
 automatically set up the build environment for a package. Given a Nix
 expression that describes the dependencies of your package, the
 command `nix-shell` will build or download those dependencies if
@@ -174,11 +167,11 @@ the package:
 
 ## Portability
 
-Nix runs on Linux and macOS.
+Lix runs on Linux and macOS.
 
 ## NixOS
 
-NixOS is a Linux distribution based on Nix.  It uses Nix not just for
+NixOS is a Linux distribution based on Nix technology. It uses Nix not just for
 package management but also to manage the system configuration (e.g.,
 to build configuration files in `/etc`).  This means, among other
 things, that it is easy to roll back the entire configuration of the
@@ -188,6 +181,6 @@ homepage](https://nixos.org/).
 
 ## License
 
-Nix is released under the terms of the [GNU LGPLv2.1 or (at your
+Lix is released under the terms of the [GNU LGPLv2.1 or (at your
 option) any later
 version](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html).

doc/manual/src/language/advanced-attributes.md

@@ -116,7 +116,7 @@ Derivations can declare some infrequently used optional attributes.
     These attributes declare that the derivation is a so-called
     *fixed-output derivation*, which means that a cryptographic hash of
     the output is already known in advance. When the build of a
-    fixed-output derivation finishes, Nix computes the cryptographic
+    fixed-output derivation finishes, Lix computes the cryptographic
     hash of the output and compares it to the hash declared with these
     attributes. If there is a mismatch, the build fails.
 
@@ -241,7 +241,7 @@ Derivations can declare some infrequently used optional attributes.
     then when the builder runs, the environment variable `bigPath`
     will contain the absolute path to a temporary file containing `a
     very long string`. That is, for any attribute *x* listed in
-    `passAsFile`, Nix will pass an environment variable `xPath`
+    `passAsFile`, Lix will pass an environment variable `xPath`
     holding the path of the file containing the value of attribute
     *x*. This is useful when you need to pass large strings to a
     builder, since most operating systems impose a limit on the size
@@ -256,13 +256,13 @@ Derivations can declare some infrequently used optional attributes.
     the cost of building locally.
 
   - [`allowSubstitutes`]{#adv-attr-allowSubstitutes}\
-    If this attribute is set to `false`, then Nix will always build this
+    If this attribute is set to `false`, then Lix will always build this
     derivation; it will not try to substitute its outputs. This is
     useful for very trivial derivations (such as `writeText` in Nixpkgs)
     that are cheaper to build than to substitute from a binary cache.
 
     You may disable the effects of this attibute by enabling the
-    `always-allow-substitutes` configuration option in Nix.
+    `always-allow-substitutes` configuration option in Lix.
 
     > **Note**
     >
@@ -284,7 +284,7 @@ Derivations can declare some infrequently used optional attributes.
     [`outputChecks`](#adv-attr-outputChecks) for example.
 
     As a convenience to Bash builders,
-    Nix writes a script that initialises shell variables
+    Lix writes a script that initialises shell variables
     corresponding to all attributes that are representable in Bash. The
     environment variable `NIX_ATTRS_SH_FILE` points to the exact
     location of the script, both in a build and a

doc/manual/src/language/derivations.md

@@ -61,7 +61,7 @@ the attributes of which specify the inputs of the build.
     outputs = [ "lib" "headers" "doc" ];
     ```
 
-    This will cause Nix to pass environment variables `lib`, `headers`
+    This will cause Lix to pass environment variables `lib`, `headers`
     and `doc` to the builder containing the intended store paths of each
     output. The builder would typically do something like
 
@@ -137,7 +137,7 @@ The builder is executed as follows:
         it’s `out`.)
 
   - If an output path already exists, it is removed. Also, locks are
-    acquired to prevent multiple Nix instances from performing the same
+    acquired to prevent multiple Lix instances from performing the same
     build at the same time.
 
   - A log of the combined standard output and error is written to
@@ -150,17 +150,17 @@ The builder is executed as follows:
   - The temporary directory is removed (unless the `-K` option was
     specified).
 
-  - If the build was successful, Nix scans each output path for
+  - If the build was successful, Lix scans each output path for
     references to input paths by looking for the hash parts of the input
-    paths. Since these are potential runtime dependencies, Nix registers
+    paths. Since these are potential runtime dependencies, Lix registers
     them as dependencies of the output paths.
 
-  - After the build, Nix sets the last-modified timestamp on all files
+  - After the build, Lix sets the last-modified timestamp on all files
     in the build result to 1 (00:00:01 1/1/1970 UTC), sets the group to
     the default group, and sets the mode of the file to 0444 or 0555
     (i.e., read-only, with execute permission enabled if the file was
     originally executable). Note that possible `setuid` and `setgid`
     bits are cleared. Setuid and setgid programs are not currently
-    supported by Nix. This is because the Nix archives used in
+    supported by Lix. This is because the Lix archives used in
     deployment have no concept of ownership information, and because it
     makes the build result dependent on the user performing the build.

doc/manual/src/package-management/basic-package-mgmt.md

@@ -1,11 +1,20 @@
 # Basic Package Management
 
+<div class="warning">
+
+FIXME(Lix): This section does not document the most common modern practices in terms of avoiding channels, pinning, declarative software installation (see flakey-profile or home-manager or NixOS), or using flakes, etc.
+It is, however, likely correct at a technical level.
+
+For more information on modern practices, see the [resources](https://lix.systems/resources) page on the Lix site.
+
+</div>
+
 The main command for package management is
 [`nix-env`](../command-ref/nix-env.md).  You can use it to install,
 upgrade, and erase packages, and to query what packages are installed
 or are available for installation.
 
-In Nix, different users can have different “views” on the set of
+In Nix systems, different users can have different “views” on the set of
 installed applications. That is, there might be lots of applications
 present on the system (possibly in many different versions), but users
 can have a specific selection of those active — where “active” just
@@ -14,12 +23,12 @@ on the set of installed applications is called a *user environment*,
 which is just a directory tree consisting of symlinks to the files of
 the active applications.
 
-Components are installed from a set of *Nix expressions* that tell Nix
+Components are installed from a set of *Nix expressions* that tell Lix
 how to build those packages, including, if necessary, their
-dependencies. There is a collection of Nix expressions called the
+dependencies. There is a very large collection of Nix expressions called the
 Nixpkgs package collection that contains packages ranging from basic
 development stuff such as GCC and Glibc, to end-user applications like
-Mozilla Firefox. (Nix is however not tied to the Nixpkgs package
+Mozilla Firefox. (Lix is however not tied to the Nixpkgs package
 collection; you could write your own Nix expressions based on Nixpkgs,
 or completely new ones.)
 
@@ -28,7 +37,7 @@ You can manually download the latest version of Nixpkgs from
 convenient to use the Nixpkgs [*channel*](../command-ref/nix-channel.md), since it makes
 it easy to stay up to date with new versions of Nixpkgs. Nixpkgs is
 automatically added to your list of “subscribed” channels when you
-install Nix. If this is not the case for some reason, you can add it
+install Lix. If this is not the case for some reason, you can add it
 as follows:
 
 ```console
@@ -107,7 +116,7 @@ present on your system (in which case installing it into your user
 environment would be a very quick operation). The last one (`S`)
 indicates whether there is a so-called *substitute* for the package,
 which is Nix’s mechanism for doing binary deployment. It just means that
-Nix knows that it can fetch a pre-built package from somewhere
+Lix knows that it can fetch a pre-built package from somewhere
 (typically a network server) instead of building it locally.
 
 You can install a package using `nix-env --install --attr `. For instance,
@@ -121,12 +130,12 @@ will install the package called `subversion` from `nixpkgs` channel (which is, o
 
 > **Note**
 >
-> When you ask Nix to install a package, it will first try to get it in
-> pre-compiled form from a *binary cache*. By default, Nix will use the
+> When you ask Lix to install a package, it will first try to get it in
+> pre-compiled form from a *binary cache*. By default, Lix will use the
 > binary cache <https://cache.nixos.org>; it contains binaries for most
 > packages in Nixpkgs. Only if no binary is available in the binary
-> cache, Nix will build the package from source. So if `nix-env
-> -iA nixpkgs.subversion` results in Nix building stuff from source, then either
+> cache, Lix will build the package from source. So if `nix-env
+> -iA nixpkgs.subversion` results in Lix building stuff from source, then either
 > the package is not built for your platform by the Nixpkgs build
 > servers, or your version of Nixpkgs is too old or too new. For
 > instance, if you have a very recent checkout of Nixpkgs, then the
@@ -147,7 +156,7 @@ $ nix-env --uninstall subversion
 ```
 
 Upgrading to a new version is just as easy. If you have a new release of
-Nix Packages, you can do:
+nixpkgs, you can do:
 
 ```console
 $ nix-env --upgrade --attr nixpkgs.subversion

doc/manual/src/package-management/binary-cache-substituter.md

@@ -1,8 +1,21 @@
 # Serving a Nix store via HTTP
 
+<div class="warning">
+
+FIXME(Lix): This section documents outdated practices.
+
+In particular, the Lix developers would *not* recommend using `nix-serve` as it is relatively-unmaintained Perl.
+The Lix developers would recommend instead using an s3 based cache (which is what https://cache.nixos.org is), and if it is desired to self-host it, use something like [garage](https://garagehq.deuxfleurs.fr/).
+
+See the following projects:
+- [attic](https://github.com/zhaofengli/attic) - multi-tenant cache for larger deployments, using s3 as a backend.
+- [harmonia](https://github.com/nix-community/harmonia) - closer to a drop in replacement for use cases served by nix-serve
+
+</div>
+
 You can easily share the Nix store of a machine via HTTP. This allows
 other machines to fetch store paths from that machine to speed up
-installations. It uses the same *binary cache* mechanism that Nix
+installations. It uses the same *binary cache* mechanism that Lix
 usually uses to fetch pre-built binaries from <https://cache.nixos.org>.
 
 The daemon that handles binary cache requests via HTTP, `nix-serve`, is
@@ -31,20 +44,19 @@ which should print something like:
     WantMassQuery: 1
     Priority: 30
 
-On the client side, you can tell Nix to use your binary cache using
-`--substituters`, e.g.:
+On the client side, you can tell Lix to use your binary cache using `--substituters` (assuming you are a trusted user, see `trusted-users` in nix.conf), e.g.:
 
 ```console
 $ nix-env --install --attr nixpkgs.firefox --substituters http://avalon:8080/
 ```
 
-The option `substituters` tells Nix to use this binary cache in
+The option `substituters` tells Lix to use this binary cache in
 addition to your default caches, such as <https://cache.nixos.org>.
-Thus, for any path in the closure of Firefox, Nix will first check if
+Thus, for any path in the closure of Firefox, Lix will first check if
 the path is available on the server `avalon` or another binary caches.
 If not, it will fall back to building from source.
 
-You can also tell Nix to always use your binary cache by adding a line
+You can also tell Lix to always use your binary cache by adding a line
 to the `nix.conf` configuration file like this:
 
     substituters = http://avalon:8080/ https://cache.nixos.org/

doc/manual/src/package-management/garbage-collection.md

@@ -6,7 +6,7 @@ is to create a new user environment that no longer contains symlinks to
 the “deleted” packages.
 
 Of course, since disk space is not infinite, unused packages should be
-removed at some point. You can do this by running the Nix garbage
+removed at some point. You can do this by running the Lix garbage
 collector. It will remove from the Nix store any package not used
 (directly or indirectly) by any generation of any profile.
 

doc/manual/src/package-management/package-management.md

@@ -1,4 +1,4 @@
-This chapter discusses how to do package management with Nix, i.e.,
+This chapter discusses how to do package management with Lix, i.e.,
 how to obtain, install, upgrade, and erase packages. This is the
 “user’s” perspective of the Nix system — people who want to *create*
 packages should consult the chapter on the [Nix language](../language/index.md).

doc/manual/src/package-management/s3-substituter.md

@@ -1,17 +1,28 @@
 # Serving a Nix store via S3
 
-Nix has [built-in support](@docroot@/command-ref/new-cli/nix3-help-stores.md#s3-binary-cache-store)
-for storing and fetching store paths from
-Amazon S3 and S3-compatible services. This uses the same *binary*
-cache mechanism that Nix usually uses to fetch prebuilt binaries from
+Lix has [built-in support](@docroot@/command-ref/new-cli/nix3-help-stores.md#s3-binary-cache-store)
+for storing and fetching store paths from Amazon S3 and S3-compatible services.
+
+<div class="warning">
+
+FIXME(Lix): document the correct setup to fetch from a s3 cache via HTTP rather than just through `s3://` (which works, but forces you to remain s3-like on the client side)
+
+</div>
+
+<!--
+FIXME(Lix): no it doesn't! cache.nixos.org is just http!
+
+This uses the same *binary*
+cache mechanism that Lix usually uses to fetch prebuilt binaries from
 [cache.nixos.org](https://cache.nixos.org/).
+-->
 
 In this example we will use the bucket named `example-nix-cache`.
 
 ## Anonymous Reads to your S3-compatible binary cache
 
 If your binary cache is publicly accessible and does not require
-authentication, the simplest and easiest way to use Nix with your S3
+authentication, the simplest and easiest way to use Lix with your S3
 compatible binary cache is to use the HTTP URL for that cache.
 
 For AWS S3 the binary cache URL for example bucket will be exactly
@@ -48,11 +59,11 @@ Your bucket will need the following bucket policy:
 For AWS S3 the binary cache URL for example bucket will be exactly
 <s3://example-nix-cache>.
 
-Nix will use the [default credential provider
+Lix will use the [default credential provider
 chain](https://docs.aws.amazon.com/sdk-for-cpp/v1/developer-guide/credentials.html)
 for authenticating requests to Amazon S3.
 
-Nix supports authenticated reads from Amazon S3 and S3 compatible binary
+Lix supports authenticated reads from Amazon S3 and S3 compatible binary
 caches.
 
 Your bucket will need a bucket policy allowing the desired users to
@@ -63,11 +74,11 @@ updated to have a restricted `Principal` to support this.
 
 ## Authenticated Writes to your S3-compatible binary cache
 
-Nix support fully supports writing to Amazon S3 and S3 compatible
+Lix support fully supports writing to Amazon S3 and S3 compatible
 buckets. The binary cache URL for our example bucket will be
 <s3://example-nix-cache>.
 
-Nix will use the [default credential provider
+Lix will use the [default credential provider
 chain](https://docs.aws.amazon.com/sdk-for-cpp/v1/developer-guide/credentials.html)
 for authenticating requests to Amazon S3.
 

doc/manual/src/package-management/ssh-substituter.md

@@ -1,6 +1,6 @@
 # Serving a Nix store via SSH
 
-You can tell Nix to automatically fetch needed binaries from a remote
+You can tell Lix to automatically fetch needed binaries from a remote
 Nix store via SSH. For example, the following installs Firefox,
 automatically fetching any store paths in Firefox’s closure if they are
 available on the server `avalon`:
@@ -9,8 +9,8 @@ available on the server `avalon`:
 $ nix-env --install --attr nixpkgs.firefox --substituters ssh://alice@avalon
 ```
 
-This works similar to the binary cache substituter that Nix usually
-uses, only using SSH instead of HTTP: if a store path `P` is needed, Nix
+This works similar to the binary cache substituter that Lix usually
+uses, only using SSH instead of HTTP: if a store path `P` is needed, Lix
 will first check if it’s available in the Nix store on `avalon`. If not,
 it will fall back to using the binary cache substituter, and then to
 building from source.

doc/manual/src/protocols/protocols.md

@@ -1,4 +1,4 @@
 # Protocols
 
 This chapter documents various developer-facing interfaces provided by
-Nix.
+Lix.

doc/manual/src/protocols/tarball-fetcher.md

@@ -23,11 +23,11 @@ Link: <flakeref>; rel="immutable"
 *flakeref* must be a tarball flakeref. It can contain the tarball flake attributes
 `narHash`, `rev`, `revCount` and `lastModified`. If `narHash` is included, its
 value must be the NAR hash of the unpacked tarball (as computed via
-`nix hash path`). Nix checks the contents of the returned tarball
+`nix hash path`). Lix checks the contents of the returned tarball
 against the `narHash` attribute. The `rev` and `revCount` attributes
 are useful when the tarball flake is a mirror of a fetcher type that
 has those attributes, such as Git or GitHub. They are not checked by
-Nix.
+Lix.
 
 ```
 Link: <https://example.org/hello/442793d9ec0584f6a6e82fa253850c8085bb150a.tar.gz

doc/manual/src/quick-start.md

@@ -1,17 +1,30 @@
 # Quick Start
 
+<div class="warning">
+
+FIXME(Lix): This chapter is quite outdated with respect to recommended practices in 2024 and needs updating.
+The commands in here will work, however, and the installation section is up to date.
+
+For more updated guidance, see the links on <https://lix.systems/resources/>
+
+</div>
+
 This chapter is for impatient people who don't like reading
 documentation.  For more in-depth information you are kindly referred
 to subsequent chapters.
 
-1. Install Nix by running the following:
+1. Install Lix:
+
+   On Linux and macOS the easiest way to install Lix is to run the following shell command
+   (as a user other than root):
 
    ```console
-   $ curl -L https://nixos.org/nix/install | sh
+   $ curl -sSf -L https://install.lix.systems/lix | sh -s -- install
    ```
 
+   For systems that **already have Nix installed**, such as NixOS systems, read our [install page](https://lix.systems/install)
+
    The install script will use `sudo`, so make sure you have sufficient rights.
-   On Linux, `--daemon` can be omitted for a single-user install.
 
    For other installation methods, see [here](installation/installation.md).
 
@@ -90,10 +103,12 @@ to subsequent chapters.
    $ nix-env --rollback
    ```
 
-1. You should periodically run the Nix garbage collector to get rid of
+1. You should periodically run the Lix garbage collector to get rid of
    unused packages, since uninstalls or upgrades don't actually delete
    them:
 
    ```console
    $ nix-collect-garbage --delete-old
    ```
+
+   N.B. on NixOS there is an option [`nix.gc.automatic`](https://nixos.org/manual/nixos/stable/options#opt-nix.gc.automatic) to enable a systemd timer to automate this task.

doc/manual/src/release-notes/release-notes.md

@@ -1 +1 @@
-# Nix Release Notes
+# Lix Release Notes

flake.lock

@@ -18,11 +18,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1711481231,
-        "narHash": "sha256-J/fW3Xhm3WsJPNd8ksZmfMnol5aOG2qEMDPbOnNNdTQ=",
+        "lastModified": 1715123187,
+        "narHash": "sha256-0czuu757t53lK6uWeo1a5/jJbCd9t4sOtLDFpts60DM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9d6ddb13cee3cc1192e4430277708c732685f38a",
+        "rev": "0c592f9a288bdf764b6f24c757277c0e49757a46",
         "type": "github"
       },
       "original": {

flake.nix

@@ -54,7 +54,7 @@
         (Run `touch .nocontribmsg` to hide this message.)
       '';
 
-      officialRelease = true;
+      officialRelease = false;
 
       # Set to true to build the release notes for the next release.
       buildUnreleasedNotes = false;
@@ -83,7 +83,9 @@
       crossSystems = [
         "armv6l-linux"
         "armv7l-linux"
-        "x86_64-freebsd13"
+        # FIXME: doesn't evaluate, plausibly fixed in >=24.05, so recheck when
+        # we update to 24.05
+        # "x86_64-freebsd13"
         "x86_64-netbsd"
       ];
 
@@ -96,6 +98,10 @@
       ];
 
       forAllSystems = lib.genAttrs systems;
+      # Same as forAllSystems, but removes nulls, in case something is broken
+      # on that system.
+      forAvailableSystems =
+        f: lib.filterAttrs (name: value: value != null && value != { }) (forAllSystems f);
 
       forAllCrossSystems = lib.genAttrs crossSystems;
 
@@ -157,7 +163,6 @@
           # Forward from the previous stage as we don’t want it to pick the lowdown override
           nixUnstable = prev.nixUnstable;
 
-          build-release-notes = final.buildPackages.callPackage ./maintainers/build-release-notes.nix { };
           check-headers = final.buildPackages.callPackage ./maintainers/check-headers.nix { };
           clangbuildanalyzer = final.buildPackages.callPackage ./misc/clangbuildanalyzer.nix { };
 
@@ -191,10 +196,11 @@
             busybox-sandbox-shell = final.busybox-sandbox-shell or final.default-busybox-sandbox-shell;
           };
 
-          # Export the patched version of boehmgc & libseccomp that Lix uses into the overlay
+          # Export the patched version of boehmgc that Lix uses into the overlay
           # for consumers of this flake.
           boehmgc-nix = final.nix.boehmgc-nix;
-          libseccomp-nix = final.nix.libseccomp-nix;
+          # And same thing for our build-release-notes package.
+          build-release-notes = final.nix.build-release-notes;
         };
     in
     {
@@ -282,99 +288,21 @@
           );
         };
 
-        pre-commit = forAllSystems (
+        pre-commit = forAvailableSystems (
           system:
           let
             pkgs = nixpkgsFor.${system}.native;
-            # Import pre-commit bypassing the flake because flakes don't let
-            # you have overlays. Also their implementation forces an
-            # unnecessary reimport of nixpkgs for our use cases.
-            tools = import (pre-commit-hooks + "/nix/call-tools.nix") pkgs;
-            pre-commit-run = pkgs.callPackage (pre-commit-hooks + "/nix/run.nix") {
-              inherit tools;
-              isFlakes = true;
-              # unused!
-              gitignore-nix-src = builtins.throw "gitignore-nix-src is unused";
-            };
+            pre-commit-check = import ./misc/pre-commit.nix { inherit self pkgs pre-commit-hooks; };
+            # dotnet-sdk_6, a nativeBuildInputs of pre-commit, is broken on i686-linux.
+            available = lib.meta.availableOn { inherit system; } pkgs.dotnet-sdk_6;
           in
-          pre-commit-run {
-            src = self;
-            hooks = {
-              no-commit-to-branch = {
-                enable = true;
-                settings.branch = [ "main" ];
-              };
-              check-case-conflicts.enable = true;
-              check-executables-have-shebangs = {
-                enable = true;
-                stages = [ "commit" ];
-              };
-              check-shebang-scripts-are-executable = {
-                enable = true;
-                stages = [ "commit" ];
-              };
-              check-symlinks = {
-                enable = true;
-                excludes = [ "^tests/functional/lang/symlink-resolution/broken$" ];
-              };
-              check-merge-conflicts.enable = true;
-              end-of-file-fixer = {
-                enable = true;
-                excludes = [
-                  "\\.drv$"
-                  "^tests/functional/lang/"
-                ];
-              };
-              mixed-line-endings = {
-                enable = true;
-                excludes = [ "^tests/functional/lang/" ];
-              };
-              release-notes = {
-                enable = true;
-                package = pkgs.build-release-notes;
-                files = "^doc/manual/rl-next(-dev)?";
-                pass_filenames = false;
-                entry = ''
-                  ${lib.getExe pkgs.build-release-notes} doc/manual/rl-next doc/manual/rl-next-dev
-                '';
-              };
-              check-headers = {
-                enable = true;
-                package = pkgs.check-headers;
-                files = "^src/";
-                types = [
-                  "c++"
-                  "file"
-                  "header"
-                ];
-                # generated files; these will never actually be seen by this
-                # check, and are left here as documentation
-                excludes = [
-                  "(parser|lexer)-tab\\.hh$"
-                  "\\.gen\\.hh$"
-                ];
-                entry = lib.getExe pkgs.check-headers;
-              };
-              # TODO: Once the test suite is nicer, clean up and start
-              # enforcing trailing whitespace on tests that don't explicitly
-              # check for it.
-              trim-trailing-whitespace = {
-                enable = true;
-                stages = [ "commit" ];
-                excludes = [ "^tests/functional/lang/" ];
-              };
-              treefmt = {
-                enable = true;
-                settings.formatters = [ pkgs.nixfmt ];
-              };
-            };
-          }
+          lib.optionalAttrs available pre-commit-check
         );
       };
 
       # NOTE *do not* add fresh derivations to checks, always add them to
       # hydraJobs first (so CI will pick them up) and only link them here
-      checks = forAllSystems (
+      checks = forAvailableSystems (
         system:
         {
           binaryTarball = self.hydraJobs.binaryTarball.${system};
@@ -382,6 +310,7 @@
           nixpkgsLibTests = self.hydraJobs.tests.nixpkgsLibTests.${system};
           rl-next = self.hydraJobs.rl-next.${system}.user;
           rl-next-dev = self.hydraJobs.rl-next.${system}.dev;
+          # Will be empty attr set on i686-linux, and filtered out by forAvailableSystems.
           pre-commit = self.hydraJobs.pre-commit.${system};
         }
         // (lib.optionalAttrs (builtins.elem system linux64BitSystems)) {
@@ -438,78 +367,14 @@
               nix = pkgs.callPackage ./package.nix {
                 inherit stdenv versionSuffix;
                 busybox-sandbox-shell = pkgs.busybox-sandbox-shell or pkgs.default-busybox-sandbox;
-                forDevShell = true;
+                internalApiDocs = true;
               };
               pre-commit = self.hydraJobs.pre-commit.${pkgs.system} or { };
             in
-            (nix.override {
-              buildUnreleasedNotes = true;
-              officialRelease = false;
-            }).overrideAttrs
-              (
-                prev:
-                {
-                  # Required for clang-tidy checks
-                  buildInputs =
-                    prev.buildInputs
-                    ++ [
-                      pkgs.just
-                      pkgs.nixfmt
-                    ]
-                    ++ lib.optional (pre-commit ? enabledPackages) pre-commit.enabledPackages
-                    ++ lib.optionals (stdenv.cc.isClang) [
-                      pkgs.llvmPackages.llvm
-                      pkgs.llvmPackages.clang-unwrapped.dev
-                    ];
-                  nativeBuildInputs =
-                    prev.nativeBuildInputs
-                    ++ lib.optional (stdenv.cc.isClang && !stdenv.buildPlatform.isDarwin) pkgs.buildPackages.bear
-                    # Required for clang-tidy checks
-                    ++ lib.optionals (stdenv.cc.isClang) [
-                      pkgs.buildPackages.cmake
-                      pkgs.buildPackages.ninja
-                      pkgs.buildPackages.llvmPackages.llvm.dev
-                    ]
-                    ++
-                      lib.optional (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform)
-                        # for some reason that seems accidental and was changed in
-                        # NixOS 24.05-pre, clang-tools is pinned to LLVM 14 when
-                        # default LLVM is newer.
-                        (pkgs.buildPackages.clang-tools.override { inherit (pkgs.buildPackages) llvmPackages; })
-                    ++ [
-                      # FIXME(Qyriad): remove once the migration to Meson is complete.
-                      pkgs.buildPackages.meson
-                      pkgs.buildPackages.ninja
-                      pkgs.buildPackages.cmake
-
-                      pkgs.buildPackages.clangbuildanalyzer
-                    ];
-
-                  src = null;
-
-                  installFlags = "sysconfdir=$(out)/etc";
-                  strictDeps = false;
-
-                  shellHook = ''
-                    PATH=$prefix/bin:$PATH
-                    unset PYTHONPATH
-                    export MANPATH=$out/share/man:$MANPATH
-
-                    # Make bash completion work.
-                    XDG_DATA_DIRS+=:$out/share
-
-                    ${lib.optionalString (pre-commit ? shellHook) pre-commit.shellHook}
-                    # Allow `touch .nocontribmsg` to turn this notice off.
-                    if ! [[ -f .nocontribmsg ]]; then
-                      cat ${contribNotice}
-                    fi
-                  '';
-                }
-                // lib.optionalAttrs (stdenv.buildPlatform.isLinux && pkgs.glibcLocales != null) {
-                  # Required to make non-NixOS Linux not complain about missing locale files during configure in a dev shell
-                  LOCALE_ARCHIVE = "${lib.getLib pkgs.glibcLocales}/lib/locale/locale-archive";
-                }
-              );
+            pkgs.callPackage nix.mkDevShell {
+              pre-commit-checks = pre-commit;
+              inherit contribNotice;
+            };
         in
         forAllSystems (
           system:

justfile

@@ -1,19 +1,27 @@
 # https://just.systems/man/en/
 
+# List all available targets
+list:
+    just --list
+
+# Clean build artifacts
 clean:
     rm -rf build
 
+# Prepare meson for building
 setup:
     meson setup build --prefix="$PWD/outputs/out"
 
+# Build lix
 build *OPTIONS:
     meson compile -C build {{ OPTIONS }}
 
-compile:
-    just build
+alias compile := build
 
+# Install lix for local development
 install *OPTIONS: (build OPTIONS)
     meson install -C build
 
+# Run tests
 test *OPTIONS:
     meson test -C build --print-errorlogs --quiet {{ OPTIONS }}

local.mk

@@ -1,17 +0,0 @@
-# 2024-03-24: jade benchmarked the default sanitize reporting in clang and got
-# a regression of about 10% on hackage-packages.nix with clang. So we are trapping instead.
-#
-# This has an overhead of 0-4% on gcc and unmeasurably little on clang, in
-# Nix evaluation benchmarks.
-DEFAULT_SANITIZE_FLAGS = -fsanitize=signed-integer-overflow -fsanitize-undefined-trap-on-error
-GLOBAL_CXXFLAGS += -Wno-deprecated-declarations -Werror=switch $(DEFAULT_SANITIZE_FLAGS) -D_GLIBCXX_ASSERTIONS=1
-GLOBAL_LDFLAGS += $(DEFAULT_SANITIZE_FLAGS)
-# Allow switch-enum to be overridden for files that do not support it, usually because of dependency headers.
-ERROR_SWITCH_ENUM = -Werror=switch-enum
-
-$(foreach i, config.h $(wildcard src/lib*/*.hh), \
-  $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644)))
-
-$(GCH): src/libutil/util.hh config.h
-
-GCH_CXXFLAGS = -I src/libutil

m4/ax_cxx_compile_stdcxx.m4

@@ -1,951 +0,0 @@
-# ===========================================================================
-#  https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional])
-#
-# DESCRIPTION
-#
-#   Check for baseline language coverage in the compiler for the specified
-#   version of the C++ standard.  If necessary, add switches to CXX and
-#   CXXCPP to enable support.  VERSION may be '11' (for the C++11 standard)
-#   or '14' (for the C++14 standard).
-#
-#   The second argument, if specified, indicates whether you insist on an
-#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
-#   -std=c++11).  If neither is specified, you get whatever works, with
-#   preference for an extended mode.
-#
-#   The third argument, if specified 'mandatory' or if left unspecified,
-#   indicates that baseline support for the specified C++ standard is
-#   required and that the macro should error out if no mode with that
-#   support is found.  If specified 'optional', then configuration proceeds
-#   regardless, after defining HAVE_CXX${VERSION} if and only if a
-#   supporting mode is found.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
-#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
-#   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
-#   Copyright (c) 2015 Paul Norman <penorman@mac.com>
-#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
-#   Copyright (c) 2016, 2018 Krzesimir Nowak <qdlacz@gmail.com>
-#   Copyright (c) 2019 Enji Cooper <yaneurabeya@gmail.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.  This file is offered as-is, without any
-#   warranty.
-
-#serial 11
-
-dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
-dnl  (serial version number 13).
-
-AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
-  m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"],
-        [$1], [14], [ax_cxx_compile_alternatives="14 1y"],
-        [$1], [17], [ax_cxx_compile_alternatives="17 1z"],
-        [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
-  m4_if([$2], [], [],
-        [$2], [ext], [],
-        [$2], [noext], [],
-        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl
-  m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true],
-        [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true],
-        [$3], [optional], [ax_cxx_compile_cxx$1_required=false],
-        [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])])
-  AC_LANG_PUSH([C++])dnl
-  ac_success=no
-
-  m4_if([$2], [noext], [], [dnl
-  if test x$ac_success = xno; then
-    for alternative in ${ax_cxx_compile_alternatives}; do
-      switch="-std=gnu++${alternative}"
-      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-                     $cachevar,
-        [ac_save_CXX="$CXX"
-         CXX="$CXX $switch"
-         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-          [eval $cachevar=yes],
-          [eval $cachevar=no])
-         CXX="$ac_save_CXX"])
-      if eval test x\$$cachevar = xyes; then
-        CXX="$CXX $switch"
-        if test -n "$CXXCPP" ; then
-          CXXCPP="$CXXCPP $switch"
-        fi
-        ac_success=yes
-        break
-      fi
-    done
-  fi])
-
-  m4_if([$2], [ext], [], [dnl
-  if test x$ac_success = xno; then
-    dnl HP's aCC needs +std=c++11 according to:
-    dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
-    dnl Cray's crayCC needs "-h std=c++11"
-    for alternative in ${ax_cxx_compile_alternatives}; do
-      for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
-        cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-        AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-                       $cachevar,
-          [ac_save_CXX="$CXX"
-           CXX="$CXX $switch"
-           AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-            [eval $cachevar=yes],
-            [eval $cachevar=no])
-           CXX="$ac_save_CXX"])
-        if eval test x\$$cachevar = xyes; then
-          CXX="$CXX $switch"
-          if test -n "$CXXCPP" ; then
-            CXXCPP="$CXXCPP $switch"
-          fi
-          ac_success=yes
-          break
-        fi
-      done
-      if test x$ac_success = xyes; then
-        break
-      fi
-    done
-  fi])
-  AC_LANG_POP([C++])
-  if test x$ax_cxx_compile_cxx$1_required = xtrue; then
-    if test x$ac_success = xno; then
-      AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.])
-    fi
-  fi
-  if test x$ac_success = xno; then
-    HAVE_CXX$1=0
-    AC_MSG_NOTICE([No compiler with C++$1 support was found])
-  else
-    HAVE_CXX$1=1
-    AC_DEFINE(HAVE_CXX$1,1,
-              [define if the compiler supports basic C++$1 syntax])
-  fi
-  AC_SUBST(HAVE_CXX$1)
-])
-
-
-dnl  Test body for checking C++11 support
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-)
-
-
-dnl  Test body for checking C++14 support
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
-)
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_17
-)
-
-dnl  Tests for new features in C++11
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[
-
-// If the compiler admits that it is not ready for C++11, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201103L
-
-#error "This is not a C++11 compiler"
-
-#else
-
-namespace cxx11
-{
-
-  namespace test_static_assert
-  {
-
-    template <typename T>
-    struct check
-    {
-      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-    };
-
-  }
-
-  namespace test_final_override
-  {
-
-    struct Base
-    {
-      virtual ~Base() {}
-      virtual void f() {}
-    };
-
-    struct Derived : public Base
-    {
-      virtual ~Derived() override {}
-      virtual void f() override {}
-    };
-
-  }
-
-  namespace test_double_right_angle_brackets
-  {
-
-    template < typename T >
-    struct check {};
-
-    typedef check<void> single_type;
-    typedef check<check<void>> double_type;
-    typedef check<check<check<void>>> triple_type;
-    typedef check<check<check<check<void>>>> quadruple_type;
-
-  }
-
-  namespace test_decltype
-  {
-
-    int
-    f()
-    {
-      int a = 1;
-      decltype(a) b = 2;
-      return a + b;
-    }
-
-  }
-
-  namespace test_type_deduction
-  {
-
-    template < typename T1, typename T2 >
-    struct is_same
-    {
-      static const bool value = false;
-    };
-
-    template < typename T >
-    struct is_same<T, T>
-    {
-      static const bool value = true;
-    };
-
-    template < typename T1, typename T2 >
-    auto
-    add(T1 a1, T2 a2) -> decltype(a1 + a2)
-    {
-      return a1 + a2;
-    }
-
-    int
-    test(const int c, volatile int v)
-    {
-      static_assert(is_same<int, decltype(0)>::value == true, "");
-      static_assert(is_same<int, decltype(c)>::value == false, "");
-      static_assert(is_same<int, decltype(v)>::value == false, "");
-      auto ac = c;
-      auto av = v;
-      auto sumi = ac + av + 'x';
-      auto sumf = ac + av + 1.0;
-      static_assert(is_same<int, decltype(ac)>::value == true, "");
-      static_assert(is_same<int, decltype(av)>::value == true, "");
-      static_assert(is_same<int, decltype(sumi)>::value == true, "");
-      static_assert(is_same<int, decltype(sumf)>::value == false, "");
-      static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
-      return (sumf > 0.0) ? sumi : add(c, v);
-    }
-
-  }
-
-  namespace test_noexcept
-  {
-
-    int f() { return 0; }
-    int g() noexcept { return 0; }
-
-    static_assert(noexcept(f()) == false, "");
-    static_assert(noexcept(g()) == true, "");
-
-  }
-
-  namespace test_constexpr
-  {
-
-    template < typename CharT >
-    unsigned long constexpr
-    strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
-    {
-      return *s ? strlen_c_r(s + 1, acc + 1) : acc;
-    }
-
-    template < typename CharT >
-    unsigned long constexpr
-    strlen_c(const CharT *const s) noexcept
-    {
-      return strlen_c_r(s, 0UL);
-    }
-
-    static_assert(strlen_c("") == 0UL, "");
-    static_assert(strlen_c("1") == 1UL, "");
-    static_assert(strlen_c("example") == 7UL, "");
-    static_assert(strlen_c("another\0example") == 7UL, "");
-
-  }
-
-  namespace test_rvalue_references
-  {
-
-    template < int N >
-    struct answer
-    {
-      static constexpr int value = N;
-    };
-
-    answer<1> f(int&)       { return answer<1>(); }
-    answer<2> f(const int&) { return answer<2>(); }
-    answer<3> f(int&&)      { return answer<3>(); }
-
-    void
-    test()
-    {
-      int i = 0;
-      const int c = 0;
-      static_assert(decltype(f(i))::value == 1, "");
-      static_assert(decltype(f(c))::value == 2, "");
-      static_assert(decltype(f(0))::value == 3, "");
-    }
-
-  }
-
-  namespace test_uniform_initialization
-  {
-
-    struct test
-    {
-      static const int zero {};
-      static const int one {1};
-    };
-
-    static_assert(test::zero == 0, "");
-    static_assert(test::one == 1, "");
-
-  }
-
-  namespace test_lambdas
-  {
-
-    void
-    test1()
-    {
-      auto lambda1 = [](){};
-      auto lambda2 = lambda1;
-      lambda1();
-      lambda2();
-    }
-
-    int
-    test2()
-    {
-      auto a = [](int i, int j){ return i + j; }(1, 2);
-      auto b = []() -> int { return '0'; }();
-      auto c = [=](){ return a + b; }();
-      auto d = [&](){ return c; }();
-      auto e = [a, &b](int x) mutable {
-        const auto identity = [](int y){ return y; };
-        for (auto i = 0; i < a; ++i)
-          a += b--;
-        return x + identity(a + b);
-      }(0);
-      return a + b + c + d + e;
-    }
-
-    int
-    test3()
-    {
-      const auto nullary = [](){ return 0; };
-      const auto unary = [](int x){ return x; };
-      using nullary_t = decltype(nullary);
-      using unary_t = decltype(unary);
-      const auto higher1st = [](nullary_t f){ return f(); };
-      const auto higher2nd = [unary](nullary_t f1){
-        return [unary, f1](unary_t f2){ return f2(unary(f1())); };
-      };
-      return higher1st(nullary) + higher2nd(nullary)(unary);
-    }
-
-  }
-
-  namespace test_variadic_templates
-  {
-
-    template <int...>
-    struct sum;
-
-    template <int N0, int... N1toN>
-    struct sum<N0, N1toN...>
-    {
-      static constexpr auto value = N0 + sum<N1toN...>::value;
-    };
-
-    template <>
-    struct sum<>
-    {
-      static constexpr auto value = 0;
-    };
-
-    static_assert(sum<>::value == 0, "");
-    static_assert(sum<1>::value == 1, "");
-    static_assert(sum<23>::value == 23, "");
-    static_assert(sum<1, 2>::value == 3, "");
-    static_assert(sum<5, 5, 11>::value == 21, "");
-    static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
-
-  }
-
-  // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
-  // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
-  // because of this.
-  namespace test_template_alias_sfinae
-  {
-
-    struct foo {};
-
-    template<typename T>
-    using member = typename T::member_type;
-
-    template<typename T>
-    void func(...) {}
-
-    template<typename T>
-    void func(member<T>*) {}
-
-    void test();
-
-    void test() { func<foo>(0); }
-
-  }
-
-}  // namespace cxx11
-
-#endif  // __cplusplus >= 201103L
-
-]])
-
-
-dnl  Tests for new features in C++14
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[
-
-// If the compiler admits that it is not ready for C++14, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201402L
-
-#error "This is not a C++14 compiler"
-
-#else
-
-namespace cxx14
-{
-
-  namespace test_polymorphic_lambdas
-  {
-
-    int
-    test()
-    {
-      const auto lambda = [](auto&&... args){
-        const auto istiny = [](auto x){
-          return (sizeof(x) == 1UL) ? 1 : 0;
-        };
-        const int aretiny[] = { istiny(args)... };
-        return aretiny[0];
-      };
-      return lambda(1, 1L, 1.0f, '1');
-    }
-
-  }
-
-  namespace test_binary_literals
-  {
-
-    constexpr auto ivii = 0b0000000000101010;
-    static_assert(ivii == 42, "wrong value");
-
-  }
-
-  namespace test_generalized_constexpr
-  {
-
-    template < typename CharT >
-    constexpr unsigned long
-    strlen_c(const CharT *const s) noexcept
-    {
-      auto length = 0UL;
-      for (auto p = s; *p; ++p)
-        ++length;
-      return length;
-    }
-
-    static_assert(strlen_c("") == 0UL, "");
-    static_assert(strlen_c("x") == 1UL, "");
-    static_assert(strlen_c("test") == 4UL, "");
-    static_assert(strlen_c("another\0test") == 7UL, "");
-
-  }
-
-  namespace test_lambda_init_capture
-  {
-
-    int
-    test()
-    {
-      auto x = 0;
-      const auto lambda1 = [a = x](int b){ return a + b; };
-      const auto lambda2 = [a = lambda1(x)](){ return a; };
-      return lambda2();
-    }
-
-  }
-
-  namespace test_digit_separators
-  {
-
-    constexpr auto ten_million = 100'000'000;
-    static_assert(ten_million == 100000000, "");
-
-  }
-
-  namespace test_return_type_deduction
-  {
-
-    auto f(int& x) { return x; }
-    decltype(auto) g(int& x) { return x; }
-
-    template < typename T1, typename T2 >
-    struct is_same
-    {
-      static constexpr auto value = false;
-    };
-
-    template < typename T >
-    struct is_same<T, T>
-    {
-      static constexpr auto value = true;
-    };
-
-    int
-    test()
-    {
-      auto x = 0;
-      static_assert(is_same<int, decltype(f(x))>::value, "");
-      static_assert(is_same<int&, decltype(g(x))>::value, "");
-      return x;
-    }
-
-  }
-
-}  // namespace cxx14
-
-#endif  // __cplusplus >= 201402L
-
-]])
-
-
-dnl  Tests for new features in C++17
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[
-
-// If the compiler admits that it is not ready for C++17, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201703L
-
-#error "This is not a C++17 compiler"
-
-#else
-
-#include <initializer_list>
-#include <utility>
-#include <type_traits>
-
-namespace cxx17
-{
-
-  namespace test_constexpr_lambdas
-  {
-
-    constexpr int foo = [](){return 42;}();
-
-  }
-
-  namespace test::nested_namespace::definitions
-  {
-
-  }
-
-  namespace test_fold_expression
-  {
-
-    template<typename... Args>
-    int multiply(Args... args)
-    {
-      return (args * ... * 1);
-    }
-
-    template<typename... Args>
-    bool all(Args... args)
-    {
-      return (args && ...);
-    }
-
-  }
-
-  namespace test_extended_static_assert
-  {
-
-    static_assert (true);
-
-  }
-
-  namespace test_auto_brace_init_list
-  {
-
-    auto foo = {5};
-    auto bar {5};
-
-    static_assert(std::is_same<std::initializer_list<int>, decltype(foo)>::value);
-    static_assert(std::is_same<int, decltype(bar)>::value);
-  }
-
-  namespace test_typename_in_template_template_parameter
-  {
-
-    template<template<typename> typename X> struct D;
-
-  }
-
-  namespace test_fallthrough_nodiscard_maybe_unused_attributes
-  {
-
-    int f1()
-    {
-      return 42;
-    }
-
-    [[nodiscard]] int f2()
-    {
-      [[maybe_unused]] auto unused = f1();
-
-      switch (f1())
-      {
-      case 17:
-        f1();
-        [[fallthrough]];
-      case 42:
-        f1();
-      }
-      return f1();
-    }
-
-  }
-
-  namespace test_extended_aggregate_initialization
-  {
-
-    struct base1
-    {
-      int b1, b2 = 42;
-    };
-
-    struct base2
-    {
-      base2() {
-        b3 = 42;
-      }
-      int b3;
-    };
-
-    struct derived : base1, base2
-    {
-        int d;
-    };
-
-    derived d1 {{1, 2}, {}, 4};  // full initialization
-    derived d2 {{}, {}, 4};      // value-initialized bases
-
-  }
-
-  namespace test_general_range_based_for_loop
-  {
-
-    struct iter
-    {
-      int i;
-
-      int& operator* ()
-      {
-        return i;
-      }
-
-      const int& operator* () const
-      {
-        return i;
-      }
-
-      iter& operator++()
-      {
-        ++i;
-        return *this;
-      }
-    };
-
-    struct sentinel
-    {
-      int i;
-    };
-
-    bool operator== (const iter& i, const sentinel& s)
-    {
-      return i.i == s.i;
-    }
-
-    bool operator!= (const iter& i, const sentinel& s)
-    {
-      return !(i == s);
-    }
-
-    struct range
-    {
-      iter begin() const
-      {
-        return {0};
-      }
-
-      sentinel end() const
-      {
-        return {5};
-      }
-    };
-
-    void f()
-    {
-      range r {};
-
-      for (auto i : r)
-      {
-        [[maybe_unused]] auto v = i;
-      }
-    }
-
-  }
-
-  namespace test_lambda_capture_asterisk_this_by_value
-  {
-
-    struct t
-    {
-      int i;
-      int foo()
-      {
-        return [*this]()
-        {
-          return i;
-        }();
-      }
-    };
-
-  }
-
-  namespace test_enum_class_construction
-  {
-
-    enum class byte : unsigned char
-    {};
-
-    byte foo {42};
-
-  }
-
-  namespace test_constexpr_if
-  {
-
-    template <bool cond>
-    int f ()
-    {
-      if constexpr(cond)
-      {
-        return 13;
-      }
-      else
-      {
-        return 42;
-      }
-    }
-
-  }
-
-  namespace test_selection_statement_with_initializer
-  {
-
-    int f()
-    {
-      return 13;
-    }
-
-    int f2()
-    {
-      if (auto i = f(); i > 0)
-      {
-        return 3;
-      }
-
-      switch (auto i = f(); i + 4)
-      {
-      case 17:
-        return 2;
-
-      default:
-        return 1;
-      }
-    }
-
-  }
-
-  namespace test_template_argument_deduction_for_class_templates
-  {
-
-    template <typename T1, typename T2>
-    struct pair
-    {
-      pair (T1 p1, T2 p2)
-        : m1 {p1},
-          m2 {p2}
-      {}
-
-      T1 m1;
-      T2 m2;
-    };
-
-    void f()
-    {
-      [[maybe_unused]] auto p = pair{13, 42u};
-    }
-
-  }
-
-  namespace test_non_type_auto_template_parameters
-  {
-
-    template <auto n>
-    struct B
-    {};
-
-    B<5> b1;
-    B<'a'> b2;
-
-  }
-
-  namespace test_structured_bindings
-  {
-
-    int arr[2] = { 1, 2 };
-    std::pair<int, int> pr = { 1, 2 };
-
-    auto f1() -> int(&)[2]
-    {
-      return arr;
-    }
-
-    auto f2() -> std::pair<int, int>&
-    {
-      return pr;
-    }
-
-    struct S
-    {
-      int x1 : 2;
-      volatile double y1;
-    };
-
-    S f3()
-    {
-      return {};
-    }
-
-    auto [ x1, y1 ] = f1();
-    auto& [ xr1, yr1 ] = f1();
-    auto [ x2, y2 ] = f2();
-    auto& [ xr2, yr2 ] = f2();
-    const auto [ x3, y3 ] = f3();
-
-  }
-
-  namespace test_exception_spec_type_system
-  {
-
-    struct Good {};
-    struct Bad {};
-
-    void g1() noexcept;
-    void g2();
-
-    template<typename T>
-    Bad
-    f(T*, T*);
-
-    template<typename T1, typename T2>
-    Good
-    f(T1*, T2*);
-
-    static_assert (std::is_same_v<Good, decltype(f(g1, g2))>);
-
-  }
-
-  namespace test_inline_variables
-  {
-
-    template<class T> void f(T)
-    {}
-
-    template<class T> inline T g(T)
-    {
-      return T{};
-    }
-
-    template<> inline void f<>(int)
-    {}
-
-    template<> int g<>(int)
-    {
-      return 5;
-    }
-
-  }
-
-}  // namespace cxx17
-
-#endif  // __cplusplus < 201703L
-
-]])

m4/ax_cxx_compile_stdcxx_17.m4

@@ -1,35 +0,0 @@
-# =============================================================================
-#  https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_17.html
-# =============================================================================
-#
-# SYNOPSIS
-#
-#   AX_CXX_COMPILE_STDCXX_17([ext|noext], [mandatory|optional])
-#
-# DESCRIPTION
-#
-#   Check for baseline language coverage in the compiler for the C++17
-#   standard; if necessary, add switches to CXX and CXXCPP to enable
-#   support.
-#
-#   This macro is a convenience alias for calling the AX_CXX_COMPILE_STDCXX
-#   macro with the version set to C++17.  The two optional arguments are
-#   forwarded literally as the second and third argument respectively.
-#   Please see the documentation for the AX_CXX_COMPILE_STDCXX macro for
-#   more information.  If you want to use this macro, you also need to
-#   download the ax_cxx_compile_stdcxx.m4 file.
-#
-# LICENSE
-#
-#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
-#   Copyright (c) 2016 Krzesimir Nowak <qdlacz@gmail.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 2
-
-AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX])
-AC_DEFUN([AX_CXX_COMPILE_STDCXX_17], [AX_CXX_COMPILE_STDCXX([17], [$1], [$2])])

m4/gcc_bug_80431.m4

@@ -1,64 +0,0 @@
-# Ensure that this bug is not present in the C++ toolchain we are using.
-#
-# URL for bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431
-#
-# The test program is from that issue, with only a slight modification
-# to set an exit status instead of printing strings.
-AC_DEFUN([ENSURE_NO_GCC_BUG_80431],
-[
-  AC_MSG_CHECKING([that GCC bug 80431 is fixed])
-  AC_LANG_PUSH(C++)
-  AC_RUN_IFELSE(
-    [AC_LANG_PROGRAM(
-      [[
-        #include <cstdio>
-
-        static bool a = true;
-        static bool b = true;
-
-        struct Options { };
-
-        struct Option
-        {
-            Option(Options * options)
-            {
-                a = false;
-            }
-
-            ~Option()
-            {
-                b = false;
-            }
-        };
-
-        struct MyOptions : Options { };
-
-        struct MyOptions2 : virtual MyOptions
-        {
-            Option foo{this};
-        };
-      ]],
-      [[
-        {
-            MyOptions2 opts;
-        }
-        return (a << 1) | b;
-      ]])],
-    [status_80431=0],
-    [status_80431=$?],
-    [
-      # Assume we're bug-free when cross-compiling
-    ])
-  AC_LANG_POP(C++)
-  AS_CASE([$status_80431],
-    [0],[
-      AC_MSG_RESULT(yes)
-    ],
-    [2],[
-      AC_MSG_RESULT(no)
-      AC_MSG_ERROR(Cannot build Nix with C++ compiler with this bug)
-    ],
-    [
-      AC_MSG_RESULT(unexpected result $status_80431: not expected failure with bug, ignoring)
-    ])
-])

meson.build

@@ -458,6 +458,15 @@ if cxx.get_id() in ['clang', 'gcc']
   )
 endif
 
+if is_darwin
+  configure_file(
+    input : 'misc/launchd/org.nixos.nix-daemon.plist.in',
+    output : 'org.nixos.nix-daemon.plist',
+    copy : true,
+    install_dir : prefix / 'Library/LaunchDaemons',
+  )
+endif
+
 subdir('src')
 subdir('scripts')
 subdir('misc')

misc/bash/local.mk

@@ -1 +0,0 @@
-$(eval $(call install-file-as, $(d)/completion.sh, $(datarootdir)/bash-completion/completions/nix, 0644))

misc/clangbuildanalyzer.nix

@@ -25,6 +25,9 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ lf- ];
     license = lib.licenses.unlicense;
     platforms = lib.platforms.unix;
+    # `long long int` != `size_t`
+    # There's no convenient lib.platforms.32bit or anything, but it's easy enough to do ourselves.
+    badPlatforms = lib.filter (plat: (lib.systems.elaborate plat).is32bit) lib.platforms.all;
     mainProgram = "ClangBuildAnalyzer";
   };
 })

misc/fish/local.mk

@@ -1 +0,0 @@
-$(eval $(call install-file-as, $(d)/completion.fish, $(datarootdir)/fish/vendor_completions.d/nix.fish, 0644))

misc/launchd/local.mk

@@ -1,5 +0,0 @@
-ifdef HOST_DARWIN
-
-  $(eval $(call install-data-in, $(d)/org.nixos.nix-daemon.plist, $(prefix)/Library/LaunchDaemons))
-
-endif

misc/launchd/org.nixos.nix-daemon.plist.in

@@ -2,11 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
   <dict>
-    <key>EnvironmentVariables</key>
-    <dict>
-      <key>OBJC_DISABLE_INITIALIZE_FORK_SAFETY</key>
-      <string>YES</string>
-    </dict>
     <key>Label</key>
     <string>org.nixos.nix-daemon</string>
     <key>KeepAlive</key>

misc/pre-commit.nix

@@ -0,0 +1,99 @@
+{
+  /**
+    Path to Lix's source, normally the flake's "self" argument
+  */
+  self ? pkgs.lib.cleanSource ./.,
+  /**
+    Already instantiated Nixpkgs
+  */
+  pkgs,
+  /**
+    pre-commit-hooks source path, normally from the flake input
+  */
+  pre-commit-hooks,
+}:
+let
+  inherit (pkgs) lib;
+  # Import pre-commit bypassing the flake because flakes don't let
+  # you have overlays. Also their implementation forces an
+  # unnecessary reimport of nixpkgs for our use cases.
+  tools = import (pre-commit-hooks + "/nix/call-tools.nix") pkgs;
+  pre-commit-run = pkgs.callPackage (pre-commit-hooks + "/nix/run.nix") {
+    inherit tools;
+    isFlakes = true;
+    # unused!
+    gitignore-nix-src = builtins.throw "gitignore-nix-src is unused";
+  };
+in
+pre-commit-run {
+  src = self;
+  hooks = {
+    no-commit-to-branch = {
+      enable = true;
+      settings.branch = [ "main" ];
+    };
+    check-case-conflicts.enable = true;
+    check-executables-have-shebangs = {
+      enable = true;
+      stages = [ "commit" ];
+    };
+    check-shebang-scripts-are-executable = {
+      enable = true;
+      stages = [ "commit" ];
+    };
+    check-symlinks = {
+      enable = true;
+      excludes = [ "^tests/functional/lang/symlink-resolution/broken$" ];
+    };
+    check-merge-conflicts.enable = true;
+    end-of-file-fixer = {
+      enable = true;
+      excludes = [
+        "\\.drv$"
+        "^tests/functional/lang/"
+      ];
+    };
+    mixed-line-endings = {
+      enable = true;
+      excludes = [ "^tests/functional/lang/" ];
+    };
+    release-notes = {
+      enable = true;
+      package = pkgs.build-release-notes;
+      files = "^doc/manual/rl-next(-dev)?";
+      pass_filenames = false;
+      entry = ''
+        ${lib.getExe pkgs.build-release-notes} doc/manual/rl-next doc/manual/rl-next-dev
+      '';
+    };
+    check-headers = {
+      enable = true;
+      package = pkgs.check-headers;
+      files = "^src/";
+      types = [
+        "c++"
+        "file"
+        "header"
+      ];
+      # generated files; these will never actually be seen by this
+      # check, and are left here as documentation
+      excludes = [
+        "(parser|lexer)-tab\\.hh$"
+        "\\.gen\\.hh$"
+      ];
+      entry = lib.getExe pkgs.check-headers;
+    };
+    # TODO: Once the test suite is nicer, clean up and start
+    # enforcing trailing whitespace on tests that don't explicitly
+    # check for it.
+    trim-trailing-whitespace = {
+      enable = true;
+      stages = [ "commit" ];
+      excludes = [ "^tests/functional/lang/" ];
+    };
+    treefmt = {
+      enable = true;
+      settings.formatters = [ pkgs.nixfmt ];
+    };
+  };
+}

misc/systemd/local.mk

@@ -1,8 +0,0 @@
-ifdef HOST_LINUX
-
-  $(foreach n, nix-daemon.socket nix-daemon.service, $(eval $(call install-file-in, $(d)/$(n), $(prefix)/lib/systemd/system, 0644)))
-  $(foreach n, nix-daemon.conf, $(eval $(call install-file-in, $(d)/$(n), $(prefix)/lib/tmpfiles.d, 0644)))
-
-  clean-files += $(d)/nix-daemon.socket $(d)/nix-daemon.service $(d)/nix-daemon.conf
-
-endif

misc/zsh/local.mk

@@ -1,2 +0,0 @@
-$(eval $(call install-file-as, $(d)/completion.zsh, $(datarootdir)/zsh/site-functions/_nix, 0644))
-$(eval $(call install-file-as, $(d)/run-help-nix, $(datarootdir)/zsh/site-functions/run-help-nix, 0644))

mk/build-dir.mk

@@ -1,10 +0,0 @@
-# Initialise support for build directories.
-builddir ?=
-
-ifdef builddir
-  buildprefix = $(builddir)/
-  buildprefixrel = $(builddir)
-else
-  buildprefix =
-  buildprefixrel = .
-endif

mk/clean.mk

@@ -1,11 +0,0 @@
-clean-files :=
-
-clean:
-	$(suppress) rm -fv -- $(clean-files)
-
-dryclean:
-	@for i in $(clean-files); do if [ -e $$i ]; then echo $$i; fi; done | sort
-
-print-top-help += \
-  echo "  clean: Delete generated files"; \
-  echo "  dryclean: Show what files would be deleted by 'make clean'";

mk/common-test.sh

@@ -1,15 +0,0 @@
-test_dir=tests/functional
-
-test=$(echo -n "$test" | sed -e "s|^$test_dir/||")
-
-TESTS_ENVIRONMENT=("TEST_NAME=${test%.*}" 'NIX_REMOTE=')
-
-: ${BASH:=/usr/bin/env bash}
-
-init_test () {
-   cd "$test_dir" && env "${TESTS_ENVIRONMENT[@]}" $BASH -e init.sh 2>/dev/null > /dev/null
-}
-
-run_test_proper () {
-   cd "$test_dir/$(dirname $test)" && env "${TESTS_ENVIRONMENT[@]}" $BASH -e $(basename $test)
-}

mk/cxx-big-literal.mk

@@ -1,5 +0,0 @@
-%.gen.hh: %
-	@echo 'R"__NIX_STR(' >> $@.tmp
-	$(trace-gen) cat $< >> $@.tmp
-	@echo ')__NIX_STR"' >> $@.tmp
-	@mv $@.tmp $@

mk/debug-test.sh

@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu -o pipefail
-
-test=$1
-
-dir="$(dirname "${BASH_SOURCE[0]}")"
-source "$dir/common-test.sh"
-
-(init_test)
-run_test_proper

mk/disable-tests.mk

@@ -1,12 +0,0 @@
-# This file is only active for `./configure --disable-tests`.
-# Running `make check` or `make installcheck` would indicate a mistake in the
-# caller.
-
-installcheck:
-	@echo "Tests are disabled. Configure without '--disable-tests', or avoid calling 'make installcheck'."
-	@exit 1
-
-# This currently has little effect.
-check:
-	@echo "Tests are disabled. Configure without '--disable-tests', or avoid calling 'make check'."
-	@exit 1

mk/functions.mk

@@ -1,14 +0,0 @@
-# Utility function for recursively finding files, e.g.
-# ‘$(call rwildcard, path/to/dir, *.c *.h)’.
-rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d))
-
-# Given a file name, produce the corresponding dependency file
-# (e.g. ‘foo/bar.o’ becomes ‘foo/.bar.o.dep’).
-filename-to-dep = $(dir $1).$(notdir $1).dep
-
-# Return the full path to a program by looking it up in $PATH, or the
-# empty string if not found.
-find-program = $(shell for i in $$(IFS=: ; echo $$PATH); do p=$$i/$(strip $1); if [ -e $$p ]; then echo $$p; break; fi; done)
-
-# Ensure that the given string ends in a single slash.
-add-trailing-slash = $(patsubst %/,%,$(1))/

mk/install-dirs.mk

@@ -1,11 +0,0 @@
-# Default installation paths.
-prefix ?= /usr/local
-libdir ?= $(prefix)/lib
-bindir ?= $(prefix)/bin
-libexecdir ?= $(prefix)/libexec
-datadir ?= $(prefix)/share
-localstatedir ?= $(prefix)/var
-sysconfdir ?= $(prefix)/etc
-mandir ?= $(prefix)/share/man
-
-DESTDIR ?=

mk/install.mk

@@ -1,62 +0,0 @@
-# Add a rule for creating $(1) as a directory.  This template may be
-# called multiple times for the same directory.
-define create-dir
-   _i := $$(call add-trailing-slash, $(DESTDIR)$$(strip $(1)))
-  ifndef $$(_i)_SEEN
-    $$(_i)_SEEN = 1
-    $$(_i):
-	$$(trace-mkdir) install -d "$$@"
-  endif
-endef
-
-
-# Add a rule for installing file $(1) as file $(2) with mode $(3).
-# The directory containing $(2) will be created automatically.
-define install-file-as
-
-  _i := $(DESTDIR)$$(strip $(2))
-
-  install: $$(_i)
-
-  $$(_i): $(1) | $$(dir $$(_i))
-	$$(trace-install) install -m $(3) $(1) "$$@"
-
-  $$(eval $$(call create-dir, $$(dir $(2))))
-
-endef
-
-
-# Add a rule for installing file $(1) in directory $(2) with mode
-# $(3).  The directory will be created automatically.
-define install-file-in
-  $$(eval $$(call install-file-as,$(1),$(2)/$$(notdir $(1)),$(3)))
-endef
-
-
-define install-program-in
-  $$(eval $$(call install-file-in,$(1),$(2),0755))
-endef
-
-
-define install-data-in
-  $$(eval $$(call install-file-in,$(1),$(2),0644))
-endef
-
-
-# Install a symlink from $(2) to $(1).  Note that $(1) need not exist.
-define install-symlink
-
-  _i := $(DESTDIR)$$(strip $(2))
-
-  install: $$(_i)
-
-  $$(_i): | $$(dir $$(_i))
-	$$(trace-install) ln -sfn $(1) "$$@"
-
-  $$(eval $$(call create-dir, $$(dir $(2))))
-
-endef
-
-
-print-top-help += \
-  echo "  install: Install into \$$(prefix) (currently set to '$(prefix)')";

mk/lib.mk

@@ -1,168 +0,0 @@
-default: all
-
-
-# Get rid of default suffixes. FIXME: is this a good idea?
-.SUFFIXES:
-
-
-# Initialise some variables.
-bin-scripts :=
-noinst-scripts :=
-man-pages :=
-install-tests :=
-install-tests-groups :=
-
-ifdef HOST_OS
-  HOST_KERNEL = $(firstword $(subst -, ,$(HOST_OS)))
-  ifeq ($(HOST_KERNEL), cygwin)
-    HOST_CYGWIN = 1
-  endif
-  ifeq ($(patsubst darwin%,,$(HOST_KERNEL)),)
-    HOST_DARWIN = 1
-  endif
-  ifeq ($(patsubst freebsd%,,$(HOST_KERNEL)),)
-    HOST_FREEBSD = 1
-  endif
-  ifeq ($(HOST_KERNEL), linux)
-    HOST_LINUX = 1
-  endif
-  ifeq ($(patsubst solaris%,,$(HOST_KERNEL)),)
-    HOST_SOLARIS = 1
-  endif
-endif
-
-# Hack to define a literal space.
-space :=
-space +=
-
-
-# Hack to define a literal newline.
-define newline
-
-
-endef
-
-
-# Pass -fPIC if we're building dynamic libraries.
-BUILD_SHARED_LIBS ?= 1
-
-ifeq ($(BUILD_SHARED_LIBS), 1)
-  ifdef HOST_CYGWIN
-    GLOBAL_CFLAGS += -U__STRICT_ANSI__ -D_GNU_SOURCE
-    GLOBAL_CXXFLAGS += -U__STRICT_ANSI__ -D_GNU_SOURCE
-  else
-    GLOBAL_CFLAGS += -fPIC
-    GLOBAL_CXXFLAGS += -fPIC
-  endif
-  ifndef HOST_DARWIN
-   ifndef HOST_SOLARIS
-    ifndef HOST_FREEBSD
-     GLOBAL_LDFLAGS += -Wl,--no-copy-dt-needed-entries
-    endif
-   endif
-  endif
-  SET_RPATH_TO_LIBS ?= 1
-endif
-
-# Pass -g if we want debug info.
-BUILD_DEBUG ?= 1
-
-ifeq ($(BUILD_DEBUG), 1)
-  GLOBAL_CFLAGS += -g
-  GLOBAL_CXXFLAGS += -g
-endif
-
-
-include mk/build-dir.mk
-include mk/install-dirs.mk
-include mk/functions.mk
-include mk/tracing.mk
-include mk/clean.mk
-include mk/install.mk
-include mk/libraries.mk
-include mk/programs.mk
-include mk/patterns.mk
-include mk/templates.mk
-include mk/cxx-big-literal.mk
-include mk/tests.mk
-
-
-# Include all sub-Makefiles.
-define include-sub-makefile
-  d := $$(patsubst %/,%,$$(dir $(1)))
-  include $(1)
-endef
-
-$(foreach mf, $(makefiles), $(eval $(call include-sub-makefile,$(mf))))
-
-
-# Instantiate stuff.
-$(foreach lib, $(libraries), $(eval $(call build-library,$(lib))))
-$(foreach prog, $(programs), $(eval $(call build-program,$(prog))))
-$(foreach script, $(bin-scripts), $(eval $(call install-program-in,$(script),$(bindir))))
-$(foreach script, $(bin-scripts), $(eval programs-list += $(script)))
-$(foreach script, $(noinst-scripts), $(eval programs-list += $(script)))
-$(foreach template, $(template-files), $(eval $(call instantiate-template,$(template))))
-$(foreach test, $(install-tests), \
-  $(eval $(call run-install-test,$(test))) \
-  $(eval installcheck: $(test).test))
-$(foreach test-group, $(install-tests-groups), \
-  $(eval $(call run-install-test-group,$(test-group))) \
-  $(eval installcheck: $(test-group).test-group) \
-  $(foreach test, $($(test-group)-tests), \
-    $(eval $(call run-install-test,$(test))) \
-    $(eval $(test-group).test-group: $(test).test)))
-
-# Include makefiles requiring built programs.
-$(foreach mf, $(makefiles-late), $(eval $(call include-sub-makefile,$(mf))))
-
-
-$(foreach file, $(man-pages), $(eval $(call install-data-in, $(file), $(mandir)/man$(patsubst .%,%,$(suffix $(file))))))
-
-
-.PHONY: default all man help
-
-all: $(programs-list) $(libs-list) $(man-pages)
-
-man: $(man-pages)
-
-
-help:
-	@echo "The following targets are available:"
-	@echo ""
-	@echo "  default: Build default targets"
-ifdef man-pages
-	@echo "  man: Generate manual pages"
-endif
-	@$(print-top-help)
-ifdef programs-list
-	@echo ""
-	@echo "The following programs can be built:"
-	@echo ""
-	@for i in $(programs-list); do echo "  $$i"; done
-endif
-ifdef libs-list
-	@echo ""
-	@echo "The following libraries can be built:"
-	@echo ""
-	@for i in $(libs-list); do echo "  $$i"; done
-endif
-ifdef install-tests-groups
-	@echo ""
-	@echo "The following groups of functional tests can be run:"
-	@echo ""
-	@for i in $(install-tests-groups); do echo "  $$i.test-group"; done
-	@echo ""
-	@echo "(installcheck includes tests in test groups too.)"
-endif
-	@echo ""
-	@echo "The following variables control the build:"
-	@echo ""
-	@echo "  BUILD_SHARED_LIBS ($(BUILD_SHARED_LIBS)): Whether to build shared libraries"
-	@echo "  BUILD_DEBUG ($(BUILD_DEBUG)): Whether to include debug symbols"
-	@echo "  CC ($(CC)): C compiler to be used"
-	@echo "  CFLAGS: Flags for the C compiler"
-	@echo "  CXX ($(CXX)): C++ compiler to be used"
-	@echo "  CXXFLAGS: Flags for the C++ compiler"
-	@echo "  CPPFLAGS: C preprocessor flags, used for both CC and CXX"
-	@$(print-var-help)

mk/libraries.mk

@@ -1,161 +0,0 @@
-libs-list :=
-
-ifdef HOST_DARWIN
-  SO_EXT = dylib
-else
-  ifdef HOST_CYGWIN
-    SO_EXT = dll
-  else
-    SO_EXT = so
-  endif
-endif
-
-# Build a library with symbolic name $(1).  The library is defined by
-# various variables prefixed by ‘$(1)_’:
-#
-# - $(1)_NAME: the name of the library (e.g. ‘libfoo’); defaults to
-#   $(1).
-#
-# - $(1)_DIR: the directory where the (non-installed) library will be
-#   placed.
-#
-# - $(1)_SOURCES: the source files of the library.
-#
-# - $(1)_CFLAGS: additional C compiler flags.
-#
-# - $(1)_CXXFLAGS: additional C++ compiler flags.
-#
-# - $(1)_ORDER_AFTER: a set of targets on which the object files of
-#   this libraries will have an order-only dependency.
-#
-# - $(1)_LIBS: the symbolic names of other libraries on which this
-#   library depends.
-#
-# - $(1)_ALLOW_UNDEFINED: if set, the library is allowed to have
-#   undefined symbols.  Has no effect for static libraries.
-#
-# - $(1)_LDFLAGS: additional linker flags.
-#
-# - $(1)_LDFLAGS_PROPAGATED: additional linker flags, also propagated
-#   to the linking of programs/libraries that use this library.
-#
-# - $(1)_FORCE_INSTALL: if defined, the library will be installed even
-#   if it's not needed (i.e. dynamically linked) by a program.
-#
-# - $(1)_INSTALL_DIR: the directory where the library will be
-#   installed.  Defaults to $(libdir).
-#
-# - $(1)_EXCLUDE_FROM_LIBRARY_LIST: if defined, the library will not
-#   be automatically marked as a dependency of the top-level all
-#   target andwill not be listed in the make help output. This is
-#   useful for libraries built solely for testing, for example.
-#
-# - BUILD_SHARED_LIBS: if equal to ‘1’, a dynamic library will be
-#   built, otherwise a static library.
-define build-library
-  $(1)_NAME ?= $(1)
-  _d := $(buildprefix)$$(strip $$($(1)_DIR))
-  _srcs := $$(sort $$(foreach src, $$($(1)_SOURCES), $$(src)))
-  $(1)_OBJS := $$(addprefix $(buildprefix), $$(addsuffix .o, $$(basename $$(_srcs))))
-  _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH))
-
-  ifdef HOST_CYGWIN
-    $(1)_INSTALL_DIR ?= $$(bindir)
-  else
-    $(1)_INSTALL_DIR ?= $$(libdir)
-  endif
-
-  $(1)_LDFLAGS_USE :=
-  $(1)_LDFLAGS_USE_INSTALLED :=
-  $(1)_LIB_CLOSURE := $(1)
-
-  $$(eval $$(call create-dir, $$(_d)))
-
-  ifeq ($(BUILD_SHARED_LIBS), 1)
-
-    ifdef $(1)_ALLOW_UNDEFINED
-      ifdef HOST_DARWIN
-        $(1)_LDFLAGS += -undefined suppress -flat_namespace
-      endif
-    else
-      # -Wl,-z,defs is broken with sanitizers on Linux/clang at least.
-    endif
-
-    ifndef HOST_DARWIN
-      $(1)_LDFLAGS += -Wl,-soname=$$($(1)_NAME).$(SO_EXT)
-    endif
-
-    $(1)_PATH := $$(_d)/$$($(1)_NAME).$(SO_EXT)
-
-    $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) | $$(_d)/
-	+$$(trace-ld) $(CXX) -o $$(abspath $$@) -shared $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) $$($(1)_LDFLAGS_UNINSTALLED)
-
-    ifndef HOST_DARWIN
-      $(1)_LDFLAGS_USE += -Wl,-rpath,$$(abspath $$(_d))
-    endif
-    $(1)_LDFLAGS_USE += -L$$(_d) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME)))
-
-    $(1)_INSTALL_PATH := $(DESTDIR)$$($(1)_INSTALL_DIR)/$$($(1)_NAME).$(SO_EXT)
-
-    _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH))
-
-    $$(eval $$(call create-dir, $$($(1)_INSTALL_DIR)))
-
-    $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $(DESTDIR)$$($(1)_INSTALL_DIR)/
-	+$$(trace-ld) $(CXX) -o $$@ -shared $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED))
-
-    $(1)_LDFLAGS_USE_INSTALLED += -L$$(DESTDIR)$$($(1)_INSTALL_DIR) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME)))
-    ifndef HOST_DARWIN
-      ifeq ($(SET_RPATH_TO_LIBS), 1)
-        $(1)_LDFLAGS_USE_INSTALLED += -Wl,-rpath,$$($(1)_INSTALL_DIR)
-      else
-        $(1)_LDFLAGS_USE_INSTALLED += -Wl,-rpath-link,$$($(1)_INSTALL_DIR)
-      endif
-    endif
-
-    ifdef $(1)_FORCE_INSTALL
-      install: $$($(1)_INSTALL_PATH)
-    endif
-
-  else
-
-    $(1)_PATH := $$(_d)/$$($(1)_NAME).a
-
-    $$($(1)_PATH): $$($(1)_OBJS) | $$(_d)/
-	$$(trace-ld) $(LD) $$(ifndef $(HOST_DARWIN),-U) -r -o $$(_d)/$$($(1)_NAME).o $$^
-	$$(trace-ar) $(AR) crs $$@ $$(_d)/$$($(1)_NAME).o
-
-    $(1)_LDFLAGS_USE += $$($(1)_PATH) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE))
-
-    $(1)_INSTALL_PATH := $$(libdir)/$$($(1)_NAME).a
-
-    $(1)_LIB_CLOSURE += $$($(1)_LIBS)
-
-  endif
-
-  $(1)_LDFLAGS_USE += $$($(1)_LDFLAGS_PROPAGATED)
-  $(1)_LDFLAGS_USE_INSTALLED += $$($(1)_LDFLAGS_PROPAGATED)
-
-  # Propagate CFLAGS and CXXFLAGS to the individual object files.
-  $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CFLAGS=$$($(1)_CFLAGS)))
-  $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS)))
-
-  # Make each object file depend on the common dependencies.
-  $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj): $$($(1)_COMMON_DEPS) $$(GLOBAL_COMMON_DEPS)))
-
-  # Make each object file have order-only dependencies on the common
-  # order-only dependencies. This includes the order-only dependencies
-  # of libraries we're depending on.
-  $(1)_ORDER_AFTER_CLOSED = $$($(1)_ORDER_AFTER) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_ORDER_AFTER_CLOSED))
-
-  $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj): | $$($(1)_ORDER_AFTER_CLOSED) $$(GLOBAL_ORDER_AFTER)))
-
-  # Include .dep files, if they exist.
-  $(1)_DEPS := $$(foreach fn, $$($(1)_OBJS), $$(call filename-to-dep, $$(fn)))
-  -include $$($(1)_DEPS)
-
-  ifndef $(1)_EXCLUDE_FROM_LIBRARY_LIST
-  libs-list += $$($(1)_PATH)
-  endif
-  clean-files += $$(_d)/*.a $$(_d)/*.$(SO_EXT) $$(_d)/*.o $$(_d)/.*.dep $$($(1)_DEPS) $$($(1)_OBJS)
-endef

mk/patterns.mk

@@ -1,11 +0,0 @@
-$(buildprefix)%.o: %.cc
-	@mkdir -p "$(dir $@)"
-	$(trace-cxx) $(CXX) -o $@ -c $< $(CPPFLAGS) $(GLOBAL_CXXFLAGS_PCH) $(GLOBAL_CXXFLAGS) $(CXXFLAGS) $($@_CXXFLAGS) $(ERROR_SWITCH_ENUM) -MMD -MF $(call filename-to-dep, $@) -MP
-
-$(buildprefix)%.o: %.cpp
-	@mkdir -p "$(dir $@)"
-	$(trace-cxx) $(CXX) -o $@ -c $< $(CPPFLAGS) $(GLOBAL_CXXFLAGS_PCH) $(GLOBAL_CXXFLAGS) $(CXXFLAGS) $($@_CXXFLAGS) $(ERROR_SWITCH_ENUM) -MMD -MF $(call filename-to-dep, $@) -MP
-
-$(buildprefix)%.o: %.c
-	@mkdir -p "$(dir $@)"
-	$(trace-cc) $(CC) -o $@ -c $< $(CPPFLAGS) $(GLOBAL_CFLAGS) $(CFLAGS) $($@_CFLAGS) -MMD -MF $(call filename-to-dep, $@) -MP

mk/precompiled-headers.mk

@@ -1,21 +0,0 @@
-PRECOMPILE_HEADERS ?= 0
-
-print-var-help += \
-  echo "  PRECOMPILE_HEADERS ($(PRECOMPILE_HEADERS)): Whether to use precompiled headers to speed up the build";
-
-GCH = $(buildprefix)precompiled-headers.h.gch
-
-$(GCH): precompiled-headers.h
-	@rm -f $@
-	@mkdir -p "$(dir $@)"
-	$(trace-gen) $(CXX) -x c++-header -o $@ $< $(GLOBAL_CXXFLAGS) $(GCH_CXXFLAGS)
-
-clean-files += $(GCH)
-
-ifeq ($(PRECOMPILE_HEADERS), 1)
-
-  GLOBAL_CXXFLAGS_PCH += -include $(buildprefix)precompiled-headers.h -Winvalid-pch
-
-  GLOBAL_ORDER_AFTER += $(GCH)
-
-endif

mk/programs.mk

@@ -1,95 +0,0 @@
-programs-list :=
-
-# Build a program with symbolic name $(1).  The program is defined by
-# various variables prefixed by ‘$(1)_’:
-#
-# - $(1)_NAME: the name of the program (e.g. ‘foo’); defaults to
-#   $(1).
-#
-# - $(1)_ENV: environment variables to set when running the program
-#   from the Makefile using the $(1)_RUN target.
-#
-# - $(1)_DIR: the directory where the (non-installed) program will be
-#   placed.
-#
-# - $(1)_SOURCES: the source files of the program.
-#
-# - $(1)_CFLAGS: additional C compiler flags.
-#
-# - $(1)_CXXFLAGS: additional C++ compiler flags.
-#
-# - $(1)_ORDER_AFTER: a set of targets on which the object files of
-#   this program will have an order-only dependency.
-#
-# - $(1)_LIBS: the symbolic names of libraries on which this program
-#   depends.
-#
-# - $(1)_LDFLAGS: additional linker flags.
-#
-# - $(1)_INSTALL_DIR: the directory where the program will be
-#   installed; defaults to $(bindir).
-define build-program
-  $(1)_NAME ?= $(1)
-  _d := $(buildprefix)$$($(1)_DIR)
-  _srcs := $$(sort $$(foreach src, $$($(1)_SOURCES), $$(src)))
-  $(1)_OBJS := $$(addprefix $(buildprefix), $$(addsuffix .o, $$(basename $$(_srcs))))
-  _libs := $$(foreach lib, $$($(1)_LIBS), $$(foreach lib2, $$($$(lib)_LIB_CLOSURE), $$($$(lib2)_PATH)))
-  $(1)_PATH := $$(_d)/$$($(1)_NAME)
-
-  $$(eval $$(call create-dir, $$(_d)))
-
-  $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) | $$(_d)/
-	+$$(trace-ld) $(CXX) -o $$@ $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE))
-
-  $(1)_INSTALL_DIR ?= $$(bindir)
-
-  ifdef $(1)_INSTALL_DIR
-
-    $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$$($(1)_NAME)
-
-    $$(eval $$(call create-dir, $$($(1)_INSTALL_DIR)))
-
-    install: $(DESTDIR)$$($(1)_INSTALL_PATH)
-
-    ifeq ($(BUILD_SHARED_LIBS), 1)
-
-      _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH))
-
-      $(DESTDIR)$$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $(DESTDIR)$$($(1)_INSTALL_DIR)/
-	+$$(trace-ld) $(CXX) -o $$@ $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED))
-
-    else
-
-      $(DESTDIR)$$($(1)_INSTALL_PATH): $$($(1)_PATH) | $(DESTDIR)$$($(1)_INSTALL_DIR)/
-	+$$(trace-install) install -t $(DESTDIR)$$($(1)_INSTALL_DIR) $$<
-
-    endif
-  endif
-
-  # Propagate CFLAGS and CXXFLAGS to the individual object files.
-  $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CFLAGS=$$($(1)_CFLAGS)))
-  $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS)))
-
-  # Make each object file depend on the common dependencies.
-  $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj): $$($(1)_COMMON_DEPS) $$(GLOBAL_COMMON_DEPS)))
-
-  # Make each object file have order-only dependencies on the common
-  # order-only dependencies. This includes the order-only dependencies
-  # of libraries we're depending on.
-  $(1)_ORDER_AFTER_CLOSED = $$($(1)_ORDER_AFTER) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_ORDER_AFTER_CLOSED))
-
-  $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj): | $$($(1)_ORDER_AFTER_CLOSED) $$(GLOBAL_ORDER_AFTER)))
-
-  # Include .dep files, if they exist.
-  $(1)_DEPS := $$(foreach fn, $$($(1)_OBJS), $$(call filename-to-dep, $$(fn)))
-  -include $$($(1)_DEPS)
-
-  programs-list += $$($(1)_PATH)
-  clean-files += $$($(1)_PATH) $$(_d)/*.o $$(_d)/.*.dep $$($(1)_DEPS) $$($(1)_OBJS)
-
-  # Phony target to run this program (typically as a dependency of 'check').
-  .PHONY: $(1)_RUN
-  $(1)_RUN: $$($(1)_PATH)
-	$(trace-test) $$($(1)_ENV) $$($(1)_PATH)
-
-endef

mk/run-test.sh

@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu -o pipefail
-
-red=""
-green=""
-yellow=""
-normal=""
-
-test=$1
-
-dir="$(dirname "${BASH_SOURCE[0]}")"
-source "$dir/common-test.sh"
-
-post_run_msg="ran test $test..."
-if [ -t 1 ]; then
-    red=""
-    green=""
-    yellow=""
-    normal=""
-fi
-
-run_test () {
-    (init_test 2>/dev/null > /dev/null)
-    log="$(run_test_proper 2>&1)" && status=0 || status=$?
-}
-
-run_test
-
-if [ $status -eq 0 ]; then
-  echo "$post_run_msg [${green}PASS$normal]"
-elif [ $status -eq 99 ]; then
-  echo "$post_run_msg [${yellow}SKIP$normal]"
-else
-  echo "$post_run_msg [${red}FAIL$normal]"
-  echo "$log" | sed 's/^/    /'
-  exit "$status"
-fi

mk/templates.mk

@@ -1,19 +0,0 @@
-template-files :=
-
-# Create the file $(1) from $(1).in by running config.status (which
-# substitutes all ‘@var@’ variables set by the configure script).
-define instantiate-template
-
-  clean-files += $(1)
-
-endef
-
-ifneq ($(MAKECMDGOALS), clean)
-
-$(buildprefix)%.h: %.h.in
-	$(trace-gen) rm -f $@ && cd $(buildprefixrel) && ./config.status --quiet --header=$(@:$(buildprefix)%=%)
-
-$(buildprefix)%: %.in
-	$(trace-gen) rm -f $@ && cd $(buildprefixrel) && ./config.status --quiet --file=$(@:$(buildprefix)%=%)
-
-endif

mk/tests.mk

@@ -1,27 +0,0 @@
-# Run program $1 as part of ‘make installcheck’.
-
-test-deps =
-
-define run-install-test
-
-  .PHONY: $1.test
-  $1.test: $1 $(test-deps)
-	@env BASH=$(bash) $(bash) mk/run-test.sh $1 < /dev/null
-
-  .PHONY: $1.test-debug
-  $1.test-debug: $1 $(test-deps)
-	@env BASH=$(bash) $(bash) mk/debug-test.sh $1 < /dev/null
-
-endef
-
-define run-install-test-group
-
-  .PHONY: $1.test-group
-
-endef
-
-.PHONY: check installcheck
-
-print-top-help += \
-  echo "  check: Run unit tests"; \
-  echo "  installcheck: Run functional tests";

mk/tracing.mk

@@ -1,16 +0,0 @@
-V ?= 0
-
-ifeq ($(V), 0)
-
-  trace-gen     = @echo "  GEN   " $@;
-  trace-cc      = @echo "  CC    " $@;
-  trace-cxx     = @echo "  CXX   " $@;
-  trace-ld      = @echo "  LD    " $@;
-  trace-ar      = @echo "  AR    " $@;
-  trace-install = @echo "  INST  " $@;
-  trace-mkdir   = @echo "  MKDIR " $@;
-  trace-test    = @echo "  TEST  " $@;
-
-  suppress  = @
-
-endif

package.nix

@@ -2,8 +2,6 @@
   pkgs,
   lib,
   stdenv,
-  autoconf-archive,
-  autoreconfHook,
   aws-sdk-cpp,
   # If the patched version of Boehm isn't passed, then patch it based off of
   # pkgs.boehmgc. This allows `callPackage`ing this file without needing to
@@ -13,7 +11,7 @@
   boehmgc,
   nlohmann_json,
   bison,
-  build-release-notes,
+  build-release-notes ? __forDefaults.build-release-notes,
   boost,
   brotli,
   bzip2,
@@ -21,14 +19,12 @@
   curl,
   doxygen,
   editline,
-  fetchurl,
   flex,
   git,
   gtest,
   jq,
   libarchive,
   libcpuid,
-  libseccomp-nix ? __forDefaults.libseccomp-nix,
   libseccomp,
   libsodium,
   lsof,
@@ -59,12 +55,6 @@
   # Set to true to build the release notes for the next release.
   buildUnreleasedNotes ? false,
   internalApiDocs ? false,
-  # Avoid setting things that would interfere with a functioning devShell
-  forDevShell ? false,
-
-  # FIXME(Qyriad): build Lix using Meson instead of autoconf and make.
-  # This flag will be removed when the migration to Meson is complete.
-  buildWithMeson ? true,
 
   # Not a real argument, just the only way to approximate let-binding some
   # stuff for argument defaults.
@@ -84,15 +74,7 @@
     };
 
     lix-doc = pkgs.callPackage ./lix-doc/package.nix { };
-
-    # FIXME remove when we have libsecomp 2.5.5 (currently in staging-23.11)
-    libseccomp-nix = libseccomp.overrideAttrs (_: rec {
-      version = "2.5.5";
-      src = fetchurl {
-        url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz";
-        hash = "sha256-JIosik2bmFiqa69ScSw0r+/PnJ6Ut23OAsHJqiX7M3U=";
-      };
-    });
+    build-release-notes = pkgs.callPackage ./maintainers/build-release-notes.nix { };
   },
 }:
 let
@@ -109,8 +91,6 @@ let
     customMemoryManagement = false;
   };
 
-  testConfigureFlags = [ "RAPIDCHECK_HEADERS=${lib.getDev rapidcheck}/extras/gtest/include" ];
-
   # Reimplementation of Nixpkgs' Meson cross file, with some additions to make
   # it actually work.
   mesonCrossFile =
@@ -151,28 +131,14 @@ let
   # that would interfere with repo semantics.
   baseFiles = fileset.fileFilter (f: f.name != ".gitignore") ./.;
 
-  configureFiles = fileset.unions [
-    ./.version
-    ./configure.ac
-    ./m4
-    # TODO: do we really need README.md? It doesn't seem used in the build.
-    ./README.md
-  ];
+  configureFiles = fileset.unions [ ./.version ];
 
-  topLevelBuildFiles = fileset.unions (
-    [
-      ./local.mk
-      ./Makefile
-      ./Makefile.config.in
-      ./mk
-    ]
-    ++ lib.optionals buildWithMeson [
-      ./meson.build
-      ./meson.options
-      ./meson
-      ./scripts/meson.build
-    ]
-  );
+  topLevelBuildFiles = fileset.unions ([
+    ./meson.build
+    ./meson.options
+    ./meson
+    ./scripts/meson.build
+  ]);
 
   functionalTestFiles = fileset.unions [
     ./tests/functional
@@ -199,7 +165,6 @@ stdenv.mkDerivation (finalAttrs: {
           ./precompiled-headers.h
           ./src
           ./COPYING
-          ./scripts/local.mk
         ]
       )
     );
@@ -216,10 +181,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontBuild = false;
 
-  # FIXME(Qyriad): see if this is still needed once the migration to Meson is completed.
   mesonFlags =
-    lib.optionals (buildWithMeson && stdenv.hostPlatform.isLinux) [
-      "-Dsandbox-shell=${lib.getBin busybox-sandbox-shell}/bin/busybox"
+    lib.optionals stdenv.hostPlatform.isLinux [
+      # You'd think meson could just find this in PATH, but busybox is in buildInputs,
+      # which don't actually get added to PATH. And buildInputs is correct over
+      # nativeBuildInputs since this should be a busybox executable on the host.
+      "-Dsandbox-shell=${lib.getExe' busybox-sandbox-shell "busybox"}"
     ]
     ++ lib.optional stdenv.hostPlatform.isStatic "-Denable-embedded-sandbox-shell=true"
     ++ lib.optional (finalAttrs.dontBuild) "-Denable-build=false"
@@ -241,14 +208,15 @@ stdenv.mkDerivation (finalAttrs: {
       bison
       flex
       python3
+      meson
+      ninja
+      cmake
     ]
     ++ [
       (lib.getBin lowdown)
       mdbook
       mdbook-linkcheck
-      autoconf-archive
     ]
-    ++ lib.optional (!buildWithMeson) autoreconfHook
     ++ [
       pkg-config
 
@@ -260,12 +228,7 @@ stdenv.mkDerivation (finalAttrs: {
     ]
     ++ lib.optional stdenv.hostPlatform.isLinux util-linuxMinimal
     ++ lib.optional (!officialRelease && buildUnreleasedNotes) build-release-notes
-    ++ lib.optional (internalApiDocs || forDevShell) doxygen
-    ++ lib.optionals buildWithMeson [
-      meson
-      ninja
-      cmake
-    ];
+    ++ lib.optional internalApiDocs doxygen;
 
   buildInputs =
     [
@@ -284,7 +247,7 @@ stdenv.mkDerivation (finalAttrs: {
       lix-doc
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libseccomp-nix
+      libseccomp
       busybox-sandbox-shell
     ]
     ++ lib.optional internalApiDocs rapidcheck
@@ -304,7 +267,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   # Needed for Meson to find Boost.
   # https://github.com/NixOS/nixpkgs/issues/86131.
-  env = lib.optionalAttrs (buildWithMeson || forDevShell) {
+  env = {
     BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
     BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
   };
@@ -338,37 +301,20 @@ stdenv.mkDerivation (finalAttrs: {
       fi
     '';
 
-  configureFlags =
-    [ "--with-boost=${boost}/lib" ]
-    ++ lib.optionals stdenv.isLinux [ "--with-sandbox-shell=${busybox-sandbox-shell}/bin/busybox" ]
-    ++ lib.optionals (
-      stdenv.isLinux && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux")
-    ) [ "LDFLAGS=-fuse-ld=gold" ]
-    ++ lib.optional stdenv.hostPlatform.isStatic "--enable-embedded-sandbox-shell"
-    ++ lib.optionals (finalAttrs.doCheck || internalApiDocs) testConfigureFlags
-    ++ lib.optional (!canRunInstalled) "--disable-doc-gen"
-    ++ [ (lib.enableFeature internalApiDocs "internal-api-docs") ]
-    ++ lib.optional (!forDevShell) "--sysconfdir=/etc"
-    ++ [ "TOML11_HEADERS=${lib.getDev toml11}/include" ];
-
-  mesonBuildType = lib.optional (buildWithMeson || forDevShell) "debugoptimized";
+  mesonBuildType = "debugoptimized";
 
   installTargets = lib.optional internalApiDocs "internal-api-html";
 
   enableParallelBuilding = true;
 
-  makeFlags = "profiledir=$(out)/etc/profile.d PRECOMPILE_HEADERS=1";
-
   doCheck = canRunInstalled;
 
-  mesonCheckFlags = lib.optionals (buildWithMeson || forDevShell) [ "--suite=check" ];
-
-  installFlags = "sysconfdir=$(out)/etc";
+  mesonCheckFlags = [ "--suite=check" ];
 
   # Make sure the internal API docs are already built, because mesonInstallPhase
   # won't let us build them there. They would normally be built in buildPhase,
   # but the internal API docs are conventionally built with doBuild = false.
-  preInstall = lib.optional (buildWithMeson && internalApiDocs) ''
+  preInstall = lib.optional internalApiDocs ''
     meson ''${mesonBuildFlags:-} compile "$installTargets"
   '';
 
@@ -395,16 +341,10 @@ stdenv.mkDerivation (finalAttrs: {
     '';
 
   doInstallCheck = finalAttrs.doCheck;
-  installCheckFlags = "sysconfdir=$(out)/etc";
-  installCheckTarget = "installcheck"; # work around buggy detection in stdenv
 
   mesonInstallCheckFlags = [ "--suite=installcheck" ];
 
-  preInstallCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
-  '';
-
-  installCheckPhase = lib.optionalString buildWithMeson ''
+  installCheckPhase = ''
     runHook preInstallCheck
     flagsArray=($mesonInstallCheckFlags "''${mesonInstallCheckFlagsArray[@]}")
     meson test --no-rebuild "''${flagsArray[@]}"
@@ -420,11 +360,93 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta.platforms = lib.platforms.unix;
 
-  passthru.perl-bindings = pkgs.callPackage ./perl { inherit fileset stdenv buildWithMeson; };
+  passthru.perl-bindings = pkgs.callPackage ./perl { inherit fileset stdenv; };
 
-  # Export the patched version of boehmgc & libseccomp.
+  # Export the patched version of boehmgc.
   # flake.nix exports that into its overlay.
   passthru = {
-    inherit (__forDefaults) boehmgc-nix libseccomp-nix;
+    inherit (__forDefaults) boehmgc-nix build-release-notes;
+
+    # The collection of dependency logic for this derivation is complicated enough that
+    # it's easier to parameterize the devShell off an already called package.nix.
+    mkDevShell =
+      {
+        mkShell,
+        just,
+        nixfmt,
+        glibcLocales,
+        bear,
+        pre-commit-checks,
+        clang-tools,
+        llvmPackages,
+        clangbuildanalyzer,
+        contribNotice,
+      }:
+      let
+        glibcFix = lib.optionalAttrs (stdenv.buildPlatform.isLinux && glibcLocales != null) {
+          # Required to make non-NixOS Linux not complain about missing locale files during configure in a dev shell
+          LOCALE_ARCHIVE = "${lib.getLib pkgs.glibcLocales}/lib/locale/locale-archive";
+        };
+        # for some reason that seems accidental and was changed in
+        # NixOS 24.05-pre, clang-tools is pinned to LLVM 14 when
+        # default LLVM is newer.
+        clang-tools_llvm = clang-tools.override { inherit llvmPackages; };
+
+        # pkgs.mkShell uses pkgs.stdenv by default, regardless of inputsFrom.
+        actualMkShell = mkShell.override { inherit stdenv; };
+      in
+      actualMkShell (
+        glibcFix
+        // {
+
+          inputsFrom = [ finalAttrs ];
+
+          # For Meson to find Boost.
+          env = finalAttrs.env;
+
+          packages =
+            lib.optional (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) clang-tools_llvm
+            ++ [
+              just
+              nixfmt
+              # Load-bearing order. Must come before clang-unwrapped below, but after clang_tools above.
+              stdenv.cc
+            ]
+            ++ lib.optionals stdenv.cc.isClang [
+              # Required for clang-tidy checks.
+              llvmPackages.llvm
+              llvmPackages.clang-unwrapped.dev
+            ]
+            ++ lib.optional (pre-commit-checks ? enabledPackages) pre-commit-checks.enabledPackages
+            ++ lib.optional (stdenv.cc.isClang && !stdenv.buildPlatform.isDarwin) bear
+            ++ lib.optional (lib.meta.availableOn stdenv.buildPlatform clangbuildanalyzer) clangbuildanalyzer
+            ++ finalAttrs.checkInputs;
+
+          shellHook = ''
+            PATH=$prefix/bin:$PATH
+            unset PYTHONPATH
+            export MANPATH=$out/share/man:$MANPATH
+
+            # Make bash completion work.
+            XDG_DATA_DIRS+=:$out/share
+
+            ${lib.optionalString (pre-commit-checks ? shellHook) pre-commit-checks.shellHook}
+            # Allow `touch .nocontribmsg` to turn this notice off.
+            if ! [[ -f .nocontribmsg ]]; then
+              cat ${contribNotice}
+            fi
+
+            # Install the Gerrit commit-msg hook.
+            # (git common dir is the main .git, including for worktrees)
+            if gitcommondir=$(git rev-parse --git-common-dir 2>/dev/null) && [[ ! -f "$gitcommondir/hooks/commit-msg" ]]; then
+              echo 'Installing Gerrit commit-msg hook (adds Change-Id to commit messages)' >&2
+              mkdir -p "$gitcommondir/hooks"
+              curl -s -Lo "$gitcommondir/hooks/commit-msg" https://gerrit.lix.systems/tools/hooks/commit-msg
+              chmod u+x "$gitcommondir/hooks/commit-msg"
+            fi
+            unset gitcommondir
+          '';
+        }
+      );
   };
 })

perl/Makefile

@@ -1,21 +0,0 @@
-makefiles = local.mk
-
-GLOBAL_CXXFLAGS += -g -Wall -std=c++2a
-
-# A convenience for concurrent development of Nix and its Perl bindings.
-# Not needed in a standalone build of the Perl bindings.
-ifneq ("$(wildcard ../src)", "")
-  GLOBAL_CXXFLAGS += -I ../src
-endif
-
--include Makefile.config
-
-OPTIMIZE = 1
-
-ifeq ($(OPTIMIZE), 1)
-  GLOBAL_CXXFLAGS += -O3
-else
-  GLOBAL_CXXFLAGS += -O0
-endif
-
-include mk/lib.mk

perl/Makefile.config.in

@@ -1,18 +0,0 @@
-HOST_OS = @host_os@
-CC = @CC@
-CFLAGS = @CFLAGS@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-SODIUM_LIBS = @SODIUM_LIBS@
-NIX_CFLAGS = @NIX_CFLAGS@
-NIX_LIBS = @NIX_LIBS@
-nixbindir = @nixbindir@
-curl = @curl@
-nixlibexecdir = @nixlibexecdir@
-nixlocalstatedir = @nixlocalstatedir@
-perl = @perl@
-perllibdir = @perllibdir@
-nixstoredir = @nixstoredir@
-nixsysconfdir = @nixsysconfdir@

perl/default.nix

@@ -4,8 +4,6 @@
   stdenv,
   perl,
   perlPackages,
-  autoconf-archive,
-  autoreconfHook,
   pkg-config,
   nix,
   curl,
@@ -16,7 +14,6 @@
   darwin,
   meson,
   ninja,
-  buildWithMeson ? false,
 }:
 
 perl.pkgs.toPerlModule (
@@ -25,36 +22,18 @@ perl.pkgs.toPerlModule (
 
     src = fileset.toSource {
       root = ../.;
-      fileset = fileset.unions (
-        [
-          ../.version
-          ./lib
-        ]
-        ++ lib.optionals (!buildWithMeson) [
-          # FIXME(Qyriad): What the hell is this?
-          # What is it used for and do we still need it?
-          ./MANIFEST
-          ../m4
-          ../mk
-          ./Makefile
-          ./Makefile.config.in
-          ./configure.ac
-          ./local.mk
-        ]
-        ++ lib.optionals buildWithMeson [ ./meson.build ]
-      );
+      fileset = fileset.unions ([
+        ../.version
+        ./lib
+        ./meson.build
+      ]);
     };
 
-    nativeBuildInputs =
-      [ pkg-config ]
-      ++ lib.optionals (!buildWithMeson) [
-        autoconf-archive
-        autoreconfHook
-      ]
-      ++ lib.optionals buildWithMeson [
-        meson
-        ninja
-      ];
+    nativeBuildInputs = [
+      pkg-config
+      meson
+      ninja
+    ];
 
     buildInputs =
       [

perl/local.mk

@@ -1,43 +0,0 @@
-nix_perl_sources := \
-  lib/Nix/Store.pm \
-  lib/Nix/Manifest.pm \
-  lib/Nix/SSH.pm \
-  lib/Nix/CopyClosure.pm \
-  lib/Nix/Config.pm.in \
-  lib/Nix/Utils.pm
-
-nix_perl_modules := $(nix_perl_sources:.in=)
-
-$(foreach x, $(nix_perl_modules), $(eval $(call install-data-in, $(x), $(perllibdir)/Nix)))
-
-lib/Nix/Store.cc: lib/Nix/Store.xs
-	$(trace-gen) xsubpp $^ -output $@
-
-libraries += Store
-
-Store_DIR := lib/Nix
-
-Store_SOURCES := $(Store_DIR)/Store.cc
-
-Store_CXXFLAGS = \
-  $(NIX_CFLAGS) \
-  -I$(shell perl -e 'use Config; print $$Config{archlibexp};')/CORE \
-  -D_FILE_OFFSET_BITS=64 \
-  -Wno-unknown-warning-option -Wno-unused-variable -Wno-literal-suffix \
-  -Wno-reserved-user-defined-literal -Wno-duplicate-decl-specifier -Wno-pointer-bool-conversion
-
-Store_LDFLAGS := $(SODIUM_LIBS) $(NIX_LIBS)
-
-ifdef HOST_CYGWIN
-  archlib = $(shell perl -E 'use Config; print $$Config{archlib};')
-  libperl = $(shell perl -E 'use Config; print $$Config{libperl};')
-  Store_LDFLAGS += $(shell find ${archlib} -name ${libperl})
-endif
-
-Store_ALLOW_UNDEFINED = 1
-
-Store_FORCE_INSTALL = 1
-
-Store_INSTALL_DIR = $(perllibdir)/auto/Nix/Store
-
-clean-files += lib/Nix/Config.pm lib/Nix/Store.cc Makefile.config

scripts/local.mk

@@ -1,13 +0,0 @@
-nix_noinst_scripts := \
-  $(d)/nix-profile.sh
-
-noinst-scripts += $(nix_noinst_scripts)
-
-profiledir = $(sysconfdir)/profile.d
-
-$(eval $(call install-file-as, $(d)/nix-profile.sh, $(profiledir)/nix.sh, 0644))
-$(eval $(call install-file-as, $(d)/nix-profile.fish, $(profiledir)/nix.fish, 0644))
-$(eval $(call install-file-as, $(d)/nix-profile-daemon.sh, $(profiledir)/nix-daemon.sh, 0644))
-$(eval $(call install-file-as, $(d)/nix-profile-daemon.fish, $(profiledir)/nix-daemon.fish, 0644))
-
-clean-files += $(nix_noinst_scripts)

src/libcmd/local.mk

@@ -1,17 +0,0 @@
-libraries += libcmd
-
-libcmd_NAME = libnixcmd
-
-libcmd_DIR := $(d)
-
-libcmd_SOURCES := $(wildcard $(d)/*.cc)
-
-libcmd_CXXFLAGS += -I src/libutil -I src/libstore -I src/libexpr -I src/libmain -I src/libfetchers
-
-libcmd_LDFLAGS = $(EDITLINE_LIBS) $(LOWDOWN_LIBS) $(NIXDOC_LIBS) -pthread
-
-libcmd_LIBS = libstore libutil libexpr libmain libfetchers
-
-$(eval $(call install-file-in, $(buildprefix)$(d)/nix-cmd.pc, $(libdir)/pkgconfig, 0644))
-
-$(d)/repl.cc: $(d)/repl-overlays.nix.gen.hh

src/libcmd/repl.cc

@@ -605,6 +605,14 @@ ProcessLineResult NixRepl::processLine(std::string line)
         Path drvPathRaw = state->store->printStorePath(drvPath);
 
         if (command == ":b" || command == ":bl") {
+            // TODO: this only shows a progress bar for explicitly initiated builds,
+            // not eval-time fetching or builds performed for IFD.
+            // But we can't just show it everywhere, since that would erase partial output from evaluation.
+            startProgressBar();
+            Finally stopLogger([&]() {
+                stopProgressBar();
+            });
+
             state->store->buildPaths({
                 DerivedPath::Built {
                     .drvPath = makeConstantStorePathRef(drvPath),