release: 2.90.0 "Vanilla Ice Cream"

Release produced with releng/create_release.xsh Change-Id: Ice53891cdeafff04bd6537be66e8cd6b7dd9678c
doc/release-notes: add date for major release
2024-07-10 08:40:42 -07:00 · 2024-07-10 15:35:00 +00:00 · 2024-07-10 15:32:19 +02:00 · 2024-06-16 19:06:45 -07:00
1240 changed files with 21404 additions and 33936 deletions
@@ -16,20 +16,3 @@ Checks:
  - -bugprone-unchecked-optional-access
    # many warnings, seems like a questionable lint
  - -bugprone-branch-clone
-    # all thrown exceptions must derive from std::exception
-  - hicpp-exception-baseclass
-    # capturing async lambdas are dangerous
-  - cppcoreguidelines-avoid-capturing-lambda-coroutines
-    # crimes must be appropriately declared as crimes
-  - cppcoreguidelines-pro-type-cstyle-cast
-  - lix-*
-    # This can not yet be applied to Lix itself since we need to do source
-    # reorganization so that lix/ include paths work.
-  - -lix-fixincludes
-    # This lint is included as an example, but the lib function it replaces is
-    # already gone.
-  - -lix-hasprefixsuffix
-
-
-CheckOptions:
-  bugprone-reserved-identifier.AllowedIdentifiers: '__asan_default_options'
@@ -29,7 +29,3 @@ trim_trailing_whitespace = false
 indent_style = space
 indent_size = 2
 max_line_length = 0
-
-[meson.build]
-indent_style = space
-indent_size = 2
@@ -1,5 +1,9 @@
 # shellcheck shell=bash
 source_env_if_exists .envrc.local
-# Use native-clangStdenvPackages to get clangd by default.
-use flake ".#${LIX_SHELL_VARIANT:-native-clangStdenvPackages}" "${LIX_SHELL_EXTRA_ARGS[@]}"
+# TODO: `use flake .#native-clangStdenvPackages` on macOS?
+use flake ".#${LIX_SHELL_VARIANT:-default}" "${LIX_SHELL_EXTRA_ARGS[@]}"
+export MAKEFLAGS="$MAKEFLAGS -e"
+if [[ -n "$NIX_BUILD_CORES" ]]; then
+    export MAKEFLAGS="$MAKEFLAGS -j $NIX_BUILD_CORES"
+fi
 export GTEST_BRIEF=1
@@ -2,7 +2,7 @@
 name: Missing or incorrect documentation
 about: Help us improve the reference manual
 title: ''
-labels: docs
+labels: documentation
 assignees: ''

 ---
@@ -19,10 +19,10 @@ assignees: ''

 <!-- make sure this issue is not redundant or obsolete -->

- [ ] checked [latest Lix manual] or its [source code]
+- [ ] checked [latest Lix manual] \([source]\)
 - [ ] checked [documentation issues] and [recent documentation changes] for possible duplicates

-[latest Lix manual]: https://docs.lix.systems/manual/lix/nightly
-[source code]: https://git.lix.systems/lix-project/lix/src/main/doc/manual/src
+[latest Nix manual]: https://docs.lix.systems/manual/lix/nightly
+[source]: https://git.lix.systems/lix-project/lix/src/main/doc/manual/src
 [documentation issues]: https://git.lix.systems/lix-project/lix/issues?labels=151&state=all
 [recent documentation changes]: https://gerrit.lix.systems/q/p:lix+path:%22%5Edoc/manual/.*%22
@@ -9,10 +9,6 @@ GTAGS
 # ccls
 /.ccls-cache

-# auto-generated compilation database
-compile_commands.json
-rust-project.json
-
 result
 result-*

@@ -33,9 +29,3 @@ buildtime.bin
 /.pre-commit-config.yaml
 /.nocontribmsg
 /release
-
-# Rust build files when using Cargo (not actually supported for building but it spews the files anyway)
-/target/
-
-# Python compiled files from the code generators and test suite
-*.pyc
@@ -1,2 +0,0 @@
-Fiona Behrens <me@kloenk.dev>
-Fiona Behrens <me@kloenk.dev> <me@kloenk.de>
@@ -1 +0,0 @@
-This is a file used by the dev shell shellHook in package.nix to check that this is actually a Lix repo before installing git hooks. Its contents have no meaning.
@@ -1,79 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "countme"
-version = "3.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"
-
-[[package]]
-name = "dissimilar"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59f8e79d1fbf76bdfbde321e902714bf6c49df88a7dda6fc682fc2979226962d"
-
-[[package]]
-name = "expect-test"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e0be0a561335815e06dab7c62e50353134c796e7a6155402a64bcff66b6a5e0"
-dependencies = [
- "dissimilar",
- "once_cell",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-
-[[package]]
-name = "lix-doc"
-version = "0.0.1"
-dependencies = [
- "expect-test",
- "rnix",
- "rowan",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-
-[[package]]
-name = "rnix"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb35cedbeb70e0ccabef2a31bcff0aebd114f19566086300b8f42c725fc2cb5f"
-dependencies = [
- "rowan",
-]
-
-[[package]]
-name = "rowan"
-version = "0.15.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a542b0253fa46e632d27a1dc5cf7b930de4df8659dc6e720b647fc72147ae3d"
-dependencies = [
- "countme",
- "hashbrown",
- "rustc-hash",
- "text-size",
-]
-
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
-[[package]]
-name = "text-size"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233"
@@ -1,6 +0,0 @@
-[workspace]
-resolver = "2"
-members = ["lix/lix-doc"]
-
-[workspace.package]
-edition = "2021"
@@ -26,4 +26,4 @@ See our [Hacking guide](https://git.lix.systems/lix-project/lix/src/branch/main/

 ## License

-Lix is released under [LGPL-2.1-or-later](./COPYING).
+Lix is released under the [LGPL v2.1](./COPYING).
@@ -1,5 +1,4 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p bash -p hyperfine
+#!/usr/bin/env bash

 set -euo pipefail
 shopt -s inherit_errexit
@@ -22,21 +21,16 @@ fi
 _exit=""
 trap "$_exit" EXIT

-flake_args=("--extra-experimental-features" "nix-command flakes")
-
 # XXX: yes this is very silly. flakes~!!
-nix build "${flake_args[@]}" --impure --expr '(builtins.getFlake "git+file:.").inputs.nixpkgs.outPath' -o bench/nixpkgs
+nix build --impure --expr '(builtins.getFlake "git+file:.").inputs.nixpkgs.outPath' -o bench/nixpkgs

-# We must ignore the global config, or else NIX_PATH won't work reliably.
-# See https://github.com/NixOS/nix/issues/9574
-export NIX_CONF_DIR='/var/empty'
 export NIX_REMOTE="$(mktemp -d)"
 _exit='rm -rfv "$NIX_REMOTE"; $_exit'
 export NIX_PATH="nixpkgs=bench/nixpkgs:nixos-config=bench/configuration.nix"

 builds=("$@")

-flake_args="${flake_args[*]@Q}"
+flake_args="--extra-experimental-features 'nix-command flakes'"

 hyperfineArgs=(
    --parameter-list BUILD "$(IFS=,; echo "${builds[*]}")"
@@ -0,0 +1,54 @@
+diff --git a/pthread_stop_world.c b/pthread_stop_world.c
+index 2b45489..0e6d8ef 100644
+--- a/pthread_stop_world.c
+++ b/pthread_stop_world.c
+@@ -776,6 +776,8 @@ STATIC void GC_restart_handler(int sig)
+ /* world is stopped.  Should not fail if it isn't.                      */
+ GC_INNER void GC_push_all_stacks(void)
+ {
+    size_t stack_limit;
+    pthread_attr_t pattr;
+     GC_bool found_me = FALSE;
+     size_t nthreads = 0;
+     int i;
+@@ -868,6 +870,40 @@ GC_INNER void GC_push_all_stacks(void)
+             hi = p->altstack + p->altstack_size;
+ #         endif
+           /* FIXME: Need to scan the normal stack too, but how ? */
+        } else {
+          #ifdef HAVE_PTHREAD_ATTR_GET_NP
+          if (pthread_attr_init(&pattr) != 0) {
+            ABORT("GC_push_all_stacks: pthread_attr_init failed!");
+          }
+          if (pthread_attr_get_np(p->id, &pattr) != 0) {
+            ABORT("GC_push_all_stacks: pthread_attr_get_np failed!");
+          }
+          #else
+          if (pthread_getattr_np(p->id, &pattr)) {
+            ABORT("GC_push_all_stacks: pthread_getattr_np failed!");
+          }
+          #endif
+          if (pthread_attr_getstacksize(&pattr, &stack_limit)) {
+            ABORT("GC_push_all_stacks: pthread_attr_getstacksize failed!");
+          }
+          if (pthread_attr_destroy(&pattr)) {
+            ABORT("GC_push_all_stacks: pthread_attr_destroy failed!");
+          }
+          // When a thread goes into a coroutine, we lose its original sp until
+          // control flow returns to the thread.
+          // While in the coroutine, the sp points outside the thread stack,
+          // so we can detect this and push the entire thread stack instead,
+          // as an approximation.
+          // We assume that the coroutine has similarly added its entire stack.
+          // This could be made accurate by cooperating with the application
+          // via new functions and/or callbacks.
+          #ifndef STACK_GROWS_UP
+            if (lo >= hi || lo < hi - stack_limit) { // sp outside stack
+              lo = hi - stack_limit;
+            }
+          #else
+          #error "STACK_GROWS_UP not supported in boost_coroutine2 (as of june 2021), so we don't support it in Nix."
+          #endif
+         }
+ #       ifdef STACKPTR_CORRECTOR_AVAILABLE
+           if (GC_sp_corrector != 0)
@@ -51,16 +51,14 @@ void FixIncludesCallbacks::InclusionDirective(
    return;

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

  const auto Bracketize = [IsAngled](StringRef s) {
    return IsAngled ? ("<" + s + ">").str() : ("\"" + s + "\"").str();
  };

  for (const auto &SourceDir : SourceDirs) {
-    // Ignore generated files, since they are often only used internally within
-    // a library anyhow and they are not in the normal source dir.
-    const bool IsAlreadyFixed = FileName.starts_with("lix/lib") || FileName.contains(".gen.") || FileName.ends_with(".md");
+    const bool IsAlreadyFixed = FileName.starts_with("lix/lib");
    if (File && File->getNameAsRequested().contains(SourceDir) &&
        !IsAlreadyFixed) {
      StringRef Name = File->getNameAsRequested();
@@ -2,7 +2,6 @@
 #include <clang-tidy/ClangTidyModuleRegistry.h>
 #include "FixIncludes.hh"
 #include "HasPrefixSuffix.hh"
-#include "CharPtrCast.hh"

 namespace nix::clang_tidy {
 using namespace clang;
@@ -13,7 +12,6 @@ class NixClangTidyChecks : public ClangTidyModule {
        void addCheckFactories(ClangTidyCheckFactories &CheckFactories) override {
            CheckFactories.registerCheck<HasPrefixSuffixCheck>("lix-hasprefixsuffix");
            CheckFactories.registerCheck<FixIncludesCheck>("lix-fixincludes");
-            CheckFactories.registerCheck<CharPtrCastCheck>("lix-charptrcast");
        }
 };

@@ -10,13 +10,13 @@ goal and is there as an example), `HasPrefixSuffixCheck`.
 One file:

 ```
-ninja -C build && clang-tidy --checks='-*,lix-*' --load=build/liblix-clang-tidy.so -p ../../build -header-filter '\.\./lix/.*\.h' --fix ../../lix/libcmd/installables.cc
+ninja -C build && clang-tidy --checks='-*,lix-*' --load=build/liblix-clang-tidy.so -p ../compile_commands.json -header-filter '\.\./src/.*\.h' --fix ../src/libcmd/installables.cc
 ```

 Several files, in parallel:

 ```
-ninja -C build && run-clang-tidy -checks='-*,lix-*' -load=build/liblix-clang-tidy.so -p ../../build -header-filter '\.\./lix/.*\.h' -fix ../../lix | tee -a clang-tidy-result
+ninja -C build && run-clang-tidy -checks='-*,lix-*' -load=build/liblix-clang-tidy.so -p .. -header-filter '\.\./src/.*\.h' -fix ../src | tee -a clang-tidy-result
 ```

 ## Resources
@@ -40,7 +40,7 @@ enable output     dump
 match callExpr(callee(functionDecl(hasName("hasPrefix"))), optionally(hasArgument( 0, cxxConstructExpr(hasDeclaration(functionDecl(hasParameter(0, parmVarDecl(hasType(asString("const char *"))).bind("meow2"))))))))
 ```

-Then run, e.g. `clang-query --preload hasprefix.query -p compile_commands.json lix/libcmd/installables.cc`.
+Then run, e.g. `clang-query --preload hasprefix.query -p compile_commands.json src/libcmd/installables.cc`.

 With this you can iterate a query before writing it in C++ and suffering from
 C++.
@@ -0,0 +1,13 @@
+project('lix-clang-tidy', ['cpp', 'c'],
+  version : '0.1',
+  default_options : ['warning_level=3', 'cpp_std=c++20'])
+
+llvm = dependency('Clang', version: '>= 14', modules: ['libclang'])
+sources = files(
+  'HasPrefixSuffix.cc',
+  'LixClangTidyChecks.cc',
+  'FixIncludes.cc',
+)
+
+shared_module('lix-clang-tidy', sources,
+  dependencies: llvm)
@@ -20,7 +20,7 @@ OUTPUT_DIRECTORY       = @docdir@
 # for a project that appears at the top of each page and should give viewer a
 # quick idea about the purpose of the project. Keep the description short.

-PROJECT_BRIEF          = "Lix: A modern, delicious implementation of the Nix package manager; unstable internal interfaces"
+PROJECT_BRIEF          = "Nix, the purely functional package manager; unstable internal interfaces"

 # If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
 # The default value is: YES.
@@ -33,7 +33,32 @@ GENERATE_LATEX         = NO
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.

-INPUT                  = @INPUT_PATHS@
+# FIXME Make this list more maintainable somehow. We could maybe generate this
+# in the Makefile, but we would need to change how `.in` files are preprocessed
+# so they can expand variables despite configure variables.
+
+INPUT                  = \
+  src/libcmd \
+  src/libexpr \
+  src/libexpr/flake \
+  tests/unit/libexpr \
+  tests/unit/libexpr/value \
+  tests/unit/libexpr/test \
+  tests/unit/libexpr/test/value \
+  src/libexpr/value \
+  src/libfetchers \
+  src/libmain \
+  src/libstore \
+  src/libstore/build \
+  src/libstore/builtins \
+  tests/unit/libstore \
+  tests/unit/libstore/test \
+  src/libutil \
+  tests/unit/libutil \
+  tests/unit/libutil/test \
+  src/nix \
+  src/nix-env \
+  src/nix-store

 # If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
 # in the source code. If set to NO, only conditional compilation will be
@@ -72,15 +97,3 @@ EXPAND_AS_DEFINED      = \
  DECLARE_WORKER_SERIALISER \
  DECLARE_SERVE_SERIALISER \
  LENGTH_PREFIXED_PROTO_HELPER
-
-# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
-# Stripping is only done if one of the specified strings matches the left-hand
-# part of the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the path to
-# strip.
-#
-# Note that you can specify absolute paths here, but also relative paths, which
-# will be relative from the directory where doxygen is started.
-# This tag requires that the tag FULL_PATH_NAMES is set to YES.
-
-STRIP_FROM_PATH        = "@PROJECT_SOURCE_ROOT@"
@@ -1,35 +1,3 @@
-internal_api_sources = [
-  'lix/libcmd',
-  'lix/libexpr',
-  'lix/libexpr/flake',
-  'tests/unit/libexpr',
-  'tests/unit/libexpr/value',
-  'tests/unit/libexpr/test',
-  'tests/unit/libexpr/test/value',
-  'lix/libexpr/value',
-  'lix/libfetchers',
-  'lix/libmain',
-  'lix/libstore',
-  'lix/libstore/build',
-  'lix/libstore/builtins',
-  'tests/unit/libstore',
-  'tests/unit/libstore/test',
-  'lix/libutil',
-  'tests/unit/libutil',
-  'tests/unit/libutil/test',
-  'lix/nix',
-  'lix/nix-env',
-  'lix/nix-store',
-]
-
-# We feed Doxygen absolute paths so it can be invoked from any working directory.
-internal_api_sources_absolute = []
-foreach src : internal_api_sources
-  internal_api_sources_absolute += '"' + (meson.project_source_root() / src) + '"'
-endforeach
-
-internal_api_sources_oneline = ' \\\n  '.join(internal_api_sources_absolute)
-
 doxygen_cfg = configure_file(
  input : 'doxygen.cfg.in',
  output : 'doxygen.cfg',
@@ -37,16 +5,22 @@ doxygen_cfg = configure_file(
    'PACKAGE_VERSION': meson.project_version(),
    'RAPIDCHECK_HEADERS': rapidcheck_meson.get_variable('includedir'),
    'docdir' : meson.current_build_dir(),
-    'INPUT_PATHS' : internal_api_sources_oneline,
-    'PROJECT_SOURCE_ROOT' : meson.project_source_root(),
  },
 )

 internal_api_docs = custom_target(
  'internal-api-docs',
  command : [
-    doxygen.full_path(),
-    '@INPUT0@',
+    bash,
+    # Meson can you please just give us a `workdir` argument to custom targets...
+    '-c',
+    # We have to prefix the doxygen_cfg path with the project build root
+    # because of the cd in front.
+    'cd @0@ && @1@ @2@/@INPUT0@'.format(
+      meson.project_source_root(),
+      doxygen.full_path(),
+      meson.project_build_root(),
+    ),
  ],
  input : [
    doxygen_cfg,
@@ -3,10 +3,6 @@
 #
 # It's used for crediting people accurately in release notes. The release notes
 # script will link to forgejo, then to GitHub if forgejo is not present.
-#
-# When adding someone from outside the Lix project, you generally want to simply link their GitHub profile without adding a display name unless they are well-known in the community by that display name.
-#
-# See doc/manual/src/contributing/hacking.md for more documentation on this file's format and typical usage.
 9999years:
  display_name: wiggles
  forgejo: rbt
@@ -44,11 +40,6 @@ cole-h:
  display_name: Cole Helbling
  github: cole-h

-delan:
-  display_name: delan
-  forgejo: delan
-  github: delan
-
 edolstra:
  display_name: Eelco Dolstra
  github: edolstra
@@ -57,11 +48,6 @@ ericson:
  display_name: John Ericson
  github: ericson2314

-goldstein:
-  display_name: goldstein
-  forgejo: goldstein
-  github: GoldsteinE
-
 horrors:
  display_name: eldritch horrors
  forgejo: pennae
@@ -70,33 +56,10 @@ horrors:
 iFreilicht:
  github: iFreilicht

-isabelroses:
-  forgejo: isabelroses
-  github: isabelroses
-
 jade:
  forgejo: jade
  github: lf-

-kiara:
-  github: KiaraGrouwstra
-
-kjeremy:
-  github: kjeremy
-
-kloenk:
-  display_name: Fiona Behrens
-  forgejo: kloenk
-  github: kloenk
-
-lheckemann:
-  forgejo: lheckemann
-  github: lheckemann
-
-lilyball:
-  forgejo: lilyball
-  github: lilyball
-
 lovesegfault:
  github: lovesegfault

@@ -115,20 +78,11 @@ midnightveil:
 ncfavier:
  github: ncfavier

-piegames:
-  display_name: piegames
-  forgejo: piegames
-  github: piegamesde
-
 puck:
  display_name: puck
  forgejo: puck
  github: puckipedia

-quantumjump:
-  display_name: Quantum Jump
-  github: QuantumBJump
-
 r-vdp:
  github: r-vdp

@@ -153,17 +107,9 @@ valentin:
  display_name: Valentin Gagarin
  github: fricklerhandwerk

-vigress8:
-  display_name: Vigress
-  forgejo: vigress8
-  github: vigress8
-
 winter:
  forgejo: winter
  github: winterqt

 yshui:
  github: yshui
-
-zimbatm:
-  github: zimbatm
@@ -0,0 +1,37 @@
+let
+  inherit (builtins) concatStringsSep attrValues mapAttrs;
+  inherit (import ./utils.nix) optionalString squash;
+in
+
+builtinsInfo:
+let
+  showBuiltin =
+    name:
+    {
+      doc,
+      type,
+      impure-only,
+    }:
+    let
+      type' = optionalString (type != null) " (${type})";
+
+      impureNotice = optionalString impure-only ''
+        > **Note**
+        >
+        > Not available in [pure evaluation mode](@docroot@/command-ref/conf-file.md#conf-pure-eval).
+      '';
+    in
+    squash ''
+      <dt id="builtins-${name}">
+        <a href="#builtins-${name}"><code>${name}</code></a>${type'}
+      </dt>
+      <dd>
+
+      ${doc}
+
+      ${impureNotice}
+
+      </dd>
+    '';
+in
+concatStringsSep "\n" (attrValues (mapAttrs showBuiltin builtinsInfo))
@@ -0,0 +1,35 @@
+let
+  inherit (builtins) concatStringsSep attrValues mapAttrs;
+  inherit (import ./utils.nix) optionalString squash;
+in
+
+builtinsInfo:
+let
+  showBuiltin =
+    name:
+    {
+      doc,
+      args,
+      arity,
+      experimental-feature,
+    }:
+    let
+      experimentalNotice = optionalString (experimental-feature != null) ''
+        This function is only available if the [${experimental-feature}](@docroot@/contributing/experimental-features.md#xp-feature-${experimental-feature}) experimental feature is enabled.
+      '';
+    in
+    squash ''
+      <dt id="builtins-${name}">
+        <a href="#builtins-${name}"><code>${name} ${listArgs args}</code></a>
+      </dt>
+      <dd>
+
+      ${doc}
+
+      ${experimentalNotice}
+
+      </dd>
+    '';
+  listArgs = args: concatStringsSep " " (map (s: "<var>${s}</var>") args);
+in
+concatStringsSep "\n" (attrValues (mapAttrs showBuiltin builtinsInfo))
@@ -1,134 +1,26 @@
-with builtins;
-
 let
-  splitLines = s: filter (x: !isList x) (split "\n" s);
-
-  concatStrings = concatStringsSep "";
-
-  replaceStringsRec =
-    from: to: string:
-    # recursively replace occurrences of `from` with `to` within `string`
-    # example:
-    #     replaceStringRec "--" "-" "hello-----world"
-    #     => "hello-world"
-    let
-      replaced = replaceStrings [ from ] [ to ] string;
-    in
-    if replaced == string then string else replaceStringsRec from to replaced;
-
-  squash = replaceStringsRec "\n\n\n" "\n\n";
-
-  trim =
-    string:
-    # trim trailing spaces and squash non-leading spaces
-    let
-      trimLine =
-        line:
-        let
-          # separate leading spaces from the rest
-          parts = split "(^ *)" line;
-          spaces = head (elemAt parts 1);
-          rest = elemAt parts 2;
-          # drop trailing spaces
-          body = head (split " *$" rest);
-        in
-        spaces + replaceStringsRec "  " " " body;
-    in
-    concatStringsSep "\n" (map trimLine (splitLines string));
-
-  # FIXME: O(n^2)
-  unique = foldl' (acc: e: if elem e acc then acc else acc ++ [ e ]) [ ];
-
-  nameValuePair = name: value: { inherit name value; };
-
-  filterAttrs =
-    pred: set:
-    listToAttrs (
-      concatMap (
-        name:
-        let
-          v = set.${name};
-        in
-        if pred name v then [ (nameValuePair name v) ] else [ ]
-      ) (attrNames set)
-    );
-
-  optionalString = cond: string: if cond then string else "";
-
-  showSetting =
-    { inlineHTML }:
-    name:
-    {
-      description,
-      documentDefault,
-      defaultValue,
-      aliases,
-      value,
-      experimentalFeature,
-    }:
-    let
-      result = squash ''
-        - ${
-          if inlineHTML then ''<span id="conf-${name}">[`${name}`](#conf-${name})</span>'' else ''`${name}`''
-        }
-
-        ${indent "  " body}
-      '';
-
-      experimentalFeatureNote = optionalString (experimentalFeature != null) ''
-        > **Warning**
-        > This setting is part of an
-        > [experimental feature](@docroot@/contributing/experimental-features.md).
-
-        To change this setting, you need to make sure the corresponding experimental feature,
-        [`${experimentalFeature}`](@docroot@/contributing/experimental-features.md#xp-feature-${experimentalFeature}),
-        is enabled.
-        For example, include the following in [`nix.conf`](#):
-
-        ```
-        extra-experimental-features = ${experimentalFeature}
-        ${name} = ...
-        ```
-      '';
-
-      # separate body to cleanly handle indentation
-      body = ''
-        ${description}
-
-        ${experimentalFeatureNote}
-
-        **Default:** ${showDefault documentDefault defaultValue}
-
-        ${showAliases aliases}
-      '';
-
-      showDefault =
-        documentDefault: defaultValue:
-        if documentDefault then
-          # a StringMap value type is specified as a string, but
-          # this shows the value type. The empty stringmap is `null` in
-          # JSON, but that converts to `{ }` here.
-          if defaultValue == "" || defaultValue == [ ] || isAttrs defaultValue then
-            "*empty*"
-          else if isBool defaultValue then
-            if defaultValue then "`true`" else "`false`"
-          else
-            "`${toString defaultValue}`"
-        else
-          "*machine-specific*";
-
-      showAliases =
-        aliases:
-        optionalString (aliases != [ ])
-          "**Deprecated alias:** ${(concatStringsSep ", " (map (s: "`${s}`") aliases))}";
-    in
-    result;
-
-  indent =
-    prefix: s: concatStringsSep "\n" (map (x: if x == "" then x else "${prefix}${x}") (splitLines s));
-
-  showSettings =
-    args: settingsInfo: concatStrings (attrValues (mapAttrs (showSetting args) settingsInfo));
+  inherit (builtins)
+    attrNames
+    attrValues
+    fromJSON
+    listToAttrs
+    mapAttrs
+    concatStringsSep
+    concatMap
+    length
+    lessThan
+    replaceStrings
+    sort
+    ;
+  inherit (import ./utils.nix)
+    concatStrings
+    optionalString
+    filterAttrs
+    trim
+    squash
+    unique
+    showSettings
+    ;
 in

 inlineHTML: commandDump:
@@ -0,0 +1,9 @@
+with builtins;
+with import ./utils.nix;
+
+let
+  showExperimentalFeature = name: doc: ''
+    - [`${name}`](@docroot@/contributing/experimental-features.md#xp-feature-${name})
+  '';
+in
+xps: indent "  " (concatStrings (attrValues (mapAttrs showExperimentalFeature xps)))
@@ -0,0 +1,13 @@
+with builtins;
+with import ./utils.nix;
+
+let
+  showExperimentalFeature =
+    name: doc:
+    squash ''
+      ## [`${name}`]{#xp-feature-${name}}
+
+      ${doc}
+    '';
+in
+xps: (concatStringsSep "\n" (attrValues (mapAttrs showExperimentalFeature xps)))
@@ -15,21 +15,67 @@ nix_eval_for_docs_common = nix_for_docs + [
 ]
 nix_eval_for_docs = nix_eval_for_docs_common + '--raw'

+conf_file_json = custom_target(
+  command : nix_for_docs + [ 'show-config', '--json' ],
+  capture : true,
+  output : 'conf-file.json',
+  env : nix_env_for_docs,
+)
+
+nix_conf_file_md_body = custom_target(
+  command : nix_eval_for_docs + [
+    '--expr',
+    '(import @INPUT0@).showSettings { inlineHTML = true; } (builtins.fromJSON (builtins.readFile @INPUT1@))',
+  ],
+  capture : true,
+  input : [
+    'utils.nix',
+    conf_file_json,
+  ],
+  output : 'conf-file.md.body',
+  env : nix_env_for_docs,
+)
+
+nix_conf_file_md = custom_target(
+  command : [ 'cat', '@INPUT@' ],
+  capture : true,
+  input : [
+    'src/command-ref/conf-file.md',
+    nix_conf_file_md_body,
+  ],
+  output : 'conf-file.md',
+)
+
+nix_exp_features_json = custom_target(
+  command : [ nix, '__dump-xp-features' ],
+  capture : true,
+  output : 'xp-features.json',
+)
+
+language_json = custom_target(
+  command: [nix, '__dump-language'],
+  output : 'language.json',
+  capture : true,
+  env : nix_env_for_docs,
+)
+
 nix3_cli_json = custom_target(
  command : [ nix, '__dump-cli' ],
  capture : true,
  output : 'nix.json',
  env : nix_env_for_docs,
-  # FIXME: put the actual lib targets in here? meson have introspection challenge 2024 though.
-  build_always_stale : true,
 )

 generate_manual_deps = files(
  'generate-deps.py',
 )

-# Generates new-cli pages  and conf-file.md.
+# Generates builtins.md and builtin-constants.md.
+subdir('src/language')
+# Generates new-cli pages, experimental-features-shortlist.md, and conf-file.md.
 subdir('src/command-ref')
+# Generates experimental-feature-descriptions.md.
+subdir('src/contributing')
 # Generates rl-next-generated.md.
 subdir('src/release-notes')

@@ -60,31 +106,29 @@ manual = custom_target(
    nix3_cli_files,
    experimental_features_shortlist_md,
    experimental_feature_descriptions_md,
-    deprecated_features_shortlist_md,
-    deprecated_feature_descriptions_md,
    conf_file_md,
    builtins_md,
    builtin_constants_md,
    rl_next_generated,
-    nix,
  ],
  output : [
    'manual',
    'markdown',
  ],
-  install : true,
-  install_dir : [
-    datadir / 'doc/nix',
-    false,
-  ],
  depfile : 'manual.d',
  env : {
    'RUST_LOG': 'info',
    'MDBOOK_SUBSTITUTE_SEARCH': meson.current_build_dir() / 'src',
  },
 )
+manual_html = manual[0]
 manual_md = manual[1]

+install_subdir(
+  manual_html.full_path(),
+  install_dir : datadir / 'doc/nix',
+)
+
 nix_nested_manpages = [
  [ 'nix-env',
    [
@@ -142,7 +186,6 @@ foreach command : nix_nested_manpages
      ],
      input : [
        manual_md,
-        nix,
      ],
      output : command[0] + '-' + page + '.1',
      install : true,
@@ -255,7 +298,6 @@ foreach page : nix3_manpages
    input : [
      'render-manpage.sh',
      manual_md,
-      nix,
    ],
    output : page + '.1',
    install : true,
@@ -299,7 +341,6 @@ foreach entry : nix_manpages
      'render-manpage.sh',
      manual_md,
      entry.get(3, []),
-      nix,
    ],
    output : '@0@.@1@'.format(entry[0], entry[1]),
    install : true,
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh

 set -euo pipefail

@@ -345,7 +345,7 @@ const redirects = {
    "linux": "uninstall.html#linux",
    "macos": "uninstall.html#macos",
    "uninstalling": "uninstall.html",
-  },
+  }
  "contributing/hacking.html": {
    "nix-with-flakes": "#building-nix-with-flakes",
    "classic-nix": "#building-nix",
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh

 set -euo pipefail

@@ -1,21 +0,0 @@
---
-synopsis: "Build failures caused by `allowSubstitutes = false` while being the wrong system now produce a decent error"
-issues: [fj#484]
-cls: [1841]
-category: Fixes
-credits: jade
---
-
-Nix allows derivations to set `allowSubstitutes = false` in order to force them to be built locally without querying substituters for them.
-This is useful for derivations that are very fast to build (especially if they produce large output).
-However, this can shoot you in the foot if the derivation *has* to be substituted such as if the derivation is for another architecture, which is what `--always-allow-substitutes` is for.
-
-Perhaps such derivations that are known to be impossible to build locally should ignore `allowSubstitutes` (irrespective of remote builders) in the future, but this at least reports the failure and solution directly.
-
-```
-$ nix build -f fail.nix
-error: a 'unicornsandrainbows-linux' with features {} is required to build '/nix/store/...-meow.drv', but I am a 'x86_64-linux' with features {...}
-
-       Hint: the failing derivation has allowSubstitutes set to false, forcing it to be built rather than substituted.
-       Passing --always-allow-substitutes to force substitution may resolve this failure if the path is available in a substituter.
-```
@@ -1,10 +0,0 @@
---
-synopsis: "`Alt+Left` and `Alt+Right` go back/forwards by words in `nix repl`"
-issues: [fj#501]
-cls: [1883]
-category: Fixes
-credits: 9999years
---
-
-`nix repl` now recognizes `Alt+Left` and `Alt+Right` for navigating by words
-when entering input in `nix repl` on more terminals/platforms.
@@ -1,15 +0,0 @@
---
-synopsis: "Drop support for `xz` and `bzip2` Content-Encoding"
-category: Miscellany
-cls: [2134]
-credits: horrors
---
-
-Lix no longer supports the non-standard HTTP Content-Encoding values `xz` and `bzip2`.
-We do not expect this to cause any problems in practice since these encodings *aren't*
-standard, and any server delivering them anyway without being asked to is already well
-and truly set on the path of causing inexplicable client breakages.
-
-Lix's ability to decompress files compressed with `xz` or `bzip2` is unaffected. We're
-only bringing Lix more in line with the HTTP standard; all post-transfer data handling
-remains as it was before.
@@ -1,13 +0,0 @@
---
-synopsis: Ctrl-C stops Nix commands much more reliably and responsively
-issues: [7245, fj#393]
-cls: [2016]
-prs: [11618]
-category: Fixes
-credits: [roberth, 9999years]
---
-
-CTRL-C will now stop Nix commands much more reliably and responsively. While
-there are still some cases where a Nix command can be slow or unresponsive
-following a `SIGINT` (please report these as issues!), the vast majority of
-signals will now cause the Nix command to quit quickly and consistently.
@@ -1,18 +0,0 @@
---
-synopsis: Deprecated language features
-issues: [fj#437, 861]
-cls: [1785, 1736, 1735, 1744, 2206]
-category: Breaking Changes
-credits: [piegames, horrors]
---
-
-A system for deprecation (and then the planned removal) of undesired language features has been put into place.
-It is controlled via feature flags much like experimental features, except that the deprecations are enabled default,
-and can be disabled via the flags for backwards compatibility (opt-out with `--extra-deprecated-features` or the Nix configuration file).
-
- `url-literals`: **URL literals** have long been obsolete and discouraged of use, and now they are officially deprecated.
-  This means that all URLs must be properly put within quotes like all other strings.
- `rec-set-overrides`: **__overrides** is an old arcane syntax which has not been in use for more than a decade.
-  It is soft-deprecated with a warning only, with the plan to turn that into an error in a future release.
- `ancient-let`: **The old `let` syntax** (`let { body = …; … }`) is soft-deprecated with a warning as well. Use the regular `let … in` instead.
- `shadow-internal-symbols`: Arithmetic expressions like `5 - 3` internally expand to `__sub 5 3`, where `__sub` maps to a subtraction builtin. Shadowing such a symbols would affect the evaluation of such operations, but in a very inconsistent way, and is therefore deprecated now. **Affected symbols are:** `__sub`, `__mul`, `__div`, `__lessThan`, `__findFile` and `__nixPath`. Note that these symbols may still be used as variable names as long as they do not shadow internal operations, so e.g. `let __sub = x: y: x + y; in __sub 3 5` remains valid code.
@@ -1,10 +0,0 @@
---
-synopsis: "transfers no longer allow arbitrary url schemas"
-category: Breaking Changes
-cls: [2106]
-credits: horrors
---
-
-Lix no longer allows transfers using arbitrary url schemas. Only `http://`, `https://`, `ftp://`, `ftps://`, and `file://` urls are supported going forward. This affects `builtins.fetchurl`, `<nix/fetchurl.nix>`, transfers to and from binary caches, and all other uses of the internal file transfer code. Flake inputs using multi-protocol schemas (e.g. `git+ssh`) are not affected as those use external utilities to transfer data.
-
-The `s3://` scheme is not affected at all by this change and continues to work if S3 support is built into Lix.
@@ -1,23 +0,0 @@
---
-synopsis: restore backwards-compatibility of `builtins.fetchGit` with Nix 2.3
-issues: [5291, 5128]
-credits: [ma27]
-category: Fixes
---
-
-Compatibility with `builtins.fetchGit` from Nix 2.3 has been restored as follows:
-
-* Until now, each `ref` was prefixed with `refs/heads` unless it starts with `refs/` itself.
-
-  Now, this is not done if the `ref` looks like a commit hash.
-
-* Specifying `builtins.fetchGit { ref = "a-tag"; /* … */ }` was broken because `refs/heads` was appended.
-
-  Now, the fetcher doesn't turn a ref into `refs/heads/ref`, but into `refs/*/ref`. That way,
-  the value in `ref` can be either a tag or a branch.
-
-* The ref resolution happens the same way as in git:
-
-  * If `refs/ref` exists, it's used.
-  * If a tag `refs/tags/ref` exists, it's used.
-  * If a branch `refs/heads/ref` exists, it's used.
@@ -1,10 +0,0 @@
---
-synopsis: HTTP proxy environment variables are now respected for S3 binary cache stores
-issues: [fj#433]
-cls: [1788]
-category: Fixes
-credits: jade
---
-
-Due to "legacy reasons" (according to the AWS C++ SDK docs), the AWS SDK ignores system proxy configuration by default.
-We turned it back on.
@@ -1,20 +0,0 @@
---
-synopsis: "Includes are now qualified with library name"
-category: Development
-cls: [2178]
-credits: jade
---
-
-The Lix includes have all been rearranged to be of the form `"lix/libexpr/foo.hh"` instead of `"foo.hh"`.
-This was already supported externally for a migration period, but it is now being applied to all the internal usages within Lix itself.
-The goal of this change is to both clarify where a file is from and to avoid polluting global include paths with things like `config.h` that might conflict with other projects.
-
-For other details, see the release notes of Lix 2.90.0, under "Rename all the libraries" in Breaking Changes.
-
-To fix an external project with sources in `src` which has a separate build directory (such that headers are in `../src` relative to where the compiler is running):
-
-```
-lix_root=$HOME/lix
-(cd $lix_root && nix develop -c 'meson setup build && ninja -C build subprojects/lix-clang-tidy/liblix-clang-tidy.so')
-run-clang-tidy -checks='-*,lix-fixincludes' -load=$lix_root/build/subprojects/lix-clang-tidy/liblix-clang-tidy.so -p build/ -header-filter '\.\./src/.*\.h' -fix src
-```
@@ -1,13 +0,0 @@
---
-synopsis: "Improvements to interactive flake config"
-cls: [2066]
-category: Improvements
-credits: ma27
---
-
-If `accept-flake-config` is set to `ask` and a `flake.nix` defines `nixConfig`,
-Lix will ask on the CLI which of these settings should be used for the command.
-
-Now, it's possible to answer with `N` (as opposed to `n` to only reject the setting
-that is asked for) to reject _all untrusted_ entries from the flake's `nixConf`
-section.
@@ -1,13 +0,0 @@
---
-synopsis: Fix potential store corruption with auto-optimise-store
-issues: [7273]
-cls: [2100]
-category: Fixes
-credits: lilyball
---
-
-Optimising store paths (and other operations involving temporary files) no longer use `random(3)`
-to generate filenames. On darwin systems this was observed to potentially cause store corruption
-when using [`auto-optimise-store`](@docroot@/command-ref/conf-file.md#conf-auto-optimise-store),
-though this corruption was possible on any system whose `random(3)` does not have locking around
-the global state.
@@ -1,13 +0,0 @@
---
-synopsis: Change `nix-build -o ""` to behave like `--no-out-link`
-cls: [2103]
-category: Fixes
-credits: lilyball
---
-
-[`nix-build`](@docroot@/command-ref/nix-build.md)now treats <code>[--out-link](@docroot@/command-ref/nix-build.md#opt-out-link) ''</code>
-the same as [`--no-out-link`](@docroot@/command-ref/nix-build.md#opt-no-out-link). This matches
-[`nix build`](@docroot@/command-ref/new-cli/nix3-build.md) behavior. Previously when building the default output it
-would have resulted in throwing an error saying the current working directory already exists, and when building any
-other output it would have resulted in a symlink starting with a hyphen such as `-doc`, which is a footgun for
-terminal commands.
@@ -1,38 +0,0 @@
---
-synopsis: Removing the `.` default argument passed to the `nix fmt` formatter
-issues: []
-prs: [11438]
-cls: [1902]
-category: Breaking Changes
-credits: zimbatm
---
-
-The underlying formatter no longer receives the ". " default argument when `nix fmt` is called with no arguments.
-
-This change was necessary as the formatter wasn't able to distinguish between
-a user wanting to format the current folder with `nix fmt .` or the generic
-`nix fmt`.
-
-The default behaviour is now the responsibility of the formatter itself, and
-allows tools such as treefmt to format the whole tree instead of only the
-current directory and below.
-
-This may cause issues with some formatters: nixfmt, nixpkgs-fmt and alejandra currently format stdin when no arguments are passed.
-
-Here is a small wrapper example that will restore the previous behaviour for such a formatter:
-
-```nix
-{
-  outputs = { self, nixpkgs, systems }:
-    let
-      eachSystem = nixpkgs.lib.genAttrs (import systems) (system: nixpkgs.legacyPackages.${system});
-    in
-    {
-      formatter = eachSystem (pkgs:
-        pkgs.writeShellScriptBin "formatter" ''
-          if [[ $# = 0 ]]; set -- .; fi
-          exec "${pkgs.nixfmt-rfc-style}/bin/nixfmt "$@"
-        '');
-    };
-}
-```
@@ -1,10 +0,0 @@
---
-synopsis: "The beginnings of a new pytest-based functional test suite"
-category: Development
-cls: [2036, 2037]
-credits: jade
---
-
-The existing integration/functional test suite is based on a large volume of shell scripts.
-This often makes it somewhat challenging to debug at the best of times.
-The goal of the pytest test suite is to make tests have more obvious dependencies on files and to make tests more concise and easier to write, as well as making new testing methods like snapshot testing easy.
@@ -1,17 +0,0 @@
---
-synopsis: readline support removed
-cls: [1885]
-category: Packaging
-credits: [9999years]
---
-
-Support for building Lix with [`readline`][readline] instead of
-[`editline`][editline] has been removed. `readline` support hasn't worked for a
-long time (attempting to use it would lead to build errors) and would make Lix
-subject to the GPL if it did work. In the future, we're hoping to replace
-`editline` with [`rustyline`][rustyline] for improved ergonomics in the `nix
-repl`.
-
-[readline]: https://en.wikipedia.org/wiki/GNU_Readline
-[editline]: https://github.com/troglobit/editline
-[rustyline]: https://github.com/kkawakam/rustyline
@@ -1,30 +0,0 @@
---
-synopsis: Relative and tilde paths in configuration
-issues: [fj#482]
-cls: [1851, 1863, 1864]
-category: Features
-credits: [9999years]
---
-
-[Configuration settings](@docroot@/command-ref/conf-file.md) can now refer to
-files with paths relative to the file they're written in or relative to your
-home directory (with `~/`).
-
-This makes settings like
-[`repl-overlays`](@docroot@/command-ref/conf-file.md#conf-repl-overlays) and
-[`secret-key-files`](@docroot@/command-ref/conf-file.md#conf-repl-overlays)
-much easier to set, especially if you'd like to refer to files in an existing
-dotfiles repo cloned into your home directory.
-
-If you put `repl-overlays = repl.nix` in your `~/.config/nix/nix.conf`, it'll
-load `~/.config/nix/repl.nix`. Similarly, you can set `repl-overlays =
-~/.dotfiles/repl.nix` to load a file relative to your home directory.
-
-Configuration files can also
-[`include`](@docroot@/command-ref/conf-file.md#file-format) paths relative to
-your home directory.
-
-Only user configuration files (like `$XDG_CONFIG_HOME/nix/nix.conf` or the
-files listed in `$NIX_USER_CONF_FILES`) can use tilde paths relative to your
-home directory. Configuration listed in the `$NIX_CONFIG` environment variable
-may not use relative paths.
@@ -1,8 +0,0 @@
---
-synopsis: "Dependency on monolithic coreutils removed"
-category: Development
-cls: [2108]
-credits: vigress8
---
-
-Previously, the build erroneously depended on a `coreutils` binary, which requires `coreutils` to be built with a specific configuration. This was only used in one test and was not required to be a single binary. This dependency is removed now.
@@ -1,22 +0,0 @@
---
-synopsis: "Reproducibility check builds now report all differing outputs"
-cls: [2069]
-category: Improvements
-credits: [lheckemann]
---
-
-`nix-build --check` allows rerunning the build of an already-built derivation to check that it produces the same output again.
-
-If a multiple-output derivation with impure behaviour is built with `--check`, only the first output would be shown in the resulting error message (and kept for comparison):
-
-```
-error: derivation '/nix/store/4spy3nz1661zm15gkybsy1h5f36aliwx-python3.11-test-1.0.0.drv' may not be deterministic: output '/nix/store/ccqcp01zg18wp9iadzmzimqzdi3ll08d-python3.11-test
-1.0.0-dist' differs from '/nix/store/ccqcp01zg18wp9iadzmzimqzdi3ll08d-python3.11-test-1.0.0-dist.check'
-```
-
-Now, all differing outputs are kept and reported:
-```
-error: derivation '4spy3nz1661zm15gkybsy1h5f36aliwx-python3.11-test-1.0.0.drv' may not be deterministic: outputs differ
-         output differs: output '/nix/store/ccqcp01zg18wp9iadzmzimqzdi3ll08d-python3.11-test-1.0.0-dist' differs from '/nix/store/ccqcp01zg18wp9iadzmzimqzdi3ll08d-python3.11-test-1.0.0-dist.check'
-         output differs: output '/nix/store/yl59v08356i841c560alb0zmk7q16klb-python3.11-test-1.0.0' differs from '/nix/store/yl59v08356i841c560alb0zmk7q16klb-python3.11-test-1.0.0.check'
-```
@@ -1,12 +0,0 @@
---
-synopsis: Ignore broken `/etc/ssl/certs/ca-certificates.crt` symlink
-issues: [fj#560]
-cls: [2144]
-category: Fixes
-credits: lilyball
---
-
-[`ssl-cert-file`](@docroot@/command-ref/conf-file.md#conf-ssl-cert-file) now checks its default
-value for a broken symlink before using it. This fixes a problem on macOS where uninstalling
-nix-darwin may leave behind a broken symlink at `/etc/ssl/certs/ca-certificates.crt` that was
-stopping Lix from using the cert at `/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt`.
@@ -1,26 +0,0 @@
---
-synopsis: "Some Lix crashes now produce reporting instructions and a stack trace, then abort"
-cls: [1854]
-category: Improvements
-credits: jade
---
-
-Lix, being a C++ program, can crash in a few kinds of ways.
-It can obviously do a memory access violation, which will generate a core dump and thus be relatively debuggable.
-But, worse, it could throw an unhandled exception, and, in the past, we would just show the message but not where it comes from, in spite of this always being a bug, since we expect all such errors to be translated to a Lix specific error.
-Now the latter kind of bug should print reporting instructions, a rudimentary stack trace and (depending on system configuration) generate a core dump.
-
-Sample output:
-
-```
-Lix crashed. This is a bug. We would appreciate if you report it along with what caused it at https://git.lix.systems/lix-project/lix/issues with the following information included:
-
-Exception: std::runtime_error: test exception
-Stack trace:
- 0# nix::printStackTrace() in /home/jade/lix/lix3/build/lix/nix/../libutil/liblixutil.so
- 1# 0x000073C9862331F2 in /home/jade/lix/lix3/build/lix/nix/../libmain/liblixmain.so
- 2# 0x000073C985F2E21A in /nix/store/p44qan69linp3ii0xrviypsw2j4qdcp2-gcc-13.2.0-lib/lib/libstdc++.so.6
- 3# 0x000073C985F2E285 in /nix/store/p44qan69linp3ii0xrviypsw2j4qdcp2-gcc-13.2.0-lib/lib/libstdc++.so.6
- 4# nix::handleExceptions(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::function<void ()>) in /home/jade/lix/lix3/build/lix/nix/../libmain/liblixmain.so
- ...
-```
@@ -1,15 +0,0 @@
---
-synopsis: Add a `temp-dir` setting to set the temporary directory location
-issues: [7731, 8995, fj#112, fj#253]
-cls: [2103]
-category: Improvements
-credits: lilyball
---
-
-[`temp-dir`](@docroot@/command-ref/conf-file.md#conf-temp-dir) can now be set in the Nix
-configuration to change the temporary directory. This can be used to relocate all temporary files
-to another filesystem without affecting the `TMPDIR` env var inherited by interactive
-`nix-shell`/`nix shell` shells or `nix run` commands.
-
-Also on macOS, the `TMPDIR` env var is no longer unset for interactive shells when pointing
-to a per-session `/var/folders/` directory.
@@ -1,17 +0,0 @@
---
-synopsis: All Lix threads are named
-cls: [2210]
-category: Development
-credits: [jade]
---
-
-Lix now sets thread names on all of its secondary threads, which will make debugger usage slightly nicer and easier.
-
-```
-(gdb) info thr
-  Id   Target Id                    Frame
-* 1    LWP 3719283 "nix-daemon"     0x00007e558587da0f in accept ()
-   from target:/nix/store/c10zhkbp6jmyh0xc5kd123ga8yy2p4hk-glibc-2.39-52/lib/libc.so.6
-  2    LWP 3719284 "signal handler" 0x00007e55857b2bea in sigtimedwait ()
-   from target:/nix/store/c10zhkbp6jmyh0xc5kd123ga8yy2p4hk-glibc-2.39-52/lib/libc.so.6
-```
@@ -1,10 +0,0 @@
---
-synopsis: "`<nix/fetchurl.nix>` now uses TLS verification"
-category: Fixes
-prs: [11585]
-credits: edolstra
---
-
-Previously `<nix/fetchurl.nix>` did not do TLS verification. This was because the Nix sandbox in the past did not have access to TLS certificates, and Nix checks the hash of the fetched file anyway. However, this can expose authentication data from `netrc` and URLs to man-in-the-middle attackers. In addition, Nix now in some cases (such as when using impure derivations) does *not* check the hash. Therefore we have now enabled TLS verification. This means that downloads by `<nix/fetchurl.nix>` will now fail if you're fetching from a HTTPS server that does not have a valid certificate.
-
-`<nix/fetchurl.nix>` is also known as the builtin derivation builder `builtin:fetchurl`. It's not to be confused with the evaluation-time function `builtins.fetchurl`, which was not affected by this issue.
@@ -1,23 +0,0 @@
---
-synopsis: "Set `X-GitHub-Api-Version` header"
-issues: [fj#255]
-cls: [1925]
-category: Development
-credits: kiara
---
-
-Sets the `X-GitHub-Api-Version` header to `2022-11-28` for calls to the
-GitHub API.
-This follows the later version as per
-https://docs.github.com/en/rest/about-the-rest-api/api-versions?apiVersion=2022-11-28.
-
-This affected the check on whether to use the API versus unauthenticated
-calls as well, given the headers would no longer be empty if the
-authentication token were missing.
-The workaround to this used here is to use a check similar to an existing
-check for the token.
-
-In the current implementation, headers are (still) similarly sent to
-non-authenticated as well as GitHub on-prem calls.
-For what it's worth, manual curl calls with such a header seemed to
-break nor unauthenticated calls nor ones to the github.com API.
@@ -192,13 +192,11 @@
  - [Hacking](contributing/hacking.md)
  - [Testing](contributing/testing.md)
  - [Experimental Features](contributing/experimental-features.md)
-  - [Deprecated Features](contributing/deprecated-features.md)
  - [CLI guideline](contributing/cli-guideline.md)
  - [C++ style guide](contributing/cxx.md)
 - [Release Notes](release-notes/release-notes.md)
  - [Upcoming release](release-notes/rl-next.md)
-    <!-- RELENG-AUTO-INSERTION-MARKER (see releng/release_notes.py) -->
-  - [Lix 2.91 (2024-08-12)](release-notes/rl-2.91.md)
+  <!-- RELENG-AUTO-INSERTION-MARKER (see releng/release_notes.py) -->
  - [Lix 2.90 (2024-07-10)](release-notes/rl-2.90.md)
  - [Nix 2.18 (2023-09-20)](release-notes/rl-2.18.md)
  - [Nix 2.17 (2023-07-24)](release-notes/rl-2.17.md)
@@ -1,3 +1,23 @@
+xp_features_json = custom_target(
+  command : [nix, '__dump-xp-features'],
+  capture : true,
+  output : 'xp-features.json',
+)
+
+experimental_features_shortlist_md = custom_target(
+  command : nix_eval_for_docs + [
+    '--expr',
+    'import @INPUT0@ (builtins.fromJSON (builtins.readFile @INPUT1@))',
+  ],
+  input : [
+    '../../generate-xp-features-shortlist.nix',
+    xp_features_json,
+  ],
+  capture : true,
+  output : 'experimental-features-shortlist.md',
+  env : nix_env_for_docs,
+)
+
 # Intermediate step for manpage generation.
 # This splorks the output of generate-manpage.nix as JSON,
 # which gets written as a directory tree below.
@@ -31,23 +51,16 @@ nix3_cli_files = custom_target(

 conf_file_md = custom_target(
  command : [
-    python.full_path(),
-    '@SOURCE_ROOT@/lix/code-generation/build_settings.py',
-    '--kernel', host_machine.system(),
-    '--docs', '@OUTPUT@',
-    '--experimental-features', '@SOURCE_ROOT@/lix/libutil/experimental-features',
-    '@INPUT@',
+    nix_eval_for_docs,
+    '--expr',
+    '(import @INPUT0@).showSettings { inlineHTML = true; } (builtins.fromJSON (builtins.readFile @INPUT1@))',
  ],
+  capture : true,
  input : [
-    libexpr_setting_definitions,
-    libfetchers_setting_definitions,
-    file_transfer_setting_definitions,
-    libstore_setting_definitions,
-    archive_setting_definitions,
-    feature_setting_definitions,
-    logging_setting_definitions,
-    daemon_setting_definitions,
-    develop_settings_definitions,
+    '../../utils.nix',
+    conf_file_json,
+    experimental_features_shortlist_md,
  ],
  output : 'conf-file.md',
+  env : nix_env_for_docs,
 )
@@ -78,16 +78,6 @@ Most commands in Lix accept the following command-line options:

    Display the raw logs, with the progress bar at the bottom.

-  - `multiline`
-
-    Display a progress bar during the builds and in the lines below that one line per activity.
-
-
-  - `multiline-with-logs`
-
-    Displayes the raw logs, with a progress bar and activities each in a new line at the bottom.
-
-
 - <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 Lix command's standard error.
@@ -1,37 +0,0 @@
-This section describes the notion of *deprecated features*, and how it fits into the big picture of the development of Lix.
-
-# What are deprecated features?
-
-Deprecated features are disabled by default, with the intent to eventually remove them.
-Users must explicitly enable them to keep using them, by toggling the associated [deprecated feature flags](@docroot@/command-ref/conf-file.md#conf-deprecated-features).
-This allows backwards compatibility and a graceful transition away from undesired features.
-
-# Which features can be deprecated?
-
-Undesired features should be soft-deprecated by yielding a warning when used for a significant amount of time before the can be deprecated.
-Legacy obsolete feature with little to no usage may go through this process faster.
-Deprecated features should have a migration path to a preferred alternative.
-
-# Lifecycle of a deprecated feature
-
-This description is not normative, but a feature removal may roughly happen like this:
-
-1. Add a warning when the feature is being used.
-2. Disable the feature by default, putting it behind a deprecated feature flag.
-  - If disabling the feature started out as an opt-in experimental feature, turn that experimental flag into a no-op or remove it entirely.
-    For example, `--extra-experimental-features=no-url-literals` becomes `--extra-deprecated-features=url-literals`.
-3. Decide on a time frame for how long that feature will still be supported for backwards compatibility, and clearly communicate that in the error messages.
-  - Sometimes, automatic migration to alternatives is possible, and such should be provided if possible
-  - At least one NixOS release cycle should be the minimum
-4. Finally remove the feature entirely, only keeping the error message for those still using it.
-
-# Relation to language versioning
-
-Obviously, removing anything breaks backwards compatibility.
-In an ideal world, we'd have SemVer controls over the language and its features, cleanly allowing us to make breaking changes.
-See https://wiki.lix.systems/books/lix-contributors/page/language-versioning and [RFC 137](https://github.com/nixos/rfcs/pull/137) for efforts on that.
-However, we do not live in such an ideal world, and currently this goal is so far away, that "just disable it with some back-compat for a couple of years" is the most realistic solution, especially for comparatively minor changes.
-
-# Currently available deprecated features
-
-{{#include @generated@/../../../lix/libutil/deprecated-feature-descriptions.md}}
@@ -99,4 +99,4 @@ This means that experimental features and RFCs are orthogonal mechanisms, and ca

 # Currently available experimental features

-{{#include @generated@/../../../lix/libutil/experimental-feature-descriptions.md}}
+{{#include @generated@/contributing/experimental-feature-descriptions.md}}
@@ -39,19 +39,17 @@ $ nix-shell -A native-clangStdenvPackages

 ### Building from the development shell

-You can build and test Lix with just:
+As always you may run [stdenv's phases by name](https://nixos.org/manual/nixpkgs/unstable/#sec-building-stdenv-package-in-nix-shell), e.g.:

 ```bash
-$ just setup
-$ just build
-$ just test --suite=check
-$ just install
-$ just test --suite=installcheck
+$ configurePhase
+$ buildPhase
+$ checkPhase
+$ installPhase
+$ installCheckPhase
 ```

-(Check and installcheck may both be done after install, allowing you to omit the --suite argument entirely, but this is the order package.nix runs them in.)
-
-You can also build Lix manually:
+To build manually, however, use the following:

 ```bash
 $ meson setup ./build "--prefix=$out" $mesonFlags
@@ -66,7 +64,9 @@ $ meson install -C build
 $ meson test -C build --suite=installcheck
 ```

-In both cases, Lix will be installed to `$PWD/outputs`, the `/bin` of which is prepended to PATH in the development shells.
+(Check and installcheck may both be done after install, allowing you to omit the --suite argument entirely, but this is the order package.nix runs them in.)
+
+This will install Lix to `$PWD/outputs`, the `/bin` of which is prepended to PATH in the development shells.

 If the tests fail and Meson helpfully has no output for why, use the `--print-error-logs` option to `meson test`.

@@ -102,14 +102,14 @@ $ meson compile -C build nixexpr
 All targets may be addressed as their output, relative to the build directory, e.g.:

 ```bash
-$ meson compile -C build lix/libexpr/liblixexpr.so
+$ meson compile -C build src/libexpr/liblixexpr.so
 ```

 But Meson does not consider intermediate files like object files targets.
 To build a specific object file, use Ninja directly and specify the output file relative to the build directory:

 ```bash
-$ ninja -C build lix/libexpr/liblixexpr.so.p/nixexpr.cc.o
+$ ninja -C build src/libexpr/liblixexpr.so.p/nixexpr.cc.o
 ```

 To inspect the canonical source of truth on what the state of the buildsystem configuration is, use:
@@ -137,7 +137,7 @@ You can also build Lix for one of the [supported platforms](#platforms).

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

-[`flake.nix`]: https://git.lix.systems/lix-project/lix/lix/branch/main/flake.nix
+[`flake.nix`]: https://git.lix.systems/lix-project/lix/src/branch/main/flake.nix

 - `x86_64-linux`
 - `x86_64-darwin`
@@ -168,27 +168,8 @@ or for Nix with the [`flakes`] and [`nix-command`] experimental features enabled
 $ nix build .#packages.aarch64-linux.default
 ```

-### Cross compiling using the Lix flake
-
-Lix can also be easily cross compiled to the following arbitrarily-chosen system doubles, which can be useful for bootstrapping Lix on new platforms.
-These are specified in `crossSystems` in `flake.nix`; feel free to submit changes to add new ones if they are useful to you.
-
- `armv6l-linux`
- `armv7l-linux`
- `aarch64-linux`
- `riscv64-linux`
-
-For example, to cross-compile Lix for `armv6l-linux` from another Linux, use the following:
-
-```console
-$ nix build .#nix-armv6l-linux
-```
-
-It's also possible to cross-compile a tarball of binaries suitable for the Lix installer, for example, for `riscv64-linux`:
-
-```console
-$ nix build .#nix-riscv64-linux.passthru.binaryTarball
-```
+Cross-compiled builds are available for ARMv6 (`armv6l-linux`) and ARMv7 (`armv7l-linux`).
+Add more [system types](#system-type) to `crossSystems` in `flake.nix` to bootstrap Nix on unsupported platforms.

 ### Building for multiple platforms at once

@@ -301,8 +282,9 @@ Regular markdown files used for the manual have a base path of their own and the

 ## API documentation

-Doxygen API documentation will be available online in the future ([tracking issue](https://git.lix.systems/lix-project/lix/issues/422)).
-You can also build and view it yourself:
+Doxygen API documentation is [available
+online](https://hydra.nixos.org/job/nix/master/internal-api-docs/latest/download-by-type/doc/internal-api-docs). You
+can also build and view it yourself:

 ```console
 # nix build .#hydraJobs.internal-api-docs
@@ -312,50 +294,44 @@ You can also build and view it yourself:
 or inside a `nix develop` shell by running:

 ```bash
-$ meson configure build -Dinternal-api-docs=enabled
 $ meson compile -C build internal-api-docs
 $ xdg-open ./outputs/doc/share/doc/nix/internal-api/html/index.html
 ```

 ## Coverage analysis

-A coverage analysis report will be available online in the future (FIXME(lix-hydra)).
-You can build it yourself:
+A coverage analysis report is [available
+online](https://hydra.nixos.org/job/nix/master/coverage/latest/download-by-type/report/coverage). You
+can build it yourself:

 ```
 # nix build .#hydraJobs.coverage
 # xdg-open ./result/coverage/index.html
 ```

-Metrics about the change in line/function coverage over time will be available in the future (FIXME(lix-hydra)).
+Metrics about the change in line/function coverage over time are also
+[available](https://hydra.nixos.org/job/nix/master/coverage#tabs-charts).

 ## Add a release note

 `doc/manual/rl-next` contains release notes entries for all unreleased changes.

 User-visible changes should come with a release note.
-Developer-facing changes should have a release note in the Development category if they are significant and if developers should know about them.

 ### Add an entry

-Here's what a complete entry looks like.
-The file name is not incorporated in the final document, and is generally a super brief summary of the change synopsis.
+Here's what a complete entry looks like. The file name is not incorporated in the document.

-```markdown
+```
 ---
 synopsis: Basically a title
 # 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.
+# 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.
+# List of Lix Gerrit changelist numbers; if there is an associated Lix GitHub
+# PR, just put in the Gerrit CL number.
 cls: [123]
-# Heading that this release note will appear under.
-category: Breaking Changes
-# Add a credit mention in the bottom of the release note.
-# your-name is used as a key into doc/manual/change-authors.yml for metadata
-credits: [your-name]
 ---

 Here's one or more paragraphs that describe the change.
@@ -370,105 +346,7 @@ Significant changes should add the following header, which moves them to the top
 significance: significant
 ```

-The following categories of release notes are supported (see `maintainers/build-release-notes.py`):
- Breaking Changes
- Features
- Improvements
- Fixes
- Packaging
- Development
- Miscellany
-
-The `credits` field, if present, gives credit to the author of the patch in the release notes with a message like "Many thanks to (your-name) for this" and linking to GitHub or Forgejo profiles if listed.
-
-If you are forward-porting a change from CppNix, please credit the original author, and optionally credit yourself.
-When adding credits metadata for people external to the project and deciding whether to put in a `display_name`, consider what they are generally known as in the community; even if you know their full name (e.g. from their GitHub profile), we suggest only adding it as a display name if that is what they go by in the community.
-There are multiple reasons we follow this practice, but it boils down to privacy and consent: we would rather not capture full names that are not widely used in the community without the consent of the parties involved, even if they are publicly available.
-As of this writing, the entries with full names as `display_name` are either members of the CppNix team or people who added them themselves.
-
-The names specified in `credits` are used as keys to look up the authorship info in `doc/manual/change-authors.yml`.
-The only mandatory part is that every key appearing in `credits` has an entry present in `change-authors.yml`.
-All of the following properties are optional; you can specify `{}` as the metadata if you want a simple non-hyperlinked mention.
-The following properties are supported:
-
- `display_name`: display name used in place of the key when showing names, if present.
- `forgejo`: Forgejo username. The name in the release notes will be a link to this, if present.
- `github`: GitHub username, used if `forgejo` is not set, again making a link.
-
 ### Build process

 Releases have a precomputed `rl-MAJOR.MINOR.md`, and no `rl-next.md`.
 Set `buildUnreleasedNotes = true;` in `flake.nix` to build the release notes on the fly.
-
-## Adding experimental or deprecated features, global settings, or builtins
-
-Experimental and deprecated features, global settings, and builtins are generally referenced both in the code and in the documentation.
-To prevent duplication or divergence, they are defined in data files, and a script generates the necessary glue.
-The data file format is similar to the release notes: it consists of a YAML metadata header, followed by the documentation in Markdown format.
-
-### Experimental or deprecated features
-
-Experimental and deprecated features support the following metadata properties:
-* `name` (required): user-facing name of the feature, to be used in `nix.conf` options and on the command line.
-  This should also be the stem of the file name (with extension `md`).
-* `internalName` (required): identifier used to refer to the feature inside the C++ code.
-
-Experimental feature data files should live in `lix/libutil/experimental-features`, and deprecated features in `lix/libutil/deprecated-features`.
-They must be listed in the `experimental_feature_definitions` or `deprecated_feature_definitions` lists in `lix/libutil/meson.build` respectively to be considered by the build system.
-
-### Global settings
-
-Global settings support the following metadata properties:
-* `name` (required): user-facing name of the setting, to be used as key in `nix.conf` and in the `--option` command line argument.
-* `internalName` (required): identifier used to refer to the setting inside the C++ code.
-* `platforms` (optional): a list specifying the platforms on which this setting is available.
-  If not specified, it is available on all platforms.
-  Valid platform names are `darwin`, `linux`.
-* `type` (optional): C++ type of the setting value.
-  This specifies the setting object type as `Setting<T>`; if more control is required, use `settingType` instead.
-* `settingType` (required if `type` is not specified): C++ type of the setting object.
-* `default` (optional): default value of the setting.
-  `null`, truth values, integers, strings and lists are supported as long as the correct YAML type is used, `type` is not taken into account).
-  Other types, machine-dependent values or non-standard representations must be handled using `defaultExpr` and `defaultText` instead.
-* `defaultExpr` (required if `default` is not specified): a string containing the C++ expression representing the default value.
-* `defaultText` (required if `default` is not specified): a string containing the Markdown expression representing the default value in the documentation.
-  Literal values are conventionally surrounded by backticks, and a system-dependent value is signaled by `*machine-specific*`.
-* `aliases` (optional): a list of secondary user-facing names under which the setting is available.
-  Defaults to empty if not specified.
-* `experimentalFeature` (optional): the user-facing name of the experimental feature which needs to be enabled to change the setting.
-  If not specified, no experimental feature is required.
-* `deprecated` (optional): whether the setting is deprecated and shown as such in the documentation for `nix.conf`.
-  Defaults to false if not specified.
-
-Settings are not collected in a single place in the source tree, so an appropriate place needs to be found for the setting to live.
-Look for related setting definition files under second-level subdirectories of `lix` whose name includes `settings`.
-Then add the new file there, and don't forget to register it in the appropriate `meson.build` file.
-
-### Builtin functions
-
-The following metadata properties are supported for builtin functions:
-* `name` (required): the language-facing name (as a member of the `builtins` attribute set) of the function.
-* `implementation` (optional): a C++ expression specifying the implementation of the builtin.
-  It must be a function of signature `void(EvalState &, PosIdx, Value * *, Value &)`.
-  If not specified, defaults to `prim_${name}`.
-* `renameInGlobalScope` (optional): whether the definiton should be "hidden" in the global scope by prefixing its name with two underscores.
-  If not specified, defaults to `true`.
-* `args` (required): list containing the names of the arguments, as shown in the documentation.
-  All arguments must be listed here since the function arity is derived as the length of this list.
-* `experimental_feature` (optional): the user-facing name of the experimental feature which needs to be enabled for the bultin function to be available.
-  If not specified, no experimental feature is required.
-
-New builtin function definition files must be added to `lix/libexpr/builtins` and registered in the `builtin_definitions` list in `lix/libexpr/meson.build`.
-
-### Builtin constants
-The following metadata properties are supported for builtin constants:
-* `name` (required): the language-facing name (as a member of the `builtins` attribute set) of the constant.
-* `type` (required): the Nix language type of the constant; the C++ type is automatically derived.
-* `constructorArgs` (optional): list of strings containing C++ expressions passed as arguments to the appropriate `Value` constructor.
-  If the value computation is more complex, `implementation` can be used instead.
-* `implementation` (required if `constructorArgs` is not specified): string containing a C++ expressing computing the value of the constant.
-* `impure` (optional): whether the constant is considered impure.
-  Impure constants are not available when pure evaluation mode is activated.
-  Defaults to `false` when not specified.
-
-New builtin constant definition files must be added to `lix/libexpr/builtin-constants` and registered in the `builtin_constant_definitions` list in `lix/libexpr/meson.build`.
@@ -0,0 +1,15 @@
+# Intermediate step for experimental-feature-descriptions.md.
+# This splorks the output of generate-xp-features.nix as JSON,
+# which gets written as a directory tree below.
+experimental_feature_descriptions_md = custom_target(
+  command : nix_eval_for_docs + [
+    '--expr',
+    'import @INPUT0@ (builtins.fromJSON (builtins.readFile @INPUT1@))',
+  ],
+  input : [
+    '../../generate-xp-features.nix',
+    xp_features_json,
+  ],
+  capture : true,
+  output : 'experimental-feature-descriptions.md',
+)
@@ -13,7 +13,7 @@ The unit tests are defined using the [googletest] and [rapidcheck] frameworks.
 >
 > ```
 > …
-> ├── lix
+> ├── src
 > │   ├── libexpr
 > │   │   ├── …
 > │   │   ├── value
@@ -46,10 +46,10 @@ The unit tests are defined using the [googletest] and [rapidcheck] frameworks.
 > …       …   …   …   …   …
 > ```

-The unit tests for each Lix library (`liblixexpr`, `liblixstore`, etc..) live inside a directory `lix/${library_shortname}/tests` within the directory for the library (`lix/${library_shortname}`).
+The unit tests for each Lix library (`liblixexpr`, `liblixstore`, etc..) live inside a directory `src/${library_shortname}/tests` within the directory for the library (`src/${library_shortname}`).

 The data is in `tests/unit/LIBNAME/data/LIBNAME`, with one subdir per library, with the same name as where the code goes.
-For example, `liblixstore` code is in `lix/libstore`, and its test data is in `tests/unit/libstore/data/libstore`.
+For example, `liblixstore` code is in `src/libstore`, and its test data is in `tests/unit/libstore/data/libstore`.
 The path to the unit test data directory is passed to the unit test executable with the environment variable `_NIX_TEST_UNIT_DATA`.

 ### Running tests
@@ -247,6 +247,7 @@ To ensure that characterization testing doesn't make it harder to intentionally

 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 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}`

@@ -345,7 +346,7 @@ rg '(?:[^A-Za-z]|^)(_[A-Z][^-\[ }/:");$(]+)' -r '$1' --no-filename --only-matchi
 rg '\$\{?([A-Z][^-\[ }/:");]+)' -r '$1' --no-filename --only-matching tests | sort -u > vars.txt
 ```

-I grepped `lix/` for `get[eE]nv\("` to find the mentions in Lix code.
+I grepped `src/` for `get[eE]nv\("` to find the mentions in Lix code.

 ### Used by Lix testing support code

@@ -361,8 +362,8 @@ I grepped `lix/` for `get[eE]nv\("` to find the mentions in Lix code.

 - `_NIX_FORCE_HTTP` - Forces file URIs to be treated as remote ones.

-  Used by `lix/libfetchers/git.cc`, `lix/libstore/http-binary-cache-store.cc`,
-  `lix/libstore/local-binary-cache-store.cc`. Seems to be for forcing Git
+  Used by `src/libfetchers/git.cc`, `src/libstore/http-binary-cache-store.cc`,
+  `src/libstore/local-binary-cache-store.cc`. Seems to be for forcing Git
  clones of `git+file://` URLs, making the HTTP binary
  cache store accept `file://` URLs (presumably passing them to curl?), and
  unknown reasons for the local binary cache.
@@ -374,7 +375,7 @@ I grepped `lix/` for `get[eE]nv\("` to find the mentions in Lix code.
  `structuredAttrs` documentation.
 - `NIX_BIN_DIR`, `NIX_STORE_DIR` (or its inconsistently-used old alias `NIX_STORE`), `NIX_DATA_DIR`,
  `NIX_LOG_DIR`, `NIX_LOG_DIR`, `NIX_STATE_DIR`, `NIX_CONF_DIR` -
-  Overrides compile-time configuration of various locations used by Lix. See `lix/libstore/globals.cc`.
+  Overrides compile-time configuration of various locations used by Lix. See `src/libstore/globals.cc`.

  **Expected value**: a directory
 - `NIX_DAEMON_SOCKET_PATH` (optional) - Overrides the daemon socket path from `$NIX_STATE_DIR/daemon-socket/socket`.
@@ -427,12 +428,14 @@ I grepped `lix/` for `get[eE]nv\("` to find the mentions in Lix code.
 - `NIX_SHOW_STATS_PATH` - Writes those statistics into a file at the given path instead of stdout. Undocumented.
 - `NIX_SHOW_SYMBOLS` - Dumps the symbol table into the show-stats json output.
 - `TERM` - If `dumb` or unset, disables ANSI colour output.
- `FORCE_COLOR`, `CLICOLOR_FORCE` - Enables ANSI colour output if `NO_COLOR`/`NOCOLOR` not set.
 - `NO_COLOR`, `NOCOLOR` - Disables ANSI colour output.
 - `_NIX_DEVELOPER_SHOW_UNKNOWN_LOCATIONS` - Highlights unknown locations in errors.
 - `NIX_PROFILE` - Selects which profile `nix-env` will operate on. Documented elsewhere.
 - `NIX_SSHOPTS` - Options passed to `ssh(1)` when using a ssh remote store.
  Incorrectly documented on `nix-copy-closure` which is *surely* not the only place they are used??
+- `_NIX_TEST_NO_LSOF` - Used on non-Linux, non-macOS platforms to disable using `lsof` when finding gc roots.
+
+  Since https://git.lix.systems/lix-project/lix/issues/156 was fixed, this should probably just be removed as it was a bad workaround for a macOS issue.
 - `_NIX_TEST_GC_SYNC_1` - Path to a pipe that is used to block the GC briefly to validate invariants from the test suite.
 - `_NIX_TEST_GC_SYNC_2` - Path to a pipe that is used to block the GC briefly to validate invariants from the test suite.
 - `_NIX_TEST_FREE_SPACE_FILE` - Path to a file containing a decimal number with the free space that the GC is to believe it has.
@@ -1,6 +1,6 @@
 # Installing a Binary Distribution

-See <https://lix.systems/install/> for more details.
+See https://lix.systems/install/ for more details.

 <!--

@@ -36,10 +36,7 @@ All users of the Lix daemon may do the following to bring things into the Nix st
    - Input-addressed, so they are run in the sandbox with no network access, with the following exceptions:

      - The (poorly named, since it is not *just* about chroot) property `__noChroot` is set on the derivation and `sandbox` is set to `relaxed`.
-      - On macOS, the derivation property `__darwinAllowLocalNetworking` allows network access to localhost from input-addressed derivations regardless of the `sandbox` setting value.
-        This property exists with such semantics because macOS has no network namespace equivalent to isolate individual processes' localhost networking.
-      - On macOS, the derivation property `__sandboxProfile` accepts extra sandbox profile S-expressions, allowing derivations to bypass arbitrary parts of the sandbox without altogether disabling it.
-        This is only permitted when `sandbox` is set to `relaxed`.
+      - On macOS, the derivation property `__darwinAllowLocalNetworking` allows network access to localhost from input-addressed derivations regardless of the `sandbox` setting value. This property exists with such semantics because macOS has no network namespace equivalent to isolate individual processes' localhost networking.
    - Output-addressed, so they are run with network access but their result must match an expected hash.

  Trusted users may set any setting, including `sandbox = false`, so the sandbox state can be different at runtime from what is described in `nix.conf` for builds invoked with such settings.
@@ -292,12 +292,6 @@ Derivations can declare some infrequently used optional attributes.
    (associative) arrays. For example, the attribute `hardening.format = true`
    ends up as the Bash associative array element `${hardening[format]}`.

-    > **Warning**
-    >
-    > If set to `true`, other advanced attributes such as [`allowedReferences`](#adv-attr-allowedReferences), [`allowedReferences`](#adv-attr-allowedReferences), [`allowedRequisites`](#adv-attr-allowedRequisites),
-    [`disallowedReferences`](#adv-attr-disallowedReferences) and [`disallowedRequisites`](#adv-attr-disallowedRequisites), maxSize, and maxClosureSize.
-    will have no effect.
-
  - [`outputChecks`]{#adv-attr-outputChecks}\
    When using [structured attributes](#adv-attr-structuredAttrs), the `outputChecks`
    attribute allows defining checks per-output.
@@ -332,6 +326,7 @@ Derivations can declare some infrequently used optional attributes.
    ```

  - [`unsafeDiscardReferences`]{#adv-attr-unsafeDiscardReferences}\
+
    When using [structured attributes](#adv-attr-structuredAttrs), the
    attribute `unsafeDiscardReferences` is an attribute set with a boolean value for each output name.
    If set to `true`, it disables scanning the output for runtime dependencies.
@@ -4,7 +4,7 @@ These constants are built into the Nix language evaluator:

 <dl>

-{{#include @generated@/../../../lix/libexpr/builtin-constants.md}}
+{{#include @generated@/language/builtin-constants.md}}

 </dl>

@@ -15,6 +15,6 @@ For convenience, some built-ins can be accessed directly:
  <dd><p><var>derivation</var> is described in
         <a href="derivations.md">its own section</a>.</p></dd>

-{{#include @generated@/../../../lix/libexpr/builtins.md}}
+{{#include @generated@/language/builtins.md}}

 </dl>
@@ -0,0 +1,27 @@
+builtins_md = custom_target(
+  command : nix_eval_for_docs + [
+    '--expr',
+    'import @INPUT0@ (builtins.fromJSON (builtins.readFile @INPUT1@)).builtins',
+  ],
+  capture : true,
+  input : [
+    '../../generate-builtins.nix',
+    language_json,
+  ],
+  output : 'builtins.md',
+  env : nix_env_for_docs,
+)
+
+builtin_constants_md = custom_target(
+  command : nix_eval_for_docs + [
+    '--expr',
+    'import @INPUT0@ (builtins.fromJSON (builtins.readFile @INPUT1@)).constants',
+  ],
+  capture : true,
+  input : [
+    '../../generate-builtin-constants.nix',
+    language_json,
+  ],
+  output : 'builtin-constants.md',
+  env : nix_env_for_docs,
+)
@@ -26,8 +26,6 @@
 | Logical conjunction (`AND`)            | *bool* `&&` *bool*                         | left          | 12         |
 | Logical disjunction (`OR`)             | *bool* <code>\|\|</code> *bool*            | left          | 13         |
 | [Logical implication]                  | *bool* `->` *bool*                         | none          | 14         |
-| \[Experimental\] [Function piping]     | *expr* |> *func*                           | left          | 15         |
-| \[Experimental\] [Function piping]     | *expr* <| *func*                           | right         | 16         |

 [string]: ./values.md#type-string
 [path]: ./values.md#type-path
@@ -61,10 +59,8 @@ The result is a [Boolean] value.

 ## Arithmetic

-Numbers will retain their type unless mixed with other numeric types:
-Pure integer operations will always return integers, whereas any operation involving at least one floating point number returns a floating point number.
-
-Integer overflow (of 64-bit signed integers) and division by zero are defined to throw an error.
+Numbers are type-compatible:
+Pure integer operations will always return integers, whereas any operation involving at least one floating point number return a floating point number.

 See also [Comparison] and [Equality].

@@ -147,103 +143,21 @@ All comparison operators are implemented in terms of `<`, and the following equi
 | *a* `>`  *b* |       *b* `<` *a*     |
 | *a* `>=` *b* | `! (` *a* `<` *b* `)` |

-Note that the above behaviour violates IEEE 754 for floating point numbers with respect to NaN, for instance.
-This may be fixed in a future major language revision.
-
 [Comparison]: #comparison-operators

 ## Equality

-The following equality comparison rules are followed in order:
-
- Comparisons are first, sometimes, performed by identity (pointer value), and whether or not this occurs varies depending on the context in which the comparison is performed; for example, through `builtins.elem`, comparison of lists, or other cases.
-  The exact instances in which this occurs, aside from direct list and attribute set comparisons as discussed below, are too dependent on implementation details to meaningfully document.
-
-  See [note on identity comparison](#identity-comparison) below.
- Comparisons between a combination of integers and floating point numbers are first converted to floating point then compared as floating point.
- Comparisons between values of differing types, besides the ones mentioned in the above rule, are unequal.
- Strings are compared as their string values, disregarding string contexts.
- Paths are compared as their absolute form (since they are stored as such).
- [Functions][function] are always considered unequal, including with themselves.
- The following are compared in the typical manner:
-  - Integers
-  - Floating point numbers have equality comparison per IEEE 754.
-
-    Note that this means that just like in most languages, floating point arithmetic results are not typically equality comparable, and should instead be compared by checking that the absolute difference is less than some error margin.
-  - Booleans
-  - Null
- [Attribute sets][attribute set] are compared following these rules in order:
-  - If both attribute sets have the same identity (via pointer equality), they are considered equal, regardless of whether the contents have reflexive equality (e.g. even if there are functions contained within).
-
-    See [note on identity comparison](#identity-comparison) below.
-  - If both attribute sets have `type = "derivation"` and have an attribute `outPath` that is equal, they are considered equal.
-
-    This means that two results of `builtins.derivation`, regardless of other things added to their attributes via `//` afterwards (or `passthru` in nixpkgs), will compare equal if they passed the same arguments to `builtins.derivation`.
-  - Otherwise, they are compared element-wise in an unspecified order.
-    Although this order *may* be deterministic in some cases, this is not guaranteed, and correct code must not rely on this ordering behaviour.
-
-    The order determines which elements are evaluated first and thus, if there are throwing values in the attribute set, which of those get evaluated, if any, before the comparison returns an unequal result.
- Lists are compared following these rules in order:
-  - If both lists have the same identity (via pointer equality), they are considered equal, regardless of whether the contents have reflexive equality (e.g. even if there are functions contained within).
-
-    See [note on identity comparison](#identity-comparison) below.
-  - Otherwise, they are compared element-wise in list order.
+- [Attribute sets][attribute set] and [list]s are compared recursively, and therefore are fully evaluated.
+- Comparison of [function]s always returns `false`.
+- Numbers are type-compatible, see [arithmetic] operators.
+- Floating point numbers only differ up to a limited precision.

 [function]: ./constructs.md#functions

 [Equality]: #equality

-### Identity comparison
-
-In the current revision of the Nix language, values are first compared by identity (pointer equality).
-This means that values that are not reflexively equal (that is, they do not satisfy `a == a`), such as functions, are nonetheless sometimes compared as equal with themselves if they are placed in attribute sets or lists, or are compared through other indirect means.
-
-Whether identity comparison applies to a given usage of the language aside from direct list and attribute set comparison is strongly dependent on implementation details to the point it is not feasible to document the exact instances.
-
-This is rather unfortunate behaviour which is regrettably load-bearing on nixpkgs (such as with the `type` attribute of NixOS options) and cannot be changed for the time being.
-It may be changed in a future major language revision.
-
-Correct code must not rely on this behaviour.
-
-For example:
-
-```
-nix-repl> let f = x: 1; s = { func = f; }; in [ (f == f) (s == s) ]
-[ false true ]
-```
-
 ## Logical implication

 Equivalent to `!`*b1* `||` *b2*.

 [Logical implication]: #logical-implication
-
-## \[Experimental\] Function piping
-
-*This language feature is still experimental and may change at any time. Enable `--extra-experimental-features pipe-operator` to use it.*
-
-Pipes are a dedicated operator for function application, but with reverse order and a lower binding strength.
-This allows you to chain function calls together in way that is more natural to read and requires less parentheses.
-
-`a |> f b |> g` is equivalent to `g (f b a)`.
-`g <| f b <| a` is equivalent to `g (f b a)`.
-
-Example code snippet:
-
-```nix
-defaultPrefsFile = defaultPrefs
-  |> lib.mapAttrsToList (
-    key: value: ''
-      // ${value.reason}
-      pref("${key}", ${builtins.toJSON value.value});
-    ''
-  )
-  |> lib.concatStringsSep "\n"
-  |> pkgs.writeText "nixos-default-prefs.js";
-```
-
-Note how `mapAttrsToList` is called with two arguments (the lambda and `defaultPrefs`),
-but moving the last argument in front of the rest improves the reading flow.
-This is common for functions with long first argument, including all `map`-like functions.
-
-[Function piping]: #experimental-function-piping
@@ -7,16 +7,13 @@
  *Strings* can be written in three ways.

  The most common way is to enclose the string between double quotes,
-  e.g., `"foo bar"`. Strings can span multiple lines. The backslash
-  (`\`) can be used to escape characters: newlines, carriage returns
-  and tabs may be written as `\n`, `\r` and `\t` respectively; any
-  other characters can be preceded by a backslash to remove any
-  special meaning they may have, like the special characters `"` and
-  `\` and the character sequence `${`.
+  e.g., `"foo bar"`. Strings can span multiple lines. The special
+  characters `"` and `\` and the character sequence `${` must be
+  escaped by prefixing them with a backslash (`\`). Newlines, carriage
+  returns and tabs can be written as `\n`, `\r` and `\t`,
+  respectively.

  You can include the results of other expressions into a string by enclosing them in `${ }`, a feature known as [string interpolation].
-  Due to a parser issue that has since come to be relied upon, the character sequence `$${` is interpreted literally and does not introduce an interpolation.
-  To express a `$` character immediately followed by an interpolation, the former must be escaped.

  [string interpolation]: ./string-interpolation.md

@@ -46,16 +43,16 @@
  Note that the whitespace and newline following the opening `''` is
  ignored if there is no non-whitespace text on the initial line.

+  Indented strings support [string interpolation].
+
  Since `${` and `''` have special meaning in indented strings, you
  need a way to quote them. `$` can be escaped by prefixing it with
  `''` (that is, two single quotes), i.e., `''$`. `''` can be escaped
-  by prefixing it with `'`, i.e., `'''`. Linefeed, carriage-return and tab
+  by prefixing it with `'`, i.e., `'''`. `$` removes any special
+  meaning from the following `$`. Linefeed, carriage-return and tab
  characters can be written as `''\n`, `''\r`, `''\t`, and `''\`
  escapes any other character.

-  Indented strings support [string interpolation] using `${ }` the same way regular strings do.
-  `$${` is interpreted literally in indented strings as well, so the `$` character must be escaped if it is to be followed by an interpolation.
-
  Indented strings are primarily useful in that they allow multi-line
  string literals to follow the indentation of the enclosing Nix
  expression, and that less escaping is typically necessary for
@@ -77,14 +74,17 @@
  }
  ```

+  Finally, as a convenience, *URIs* as defined in appendix B of
+  [RFC 2396](http://www.ietf.org/rfc/rfc2396.txt) can be written *as
+  is*, without quotes. For instance, the string
+  `"http://example.org/foo.tar.bz2"` can also be written as
+  `http://example.org/foo.tar.bz2`.
+
 - <a id="type-number" href="#type-number">Number</a>

  Numbers, which can be *integers* (like `123`) or *floating point*
  (like `123.43` or `.27e13`).

-  Integers in the Nix language are 64-bit signed integers.
-  Integer overflow is defined to throw an error.
-
  See [arithmetic] and [comparison] operators for semantics.

  [arithmetic]: ./operators.md#arithmetic
@@ -1,489 +0,0 @@
-# Lix 2.91 "Dragon's Breath" (2024-08-12)
-
-
-# Lix 2.91.0 (2024-08-12)
-
-## Breaking Changes
- Block io_uring in the Linux sandbox [cl/1611](https://gerrit.lix.systems/c/lix/+/1611)
-
-  The io\_uring API has the unfortunate property that it is not possible to selectively decide which operations should be allowed.
-  This, together with the fact that new operations are routinely added, makes it a hazard to the proper function of the sandbox.
-
-  Therefore, any access to io\_uring has been made unavailable inside the sandbox.
-  As such, attempts to execute any system calls forming part of this API will fail with the error `ENOSYS`, as if io\_uring support had not been configured into the kernel.
-
-  Many thanks to [alois31](https://git.lix.systems/alois31) for this.
- The `build-hook` setting is now deprecated
-
-  Build hooks communicate with the daemon using a custom, internal, undocumented protocol that is entirely unversioned and cannot be changed.
-  Since we intend to change it anyway we must unfortunately deprecate the current build hook infrastructure.
-  We do not expect this to impact most users—we have not found any uses of `build-hook` in the wild—but if this does affect you, we'd like to hear from you!
- Lix no longer speaks the Nix remote-build worker protocol to clients or servers older than CppNix 2.3 [fj#325](https://git.lix.systems/lix-project/lix/issues/325) [cl/1207](https://gerrit.lix.systems/c/lix/+/1207) [cl/1208](https://gerrit.lix.systems/c/lix/+/1208) [cl/1206](https://gerrit.lix.systems/c/lix/+/1206) [cl/1205](https://gerrit.lix.systems/c/lix/+/1205) [cl/1204](https://gerrit.lix.systems/c/lix/+/1204) [cl/1203](https://gerrit.lix.systems/c/lix/+/1203) [cl/1479](https://gerrit.lix.systems/c/lix/+/1479)
-
-  CppNix 2.3 was released in 2019, and is the new oldest supported version. We
-  will increase our support baseline in the future up to a final version of CppNix
-  2.18 (which may happen soon given that it is the only still-packaged and thus
-  still-tested >2.3 version), but this step already removes a significant amount
-  of dead, untested, code paths.
-
-  Lix speaks the same version of the protocol as CppNix 2.18 and that fact will
-  never change in the future; the Lix plans to replace the protocol for evolution
-  will entail a complete incompatible replacement that will be supported in
-  parallel with the old protocol. Lix will thus retain remote build compatibility
-  with CppNix as long as CppNix maintains protocol compatibility with 2.18, and
-  as long as Lix retains legacy protocol support (which will likely be a long
-  time given that we plan to convert it to a frozen-in-time shim).
-
-  Many thanks to [jade](https://git.lix.systems/jade) for this.
-
-## Features
- Pipe operator `|>` (experimental) [fj#438](https://git.lix.systems/lix-project/lix/issues/438) [cl/1654](https://gerrit.lix.systems/c/lix/+/1654)
-
-  Implementation of the pipe operator (`|>`) in the language as described in [RFC 148](https://github.com/NixOS/rfcs/pull/148).
-  The feature is still marked experimental, enable `--extra-experimental-features pipe-operator` to use it.
-
-  Many thanks to [piegames](https://git.lix.systems/piegames) and [eldritch horrors](https://git.lix.systems/pennae) for this.
-
-## Improvements
- Trace which part of a `foo.bar.baz` expression errors [cl/1505](https://gerrit.lix.systems/c/lix/+/1505) [cl/1506](https://gerrit.lix.systems/c/lix/+/1506)
-
-  Previously, if an attribute path selection expression like `linux_4_9.meta.description` it wouldn't show you which one of those parts in the attribute path, or even that that line of code is what caused evaluation of the failing expression.
-  The previous error looks like this:
-
-  ```
-  pkgs.linuxKernel.kernels.linux_4_9.meta.description
-
-  error:
-         … while evaluating the attribute 'linuxKernel.kernels.linux_4_9.meta.description'
-           at /nix/store/dk2rpyb6ndvfbf19bkb2plcz5y3k8i5v-source/pkgs/top-level/linux-kernels.nix:278:5:
-            277|   } // lib.optionalAttrs config.allowAliases {
-            278|     linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11";
-               |     ^
-            279|     linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11";
-
-         … while calling the 'throw' builtin
-           at /nix/store/dk2rpyb6ndvfbf19bkb2plcz5y3k8i5v-source/pkgs/top-level/linux-kernels.nix:278:17:
-            277|   } // lib.optionalAttrs config.allowAliases {
-            278|     linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11";
-               |                 ^
-            279|     linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11";
-
-         error: linux 4.9 was removed because it will reach its end of life within 22.11
-  ```
-
-  Now, the error will look like this:
-
-  ```
-  pkgs.linuxKernel.kernels.linux_4_9.meta.description
-
-  error:
-         … while evaluating the attribute 'linuxKernel.kernels.linux_4_9.meta.description'
-           at /nix/store/dk2rpyb6ndvfbf19bkb2plcz5y3k8i5v-source/pkgs/top-level/linux-kernels.nix:278:5:
-            277|   } // lib.optionalAttrs config.allowAliases {
-            278|     linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11";
-               |     ^
-            279|     linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11";
-
-         … while evaluating 'pkgs.linuxKernel.kernels.linux_4_9' to select 'meta' on it
-           at «string»:1:1:
-              1| pkgs.linuxKernel.kernels.linux_4_9.meta.description
-               | ^
-
-         … caused by explicit throw
-           at /nix/store/dk2rpyb6ndvfbf19bkb2plcz5y3k8i5v-source/pkgs/top-level/linux-kernels.nix:278:17:
-            277|   } // lib.optionalAttrs config.allowAliases {
-            278|     linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11";
-               |                 ^
-            279|     linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11";
-
-         error: linux 4.9 was removed because it will reach its end of life within 22.11
-  ```
-
-  Not only does the line of code that referenced the failing attribute show up in the trace, it also tells you that it was specifically the `linux_4_9` part that failed.
-
-  This includes if the failing part is a top-level binding:
-
-  ```
-  let
-    inherit (pkgs.linuxKernel.kernels) linux_4_9;
-  in linux_4_9.meta.description
-  error:
-         … while evaluating 'linux_4_9' to select 'meta.description' on it
-           at «string»:3:4:
-              2|   inherit (pkgs.linuxKernel.kernels) linux_4_9;
-              3| in linux_4_9.meta.description
-               |    ^
-
-         … while evaluating the attribute 'linux_4_9'
-           at /nix/store/dk2rpyb6ndvfbf19bkb2plcz5y3k8i5v-source/pkgs/top-level/linux-kernels.nix:278:5:
-            277|   } // lib.optionalAttrs config.allowAliases {
-            278|     linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11";
-               |     ^
-            279|     linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11";
-
-         … caused by explicit throw
-           at /nix/store/dk2rpyb6ndvfbf19bkb2plcz5y3k8i5v-source/pkgs/top-level/linux-kernels.nix:278:17:
-            277|   } // lib.optionalAttrs config.allowAliases {
-            278|     linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11";
-               |                 ^
-            279|     linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11";
-
-         error: linux 4.9 was removed because it will reach its end of life within 22.11
-  ```
-
-  Many thanks to [Qyriad](https://git.lix.systems/Qyriad) for this.
- Confusing 'invalid path' errors are now 'path does not exist' [cl/1161](https://gerrit.lix.systems/c/lix/+/1161) [cl/1160](https://gerrit.lix.systems/c/lix/+/1160) [cl/1159](https://gerrit.lix.systems/c/lix/+/1159)
-
-  Previously, if a path did not exist in a Nix store, it was referred to as the internal name "path is invalid".
-  This is, however, very confusing, and there were numerous such errors that were exactly the same, making it hard to debug.
-  These errors are now more specific and refer to the path not existing in the store.
-
-  Many thanks to [julia](https://git.lix.systems/midnightveil) for this.
- Add a `build-dir` setting to set the backing directory for builds [gh#10303](https://github.com/NixOS/nix/pull/10303) [gh#10312](https://github.com/NixOS/nix/pull/10312) [gh#10883](https://github.com/NixOS/nix/pull/10883) [cl/1514](https://gerrit.lix.systems/c/lix/+/1514)
-
-  `build-dir` can now be set in the Nix configuration to choose the backing directory for the build sandbox.
-  This can be useful on systems with `/tmp` on tmpfs, or simply to relocate large builds to another disk.
-
-  Also, `XDG_RUNTIME_DIR` is no longer considered when selecting the default temporary directory,
-  as it's not intended to be used for large amounts of data.
-
-  Many thanks to [Robert Hensing](https://github.com/roberth) and [Tom Bereknyei](https://github.com/tomberek) for this.
- Better usage of colour control environment variables [cl/1699](https://gerrit.lix.systems/c/lix/+/1699) [cl/1702](https://gerrit.lix.systems/c/lix/+/1702)
-
-  Lix now heeds `NO_COLOR`/`NOCOLOR` for more output types, such as that used in `nix search`, `nix flake metadata` and similar.
-
-  It also now supports `CLICOLOR_FORCE`/`FORCE_COLOR` to force colours regardless of whether there is a terminal on the other side.
-
-  It now follows rules compatible with those described on <https://bixense.com/clicolors/> with `CLICOLOR` defaulted to enabled.
-
-  That is to say, the following procedure is followed in order:
-  - NO_COLOR or NOCOLOR set
-
-    Always disable colour
-  - CLICOLOR_FORCE or FORCE_COLOR set
-
-    Enable colour
-  - The output is a tty; TERM != "dumb"
-
-    Enable colour
-  - Otherwise
-
-    Disable colour
-
-  Many thanks to [jade](https://git.lix.systems/jade) for this.
- Distinguish between explicit throws and errors that happened while evaluating a throw [cl/1511](https://gerrit.lix.systems/c/lix/+/1511)
-
-  Previously, errors caused by an expression like `throw "invalid argument"` were treated like an error that happened simply while some builtin function was being called:
-
-  ```
-  let
-    throwMsg = p: throw "${p} isn't the right package";
-  in throwMsg "linuz"
-
-  error:
-         … while calling the 'throw' builtin
-           at «string»:2:17:
-              1| let
-              2|   throwMsg = p: throw "${p} isn't the right package";
-               |                 ^
-              3| in throwMsg "linuz"
-
-         error: linuz isn't the right package
-  ```
-
-  But the error didn't just happen "while" calling the `throw` builtin — it's a throw error!
-  Now it looks like this:
-
-  ```
-  let
-    throwMsg = p: throw "${p} isn't the right package";
-  in throwMsg "linuz"
-
-  error:
-         … caused by explicit throw
-           at «string»:2:17:
-              1| let
-              2|   throwMsg = p: throw "${p} isn't the right package";
-               |                 ^
-              3| in throwMsg "linuz"
-
-         error: linuz isn't the right package
-  ```
-
-  This also means that incorrect usage of `throw` or errors evaluating its arguments are easily distinguishable from explicit throws:
-
-  ```
-  let
-    throwMsg = p: throw "${p} isn't the right package";
-  in throwMsg { attrs = "error when coerced in string interpolation"; }
-
-  error:
-         … while calling the 'throw' builtin
-           at «string»:2:17:
-              1| let
-              2|   throwMsg = p: throw "${p} isn't the right package";
-               |                 ^
-              3| in throwMsg { attrs = "error when coerced in string interpolation"; }
-
-         … while evaluating a path segment
-           at «string»:2:24:
-              1| let
-              2|   throwMsg = p: throw "${p} isn't the right package";
-               |                        ^
-              3| in throwMsg { attrs = "error when coerced in string interpolation"; }
-
-         error: cannot coerce a set to a string: { attrs = "error when coerced in string interpolation"; }
-  ```
-
-  Here, instead of an actual thrown error, a type error happens first (trying to coerce an attribute set to a string), but that type error happened *while* calling `throw`.
-
-  Many thanks to [Qyriad](https://git.lix.systems/Qyriad) for this.
- `nix flake metadata` prints modified date [cl/1700](https://gerrit.lix.systems/c/lix/+/1700)
-
-  Ever wonder "gee, when *did* I update nixpkgs"?
-  Wonder no more, because `nix flake metadata` now simply tells you the times every locked flake input was updated:
-
-  ```
-  <...>
-  Description:   The purely functional package manager
-  Path:          /nix/store/c91yi8sxakc2ry7y4ac1smzwka4l5p78-source
-  Revision:      c52cff582043838bbe29768e7da232483d52b61d-dirty
-  Last modified: 2024-07-31 22:15:54
-  Inputs:
-  ├───flake-compat: github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33
-  │   Last modified: 2023-10-04 06:37:54
-  ├───nix2container: github:nlewo/nix2container/3853e5caf9ad24103b13aa6e0e8bcebb47649fe4
-  │   Last modified: 2024-07-10 13:15:56
-  ├───nixpkgs: github:NixOS/nixpkgs/e21630230c77140bc6478a21cd71e8bb73706fce
-  │   Last modified: 2024-07-25 11:26:27
-  ├───nixpkgs-regression: github:NixOS/nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2
-  │   Last modified: 2022-01-24 11:20:45
-  └───pre-commit-hooks: github:cachix/git-hooks.nix/f451c19376071a90d8c58ab1a953c6e9840527fd
-      Last modified: 2024-07-15 04:21:09
-  ```
-
-  Many thanks to [jade](https://git.lix.systems/jade) for this.
- Hash mismatch diagnostics for fixed-output derivations include the URL [cl/1536](https://gerrit.lix.systems/c/lix/+/1536)
-
-  Now, when building fixed-output derivations, Lix will guess the URL that was used in the derivation using the `url` or `urls` properties in the derivation environment.
-  This is a layering violation but making these diagnostics tractable when there are multiple instances of the `AAAA` hash is too significant of an improvement to pass it up.
-
-  ```
-  error: hash mismatch in fixed-output derivation '/nix/store/sjfw324j4533lwnpmr5z4icpb85r63ai-x1.drv':
-          likely URL: https://meow.puppy.forge/puppy.tar.gz
-           specified: sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
-              got:    sha256-a1Qvp3FOOkWpL9kFHgugU1ok5UtRPSu+NwCZKbbaEro=
-  ```
-
-  Many thanks to [jade](https://git.lix.systems/jade) for this.
- Add log formats `multiline` and `multiline-with-logs` [cl/1369](https://gerrit.lix.systems/c/lix/+/1369)
-
-  Added two new log formats (`multiline` and `multiline-with-logs`) that display
-  current activities below each other for better visibility.
-
-  These formats attempt to use the maximum available lines
-  (defaulting to 25 if unable to determine) and print up to that many lines.
-  The status bar is displayed as the first line, with each subsequent
-  activity on its own line.
-
-  Many thanks to [kloenk](https://git.lix.systems/kloenk) for this.
- Lix will now show the package descriptions in when running `nix flake show`. [cl/1540](https://gerrit.lix.systems/c/lix/+/1540)
-
-  When running `nix flake show`, Lix will now show the package descriptions, if they exist.
-
-  Before:
-
-  ```shell
-  $ nix flake show
-  path:/home/isabel/dev/lix-show?lastModified=1721736108&narHash=sha256-Zo8HP1ur7Q2b39hKUEG8EAh/opgq8xJ2jvwQ/htwO4Q%3D
-  └───packages
-      └───x86_64-linux
-          ├───aNoDescription: package 'simple'
-          ├───bOneLineDescription: package 'simple'
-          ├───cMultiLineDescription: package 'simple'
-          ├───dLongDescription: package 'simple'
-          └───eEmptyDescription: package 'simple'
-  ```
-
-  After:
-
-  ```shell
-  $ nix flake show
-  path:/home/isabel/dev/lix-show?lastModified=1721736108&narHash=sha256-Zo8HP1ur7Q2b39hKUEG8EAh/opgq8xJ2jvwQ/htwO4Q%3D
-  └───packages
-      └───x86_64-linux
-          ├───aNoDescription: package 'simple'
-          ├───bOneLineDescription: package 'simple' - 'one line'
-          ├───cMultiLineDescription: package 'simple' - 'line one'
-          ├───dLongDescription: package 'simple' - 'abcdefghijklmnopqrstuvwxyz'
-          └───eEmptyDescription: package 'simple'
-  ```
-
-  Many thanks to [kjeremy](https://github.com/kjeremy) and [isabelroses](https://git.lix.systems/isabelroses) for this.
- Eliminate some pretty-printing surprises [#11100](https://github.com/NixOS/nix/pull/11100) [cl/1616](https://gerrit.lix.systems/c/lix/+/1616) [cl/1617](https://gerrit.lix.systems/c/lix/+/1617) [cl/1618](https://gerrit.lix.systems/c/lix/+/1618)
-
-  Some inconsistent and surprising behaviours have been eliminated from the pretty-printing used by the REPL and `nix eval`:
-  * Lists and attribute sets that contain only a single item without nested structures are no longer sometimes inappropriately indented in the REPL, depending on internal state of the evaluator.
-  * Empty attribute sets and derivations are no longer shown as `«repeated»`, since they are always cheap to print.
-    This matches the existing behaviour of `nix-instantiate` on empty attribute sets.
-    Empty lists were never printed as `«repeated»` already.
-  * The REPL by default does not print nested attribute sets and lists, and indicates elided items with an ellipsis.
-    Previously, the ellipsis was printed even when the structure was empty, so that such items do not in fact exist.
-    Since this behaviour was confusing, it does not happen any more.
-
-  Before:
-  ```
-  nix-repl> :p let x = 1 + 2; in [ [ x ] [ x ] ]
-  [
-    [
-      3
-    ]
-    [ 3 ]
-  ]
-
-  nix-repl> let inherit (import <nixpkgs> { }) hello; in [ hello hello ]
-  [
-    «derivation /nix/store/fqs92lzychkm6p37j7fnj4d65nq9fzla-hello-2.12.1.drv»
-    «repeated»
-  ]
-
-  nix-repl> let x = {}; in [ x ]
-  [
-    { ... }
-  ]
-  ```
-
-  After:
-  ```
-  nix-repl> :p let x = 1 + 2; in [ [ x ] [ x ] ]
-  [
-    [ 3 ]
-    [ 3 ]
-  ]
-
-  nix-repl> let inherit (import <nixpkgs> { }) hello; in [ hello hello ]
-  [
-    «derivation /nix/store/fqs92lzychkm6p37j7fnj4d65nq9fzla-hello-2.12.1.drv»
-    «derivation /nix/store/fqs92lzychkm6p37j7fnj4d65nq9fzla-hello-2.12.1.drv»
-  ]
-
-  nix-repl> let x = {}; in [ x ]
-  [
-    { }
-  ]
-  ```
-
-  Many thanks to [alois31](https://git.lix.systems/alois31) and [Robert Hensing](https://github.com/roberth) for this.
- `nix registry add` now requires a shorthand flakeref on the 'from' side [cl/1494](https://gerrit.lix.systems/c/lix/+/1494)
-
-  The 'from' argument must now be a shorthand flakeref like `nixpkgs` or `nixpkgs/nixos-20.03`, making it harder to accidentally swap the 'from' and 'to' arguments.
-
-  Registry entries that map from other flake URLs can still be specified in registry.json, the `nix.registry` option in NixOS, or the `--override-flake` option in the CLI, but they are not guaranteed to work correctly.
-
-  Many thanks to [delan](https://git.lix.systems/delan) for this.
- Allow automatic rejection of configuration options from flakes [cl/1541](https://gerrit.lix.systems/c/lix/+/1541)
-
-  Setting `accept-flake-config` to `false` now respects user choice by automatically rejecting configuration options set by flakes.
-  The old behaviour of asking each time is still available (and default) by setting it to the special value `ask`.
-
-  Many thanks to [alois31](https://git.lix.systems/alois31) for this.
- `nix repl` now allows tab-completing the special repl :colon commands [cl/1367](https://gerrit.lix.systems/c/lix/+/1367)
-
-  The REPL (`nix repl`) supports pressing `<TAB>` to complete a partial expression, but now also supports completing the special :colon commands as well (`:b`, `:edit`, `:doc`, etc), if the line starts with a colon.
-
-  Many thanks to [Qyriad](https://git.lix.systems/Qyriad) for this.
- `:edit`ing a file in Nix store no longer reloads the repl [fj#341](https://git.lix.systems/lix-project/lix/issues/341) [cl/1620](https://gerrit.lix.systems/c/lix/+/1620)
-
-  Calling `:edit` from the repl now only reloads if the file being edited was outside of Nix store.
-  That means that all the local variables are now preserved across `:edit`s of store paths.
-  This is always safe because the store is read-only.
-
-  Many thanks to [goldstein](https://git.lix.systems/goldstein) for this.
- `:log` in repl now works on derivation paths [fj#51](https://git.lix.systems/lix-project/lix/issues/51) [cl/1716](https://gerrit.lix.systems/c/lix/+/1716)
-
-  `:log` can now accept store derivation paths in addition to derivation expressions.
-
-  Many thanks to [goldstein](https://git.lix.systems/goldstein) for this.
-
-## Fixes
- Define integer overflow in the Nix language as an error [fj#423](https://git.lix.systems/lix-project/lix/issues/423) [cl/1594](https://gerrit.lix.systems/c/lix/+/1594) [cl/1595](https://gerrit.lix.systems/c/lix/+/1595) [cl/1597](https://gerrit.lix.systems/c/lix/+/1597) [cl/1609](https://gerrit.lix.systems/c/lix/+/1609)
-
-  Previously, integer overflow in the Nix language invoked C++ level signed overflow, which was undefined behaviour, but *probably* manifested as wrapping around on overflow.
-
-  Since prior to the public release of Lix, Lix had C++ signed overflow defined to crash the process and nobody noticed this having accidentally removed overflow from the Nix language for three months until it was caught by fiddling around.
-  Given the significant body of actual Nix code that has been evaluated by Lix in that time, it does not appear that nixpkgs or much of importance depends on integer overflow, so it is safe to turn into an error.
-
-  Some other overflows were fixed:
-  - `builtins.fromJSON` of values greater than the maximum representable value in a signed 64-bit integer will generate an error.
-  - `nixConfig` in flakes will no longer accept negative values for configuration options.
-
-  Integer overflow now looks like the following:
-
-  ```
-  » nix eval --expr '9223372036854775807 + 1'
-  error: integer overflow in adding 9223372036854775807 + 1
-  ```
-
-  Many thanks to [jade](https://git.lix.systems/jade) for this.
- Fix nix-collect-garbage --dry-run [fj#432](https://git.lix.systems/lix-project/lix/issues/432) [cl/1566](https://gerrit.lix.systems/c/lix/+/1566)
-
-  `nix-collect-garbage --dry-run` did not previously give any output - it simply
-  exited without even checking to see what paths would be deleted.
-
-  ```
-  $ nix-collect-garbage --dry-run
-  $
-  ```
-
-  We updated the behaviour of the flag such that instead it prints out how many
-  paths it *would* delete, but doesn't actually delete them.
-
-  ```
-  $ nix-collect-garbage --dry-run
-  finding garbage collector roots...
-  determining live/dead paths...
-  ...
-  <nix store paths>
-  ...
-  2670 store paths deleted, 0.00MiB freed
-  $
-  ```
-
-  Many thanks to [Quantum Jump](https://github.com/QuantumBJump) for this.
- Fix unexpectedly-successful GC failures on macOS [fj#446](https://git.lix.systems/lix-project/lix/issues/446) [cl/1723](https://gerrit.lix.systems/c/lix/+/1723)
-
-  Has the following happened to you on macOS? This failure has been successfully eliminated, thanks to our successful deployment of advanced successful-failure detection technology (it's just `if (failed && errno == 0)`. Patent pending<sup>not really</sup>):
-
-  ```
-  $ nix-store --gc --print-dead
-  finding garbage collector roots...
-  error: Listing pid 87261 file descriptors: Undefined error: 0
-  ```
-
-  Many thanks to [jade](https://git.lix.systems/jade) for this.
- `nix copy` is now several times faster at `querying info about /nix/store/...` [fj#366](https://git.lix.systems/lix-project/lix/issues/366) [cl/1462](https://gerrit.lix.systems/c/lix/+/1462)
-
-  We fixed a locking bug that serialized `querying info about /nix/store/...`
-  onto just one thread such that it was eating `O(paths to copy * latency)` time
-  while setting up to copy paths to s3 and other stores. It is now `nproc` times
-  faster.
-
-  Many thanks to [jade](https://git.lix.systems/jade) for this.
-
-## Development
- clang-tidy support [fj#147](https://git.lix.systems/lix-project/lix/issues/147) [cl/1697](https://gerrit.lix.systems/c/lix/+/1697)
-
-  `clang-tidy` can be used to lint Lix with a limited set of lints using `ninja -C build clang-tidy` and `ninja -C build clang-tidy-fix`.
-  In practice, this fixes the built-in meson rule that was used the same as above being broken ever since precompiled headers were introduced.
-
-  Many thanks to [jade](https://git.lix.systems/jade) for this.
- Lix now supports building with UndefinedBehaviorSanitizer [cl/1483](https://gerrit.lix.systems/c/lix/+/1483) [cl/1481](https://gerrit.lix.systems/c/lix/+/1481) [cl/1669](https://gerrit.lix.systems/c/lix/+/1669)
-
-  You can now build Lix with the configuration option `-Db_sanitize=undefined,address` and it will both work and pass tests with both AddressSanitizer and UndefinedBehaviorSanitizer enabled.
-  To use ASan specifically, you have to set `-Dgc=disabled`, which an error message will tell you to do if necessary anyhow.
-
-  Furthermore, tests passing with Clang ASan+UBSan is checked on every change in CI.
-
-  For a list of undefined behaviour found by tooling usage, see [the gerrit topic "undefined-behaviour"](https://gerrit.lix.systems/q/topic:%22undefined-behaviour%22).
-
-  Many thanks to [jade](https://git.lix.systems/jade) for this.
@@ -0,0 +1,139 @@
+with builtins;
+
+rec {
+  splitLines = s: filter (x: !isList x) (split "\n" s);
+
+  concatStrings = concatStringsSep "";
+
+  attrsToList =
+    a:
+    map (name: {
+      inherit name;
+      value = a.${name};
+    }) (builtins.attrNames a);
+
+  replaceStringsRec =
+    from: to: string:
+    # recursively replace occurrences of `from` with `to` within `string`
+    # example:
+    #     replaceStringRec "--" "-" "hello-----world"
+    #     => "hello-world"
+    let
+      replaced = replaceStrings [ from ] [ to ] string;
+    in
+    if replaced == string then string else replaceStringsRec from to replaced;
+
+  squash = replaceStringsRec "\n\n\n" "\n\n";
+
+  trim =
+    string:
+    # trim trailing spaces and squash non-leading spaces
+    let
+      trimLine =
+        line:
+        let
+          # separate leading spaces from the rest
+          parts = split "(^ *)" line;
+          spaces = head (elemAt parts 1);
+          rest = elemAt parts 2;
+          # drop trailing spaces
+          body = head (split " *$" rest);
+        in
+        spaces + replaceStringsRec "  " " " body;
+    in
+    concatStringsSep "\n" (map trimLine (splitLines string));
+
+  # FIXME: O(n^2)
+  unique = foldl' (acc: e: if elem e acc then acc else acc ++ [ e ]) [ ];
+
+  nameValuePair = name: value: { inherit name value; };
+
+  filterAttrs =
+    pred: set:
+    listToAttrs (
+      concatMap (
+        name:
+        let
+          v = set.${name};
+        in
+        if pred name v then [ (nameValuePair name v) ] else [ ]
+      ) (attrNames set)
+    );
+
+  optionalString = cond: string: if cond then string else "";
+
+  showSetting =
+    { inlineHTML }:
+    name:
+    {
+      description,
+      documentDefault,
+      defaultValue,
+      aliases,
+      value,
+      experimentalFeature,
+    }:
+    let
+      result = squash ''
+        - ${
+          if inlineHTML then ''<span id="conf-${name}">[`${name}`](#conf-${name})</span>'' else ''`${name}`''
+        }
+
+        ${indent "  " body}
+      '';
+
+      experimentalFeatureNote = optionalString (experimentalFeature != null) ''
+        > **Warning**
+        > This setting is part of an
+        > [experimental feature](@docroot@/contributing/experimental-features.md).
+
+        To change this setting, you need to make sure the corresponding experimental feature,
+        [`${experimentalFeature}`](@docroot@/contributing/experimental-features.md#xp-feature-${experimentalFeature}),
+        is enabled.
+        For example, include the following in [`nix.conf`](#):
+
+        ```
+        extra-experimental-features = ${experimentalFeature}
+        ${name} = ...
+        ```
+      '';
+
+      # separate body to cleanly handle indentation
+      body = ''
+        ${description}
+
+        ${experimentalFeatureNote}
+
+        **Default:** ${showDefault documentDefault defaultValue}
+
+        ${showAliases aliases}
+      '';
+
+      showDefault =
+        documentDefault: defaultValue:
+        if documentDefault then
+          # a StringMap value type is specified as a string, but
+          # this shows the value type. The empty stringmap is `null` in
+          # JSON, but that converts to `{ }` here.
+          if defaultValue == "" || defaultValue == [ ] || isAttrs defaultValue then
+            "*empty*"
+          else if isBool defaultValue then
+            if defaultValue then "`true`" else "`false`"
+          else
+            "`${toString defaultValue}`"
+        else
+          "*machine-specific*";
+
+      showAliases =
+        aliases:
+        optionalString (aliases != [ ])
+          "**Deprecated alias:** ${(concatStringsSep ", " (map (s: "`${s}`") aliases))}";
+    in
+    result;
+
+  indent =
+    prefix: s: concatStringsSep "\n" (map (x: if x == "" then x else "${prefix}${x}") (splitLines s));
+
+  showSettings =
+    args: settingsInfo: concatStrings (attrValues (mapAttrs (showSetting args) settingsInfo));
+}
@@ -19,11 +19,11 @@
    "nix2container": {
      "flake": false,
      "locked": {
-        "lastModified": 1724996935,
-        "narHash": "sha256-njRK9vvZ1JJsP8oV2OgkBrpJhgQezI03S7gzskCcHos=",
+        "lastModified": 1712990762,
+        "narHash": "sha256-hO9W3w7NcnYeX8u8cleHiSpK2YJo7ecarFTUlbybl7k=",
        "owner": "nlewo",
        "repo": "nix2container",
-        "rev": "fa6bb0a1159f55d071ba99331355955ae30b3401",
+        "rev": "20aad300c925639d5d6cbe30013c8357ce9f2a2e",
        "type": "github"
      },
      "original": {
@@ -34,11 +34,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1727184566,
-        "narHash": "sha256-mgdK8BcFsLSNhe780+cHbEUbZ3OruLa1T/xgQlL4Aj4=",
+        "lastModified": 1718111384,
+        "narHash": "sha256-7tSst0S5FOmcgvNtfy6cjZX5w8CabCVAfAeCkhY4OVg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "48c3030083c46042584531bc9d931020f1975677",
+        "rev": "a508a44af0c1b1b57785c34d8b54783536273eeb",
        "type": "github"
      },
      "original": {
@@ -67,11 +67,11 @@
    "pre-commit-hooks": {
      "flake": false,
      "locked": {
-        "lastModified": 1726745158,
-        "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=",
+        "lastModified": 1712055707,
+        "narHash": "sha256-4XLvuSIDZJGS17xEwSrNuJLL7UjDYKGJSbK1WWX2AK8=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
+        "rev": "e35aed5fda3cc79f88ed7f1795021e559582093a",
        "type": "github"
      },
      "original": {
@@ -1,5 +1,5 @@
 {
-  description = "Lix: A modern, delicious implementation of the Nix package manager";
+  description = "The purely functional package manager";

  inputs = {
    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05-small";
@@ -33,7 +33,7 @@

      # This notice gets echoed as a dev shell hook, and can be turned off with
      # `touch .nocontribmsg`
-      sgr = builtins.fromJSON ''"\u001b["'';
+      sgr = ''['';
      freezePage = "https://wiki.lix.systems/books/lix-contributors/page/freezes-and-recommended-contributions";
      codebaseOverview = "https://wiki.lix.systems/books/lix-contributors/page/codebase-overview";
      contribNotice = builtins.toFile "lix-contrib-notice" ''
@@ -59,8 +59,7 @@
        (Run `touch .nocontribmsg` to hide this message.)
      '';

-      versionJson = builtins.fromJSON (builtins.readFile ./version.json);
-      officialRelease = versionJson.official_release;
+      officialRelease = true;

      # Set to true to build the release notes for the next release.
      buildUnreleasedNotes = true;
@@ -85,13 +84,10 @@
      ];
      systems = linuxSystems ++ darwinSystems;

-      # If you add something here, please update the list in doc/manual/src/contributing/hacking.md.
-      # Thanks~
      crossSystems = [
        "armv6l-linux"
        "armv7l-linux"
        "riscv64-linux"
-        "aarch64-linux"
        # FIXME: still broken in 24.05: fails to build rustc(??) due to missing -lstdc++ dep
        # "x86_64-freebsd"
        # FIXME: broken dev shell due to python
@@ -99,10 +95,9 @@
      ];

      stdenvs = [
-        # see assertion in package.nix why these two are disabled
-        # "stdenv"
-        # "gccStdenv"
+        "gccStdenv"
        "clangStdenv"
+        "stdenv"
        "libcxxStdenv"
        "ccacheStdenv"
      ];
@@ -122,11 +117,7 @@
            name = "${stdenvName}Packages";
            value = f stdenvName;
          }) stdenvs
-        )
-        // {
-          # TODO delete this and reënable gcc stdenvs once gcc compiles kj coros correctly
-          stdenvPackages = f "clangStdenv";
-        };
+        );

      # Memoize nixpkgs for different platforms for efficiency.
      nixpkgsFor = forAllSystems (
@@ -138,8 +129,18 @@
              localSystem = {
                inherit system;
              };
-              crossSystem = if crossSystem == null then null else { system = crossSystem; };
-              overlays = [ (overlayFor (p: p.${stdenv})) ];
+              crossSystem =
+                if crossSystem == null then
+                  null
+                else
+                  {
+                    system = crossSystem;
+                  }
+                  // lib.optionalAttrs (crossSystem == "x86_64-freebsd") { useLLVM = true; };
+              overlays = [
+                (overlayFor (p: p.${stdenv}))
+                (final: prev: { nixfmt = final.callPackage ./nix-support/nixfmt.nix { }; })
+              ];
            };
          stdenvs = forAllStdenvs (make-pkgs null);
          native = stdenvs.stdenvPackages;
@@ -147,7 +148,7 @@
        {
          inherit stdenvs native;
          static = native.pkgsStatic;
-          cross = forAllCrossSystems (crossSystem: make-pkgs crossSystem "clangStdenv");
+          cross = forAllCrossSystems (crossSystem: make-pkgs crossSystem "stdenv");
        }
      );

@@ -163,7 +164,6 @@
          nixUnstable = prev.nixUnstable;

          check-headers = final.buildPackages.callPackage ./maintainers/check-headers.nix { };
-          check-syscalls = final.buildPackages.callPackage ./maintainers/check-syscalls.nix { };

          default-busybox-sandbox-shell = final.busybox.override {
            useMusl = true;
@@ -195,22 +195,17 @@
            busybox-sandbox-shell = final.busybox-sandbox-shell or final.default-busybox-sandbox-shell;
          };

-          lix-clang-tidy = final.callPackage ./subprojects/lix-clang-tidy { };
-
          # Export the patched version of boehmgc that Lix uses into the overlay
          # for consumers of this flake.
-          boehmgc-nix = final.nix.passthru.boehmgc-nix;
+          boehmgc-nix = final.nix.boehmgc-nix;
          # And same thing for our build-release-notes package.
-          build-release-notes = final.nix.passthru.build-release-notes;
+          build-release-notes = final.nix.build-release-notes;
        };
    in
    {
-      # for repl debugging
-      inherit self;
-
      # A Nixpkgs overlay that overrides the 'nix' and
      # 'nix.perl-bindings' packages.
-      overlays.default = overlayFor (p: p.clangStdenv);
+      overlays.default = overlayFor (p: p.stdenv);

      hydraJobs = {
        # Binary package for various platforms.
@@ -238,11 +233,6 @@
          }
        );

-        # Completion tests for the Nix REPL.
-        repl-completion = forAllSystems (
-          system: nixpkgsFor.${system}.native.callPackage ./tests/repl-completion.nix { }
-        );
-
        # Perl bindings for various platforms.
        perlBindings = forAllSystems (system: nixpkgsFor.${system}.native.nix.passthru.perl-bindings);

@@ -262,8 +252,6 @@
            nix = pkgs.callPackage ./package.nix {
              inherit versionSuffix officialRelease buildUnreleasedNotes;
              inherit (pkgs) build-release-notes;
-              # Required since we don't support gcc stdenv
-              stdenv = pkgs.clangStdenv;
              internalApiDocs = true;
              busybox-sandbox-shell = pkgs.busybox-sandbox-shell;
            };
@@ -278,54 +266,6 @@

        # System tests.
        tests = import ./tests/nixos { inherit lib nixpkgs nixpkgsFor; } // {
-          # This is x86_64-linux only, just because we have significantly
-          # cheaper x86_64-linux compute in CI.
-          # It is clangStdenv because clang's sanitizers are nicer.
-          asanBuild = self.packages.x86_64-linux.nix-clangStdenv.override {
-            # Improve caching of non-code changes by not changing the
-            # derivation name every single time, since this will never be seen
-            # by users anyway.
-            versionSuffix = "";
-            sanitize = [
-              "address"
-              "undefined"
-            ];
-            # it is very hard to make *every* CI build use this option such
-            # that we don't wind up building Lix twice, so we do it here where
-            # we are already doing so.
-            werror = true;
-          };
-
-          # Although this might be nicer to do with pre-commit, that would
-          # require adding 12MB of nodejs to the dev shell, whereas building it
-          # in CI with Nix avoids that at a cost of slower feedback on rarely
-          # touched files.
-          jsSyntaxCheck =
-            let
-              nixpkgs = nixpkgsFor.x86_64-linux.native;
-              inherit (nixpkgs) pkgs;
-              docSources = lib.fileset.toSource {
-                root = ./doc;
-                fileset = lib.fileset.fileFilter (f: f.hasExt "js") ./doc;
-              };
-            in
-            pkgs.runCommand "js-syntax-check" { } ''
-              find ${docSources} -type f -print -exec ${pkgs.nodejs-slim}/bin/node --check '{}' ';'
-              touch $out
-            '';
-
-          # clang-tidy run against the Lix codebase using the Lix clang-tidy plugin
-          clang-tidy =
-            let
-              nixpkgs = nixpkgsFor.x86_64-linux.native;
-              inherit (nixpkgs) pkgs;
-            in
-            pkgs.callPackage ./package.nix {
-              # Required since we don't support gcc stdenv
-              stdenv = pkgs.clangStdenv;
-              versionSuffix = "";
-              lintInsteadOfBuild = true;
-            };

          # Make sure that nix-env still produces the exact same result
          # on a particular version of Nixpkgs.
@@ -376,25 +316,6 @@
        pkgs = nixpkgsFor.x86_64-linux.native;
      };

-      releaseTests = lib.foldl lib.recursiveUpdate { } [
-        (lib.genAttrs (linux64BitSystems ++ darwinSystems) (system: {
-          nativeBuild = self.packages.${system}.nix;
-        }))
-        (lib.genAttrs (linux64BitSystems) (system: {
-          staticBuild = self.packages.${system}.nix-static;
-        }))
-        {
-          x86_64-linux = {
-            # TODO add more cross/static release targets?
-            crossBuild.aarch64-linux = self.packages.x86_64-linux.nix-aarch64-linux;
-
-            # TODO wire up a nixos installer test with that lix and
-            # run it, once nixpkgs can actually do that (again). :/
-            # # nix build .#nixosTests.installer.{btrfsSimple,luksroot,lvm,simple,switchToFlake}
-          };
-        }
-      ];
-
      # 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 = forAvailableSystems (
@@ -409,7 +330,6 @@
          rl-next = self.hydraJobs.rl-next.${system}.user;
          # Will be empty attr set on i686-linux, and filtered out by forAvailableSystems.
          pre-commit = self.hydraJobs.pre-commit.${system};
-          repl-completion = self.hydraJobs.repl-completion.${system};
        }
        // (lib.optionalAttrs (builtins.elem system linux64BitSystems)) {
          dockerImage = self.hydraJobs.dockerImage.${system};
@@ -421,8 +341,6 @@
        rec {
          inherit (nixpkgsFor.${system}.native) nix;
          default = nix;
-
-          inherit (nixpkgsFor.${system}.native) lix-clang-tidy;
        }
        // (
          lib.optionalAttrs (builtins.elem system linux64BitSystems) {
@@ -459,9 +377,9 @@
            pkgs: stdenv:
            let
              nix = pkgs.callPackage ./package.nix {
-                inherit stdenv versionSuffix;
+                inherit stdenv officialRelease versionSuffix;
                busybox-sandbox-shell = pkgs.busybox-sandbox-shell or pkgs.default-busybox-sandbox;
-                internalApiDocs = false;
+                internalApiDocs = true;
              };
              pre-commit = self.hydraJobs.pre-commit.${pkgs.system} or { };
            in
@@ -486,10 +404,10 @@
            let
              pkgs = nixpkgsFor.${system}.cross.${crossSystem};
            in
-            makeShell pkgs pkgs.clangStdenv
+            makeShell pkgs pkgs.stdenv
          ))
          // {
-            default = self.devShells.${system}.native-clangStdenvPackages;
+            default = self.devShells.${system}.native-stdenvPackages;
          }
        );
    };
@@ -9,8 +9,8 @@ clean:
    rm -rf build

 # Prepare meson for building
-setup *OPTIONS:
-    meson setup build --prefix="$PWD/outputs/out" $mesonFlags {{ OPTIONS }}
+setup:
+    meson setup build --prefix="$PWD/outputs/out"

 # Build lix
 build *OPTIONS:
@@ -25,13 +25,3 @@ install *OPTIONS: (build OPTIONS)
 # Run tests
 test *OPTIONS:
    meson test -C build --print-errorlogs {{ OPTIONS }}
-
-alias clang-tidy := lint
-
-lint:
-    ninja -C build clang-tidy
-
-alias clang-tidy-fix := lint-fix
-
-lint-fix:
-    ninja -C build clang-tidy-fix
@@ -0,0 +1,161 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "cbitset"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29b6ad25ae296159fb0da12b970b2fe179b234584d7cd294c891e2bbb284466b"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "dissimilar"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632"
+
+[[package]]
+name = "expect-test"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30d9eafeadd538e68fb28016364c9732d78e420b9ff8853fa5e4058861e9f8d3"
+dependencies = [
+ "dissimilar",
+ "once_cell",
+]
+
+[[package]]
+name = "lix-doc"
+version = "0.0.1"
+dependencies = [
+ "expect-test",
+ "rnix",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rnix"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a9b645f0edba447dbfc6473dd22999f46a1d00ab39e777a2713a1cf34a1597b"
+dependencies = [
+ "cbitset",
+ "rowan",
+]
+
+[[package]]
+name = "rowan"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ea7cadf87a9d8432e85cb4eb86bd2e765ace60c24ef86e79084dcae5d1c5a19"
+dependencies = [
+ "rustc-hash",
+ "smol_str",
+ "text_unit",
+ "thin-dst",
+]
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "serde"
+version = "1.0.197"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.197"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "smol_str"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fad6c857cbab2627dcf01ec85a623ca4e7dcb5691cbaa3d7fb7653671f0d09c9"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.53"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "text_unit"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20431e104bfecc1a40872578dbc390e10290a0e9c35fffe3ce6f73c15a9dbfc2"
+
+[[package]]
+name = "thin-dst"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db3c46be180f1af9673ebb27bc1235396f61ef6965b3fe0dbb2e624deb604f0e"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
@@ -1,6 +1,6 @@
 [package]
 description = "Nix function documentation tool, stripped down into a library"
-edition = "2021"
+edition = "2018"
 name = "lix-doc"
 version = "0.0.1"
 license = "BSD-2-Clause OR MIT"
@@ -8,10 +8,11 @@ license = "BSD-2-Clause OR MIT"
 homepage = "https://github.com/lf-/nix-doc"
 repository = "https://github.com/lf-/nix-doc"

+[lib]
+crate_type = ["staticlib"]
+
 [dependencies]
-rnix = "0.11.0"
-# Necessary because rnix fails to export a critical trait (Rowan's AstNode).
-rowan = "0.15.16"
+rnix = "0.8.0"

 [dev-dependencies]
 expect-test = "1.1.0"
@@ -0,0 +1,338 @@
+// SPDX-FileCopyrightText: 2024 Jade Lovelace
+//
+// SPDX-License-Identifier: BSD-2-Clause OR MIT
+
+//! library components of nix-doc
+pub mod pprint;
+
+use crate::pprint::pprint_args;
+
+use rnix::types::{Lambda, TypedNode};
+use rnix::SyntaxKind::*;
+use rnix::{NodeOrToken, SyntaxNode, TextUnit, WalkEvent};
+
+use std::ffi::{CStr, CString};
+use std::fs;
+use std::iter;
+use std::os::raw::c_char;
+use std::panic;
+
+use std::ptr;
+
+use std::{fmt::Display, str};
+
+pub type Result<T> = std::result::Result<T, Box<dyn std::error::Error>>;
+
+const DOC_INDENT: usize = 3;
+
+struct SearchResult {
+    /// Name of the function
+    identifier: String,
+
+    /// Dedented documentation comments
+    doc: String,
+
+    /// Parameter block for the function
+    param_block: String,
+}
+
+fn find_pos(file: &str, line: usize, col: usize) -> usize {
+    let mut lines = 1;
+    let mut line_start = 0;
+    let mut it = file.chars().enumerate().peekable();
+    while let Some((count, ch)) = it.next() {
+        if ch == '\n' || ch == '\r' {
+            lines += 1;
+            let addend = if ch == '\r' && it.peek().map(|x| x.1) == Some('\n') {
+                it.next();
+                1
+            } else {
+                0
+            };
+            line_start = count + addend;
+        }
+
+        let col_diff = ((count as i32) - (line_start as i32)).abs() as usize;
+        if lines == line && col_diff == col {
+            return count;
+        }
+    }
+    unreachable!();
+}
+
+impl SearchResult {
+    fn format<P: Display>(&self, filename: P, line: usize) -> String {
+        format!(
+            "**Synopsis:** `{}` = {}\n\n{}\n\n# {}",
+            self.identifier.as_str(),
+            self.param_block,
+            indented(&self.doc, DOC_INDENT),
+            format!("{}:{}", filename, line).as_str(),
+        )
+    }
+}
+
+/// Emits a string `s` indented by `indent` spaces
+fn indented(s: &str, indent: usize) -> String {
+    let indent_s = iter::repeat(' ').take(indent).collect::<String>();
+    s.split('\n')
+        .map(|line| indent_s.clone() + line)
+        .collect::<Vec<_>>()
+        .join("\n")
+}
+
+/// Cleans up a single line, erasing prefix single line comments but preserving indentation
+fn cleanup_single_line<'a>(s: &'a str) -> &'a str {
+    let mut cmt_new_start = 0;
+    let mut iter = s.char_indices().peekable();
+    while let Some((idx, ch)) = iter.next() {
+        // peek at the next character, with an explicit '\n' as "next character" at end of line
+        let (_, next_ch) = iter.peek().unwrap_or(&(0, '\n'));
+
+        // if we find a character, save the byte position after it as our new string start
+        if ch == '#' || (ch == '*' && next_ch.is_whitespace()) {
+            cmt_new_start = idx + 1;
+            break;
+        }
+        // if, instead, we are on a line with no starting comment characters, leave it alone as it
+        // will be handled by dedent later
+        if !ch.is_whitespace() {
+            break;
+        }
+    }
+    &s[cmt_new_start..]
+}
+
+/// Erases indents in comments. This is *almost* a normal dedent function, but it starts by looking
+/// at the second line if it can.
+fn dedent_comment(s: &str) -> String {
+    let mut whitespaces = 0;
+    let mut lines = s.lines();
+    let first = lines.next();
+
+    // scan for whitespace
+    for line in lines.chain(first) {
+        let line_whitespace = line.chars().take_while(|ch| ch.is_whitespace()).count();
+
+        if line_whitespace != line.len() {
+            // a non-whitespace line, perfect for taking whitespace off of
+            whitespaces = line_whitespace;
+            break;
+        }
+    }
+
+    // maybe the first considered line we found was indented further, so let's look for more lines
+    // that might have a shorter indent. In the case of one line, do nothing.
+    for line in s.lines().skip(1) {
+        let line_whitespace = line.chars().take_while(|ch| ch.is_whitespace()).count();
+
+        if line_whitespace != line.len() {
+            whitespaces = line_whitespace.min(whitespaces);
+        }
+    }
+
+    // delete up to `whitespaces` whitespace characters from each line and reconstitute the string
+    let mut out = String::new();
+    for line in s.lines() {
+        let content_begin = line.find(|ch: char| !ch.is_whitespace()).unwrap_or(0);
+        out.push_str(&line[content_begin.min(whitespaces)..]);
+        out.push('\n');
+    }
+
+    out.truncate(out.trim_end_matches('\n').len());
+    out
+}
+
+/// Deletes whitespace and leading comment characters
+///
+/// Oversight we are choosing to ignore: if you put # characters at the beginning of lines in a
+/// multiline comment, they will be deleted.
+fn cleanup_comments<S: AsRef<str>, I: DoubleEndedIterator<Item = S>>(comment: &mut I) -> String {
+    dedent_comment(
+        &comment
+            .rev()
+            .map(|small_comment| {
+                small_comment
+                    .as_ref()
+                    // space before multiline start
+                    .trim_start()
+                    // multiline starts
+                    .trim_start_matches("/*")
+                    // trailing so we can grab multiline end
+                    .trim_end()
+                    // multiline ends
+                    .trim_end_matches("*/")
+                    // extra space that was in the multiline
+                    .trim()
+                    .split('\n')
+                    // erase single line comments and such
+                    .map(cleanup_single_line)
+                    .collect::<Vec<_>>()
+                    .join("\n")
+            })
+            .collect::<Vec<_>>()
+            .join("\n"),
+    )
+}
+
+/// Get the docs for a specific function
+pub fn get_function_docs(filename: &str, line: usize, col: usize) -> Option<String> {
+    let content = fs::read(filename).ok()?;
+    let decoded = str::from_utf8(&content).ok()?;
+    let pos = find_pos(&decoded, line, col);
+    let rowan_pos = TextUnit::from_usize(pos);
+    let tree = rnix::parse(decoded);
+
+    let mut lambda = None;
+    for node in tree.node().preorder() {
+        match node {
+            WalkEvent::Enter(n) => {
+                if n.text_range().start() >= rowan_pos && n.kind() == NODE_LAMBDA {
+                    lambda = Lambda::cast(n);
+                    break;
+                }
+            }
+            WalkEvent::Leave(_) => (),
+        }
+    }
+    let lambda = lambda?;
+    let res = visit_lambda("func".to_string(), &lambda);
+    Some(res.format(filename, line))
+}
+
+fn visit_lambda(name: String, lambda: &Lambda) -> SearchResult {
+    // grab the arguments
+    let param_block = pprint_args(&lambda);
+
+    // find the doc comment
+    let comment = find_comment(lambda.node().clone()).unwrap_or_else(|| "".to_string());
+
+    SearchResult {
+        identifier: name,
+        doc: comment,
+        param_block,
+    }
+}
+
+fn find_comment(node: SyntaxNode) -> Option<String> {
+    let mut node = NodeOrToken::Node(node);
+    let mut comments = Vec::new();
+    loop {
+        loop {
+            if let Some(new) = node.prev_sibling_or_token() {
+                node = new;
+                break;
+            } else {
+                node = NodeOrToken::Node(node.parent()?);
+            }
+        }
+
+        match node.kind() {
+            TOKEN_COMMENT => match &node {
+                NodeOrToken::Token(token) => comments.push(token.text().clone()),
+                NodeOrToken::Node(_) => unreachable!(),
+            },
+            // This stuff is found as part of `the-fn = f: ...`
+            // here:                           ^^^^^^^^
+            NODE_KEY | TOKEN_ASSIGN => (),
+            t if t.is_trivia() => (),
+            _ => break,
+        }
+    }
+    let doc = cleanup_comments(&mut comments.iter().map(|c| c.as_str()));
+    Some(doc).filter(|it| !it.is_empty())
+}
+
+/// Get the docs for a function in the given file path at the given file position and return it as
+/// a C string pointer
+#[no_mangle]
+pub extern "C" fn nd_get_function_docs(
+    filename: *const c_char,
+    line: usize,
+    col: usize,
+) -> *const c_char {
+    let fname = unsafe { CStr::from_ptr(filename) };
+    fname
+        .to_str()
+        .ok()
+        .and_then(|f| {
+            panic::catch_unwind(|| get_function_docs(f, line, col))
+                .map_err(|e| {
+                    eprintln!("panic!! {:#?}", e);
+                    e
+                })
+                .ok()
+        })
+        .flatten()
+        .and_then(|s| CString::new(s).ok())
+        .map(|s| s.into_raw() as *const c_char)
+        .unwrap_or(ptr::null())
+}
+
+/// Call this to free a string from nd_get_function_docs
+#[no_mangle]
+pub extern "C" fn nd_free_string(s: *const c_char) {
+    unsafe {
+        // cast note: this cast is turning something that was cast to const
+        // back to mut
+        drop(CString::from_raw(s as *mut c_char));
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_bytepos() {
+        let fakefile = "abc\ndef\nghi";
+        assert_eq!(find_pos(fakefile, 2, 2), 5);
+    }
+
+    #[test]
+    fn test_bytepos_cursed() {
+        let fakefile = "abc\rdef\r\nghi";
+        assert_eq!(find_pos(fakefile, 2, 2), 5);
+        assert_eq!(find_pos(fakefile, 3, 2), 10);
+    }
+
+    #[test]
+    fn test_comment_stripping() {
+        let ex1 = ["/* blah blah blah\n      foooo baaar\n   blah */"];
+        assert_eq!(
+            cleanup_comments(&mut ex1.iter()),
+            "blah blah blah\n   foooo baaar\nblah"
+        );
+
+        let ex2 = ["# a1", "#    a2", "# aa"];
+        assert_eq!(cleanup_comments(&mut ex2.iter()), "aa\n   a2\na1");
+    }
+
+    #[test]
+    fn test_dedent() {
+        let ex1 = "a\n   b\n   c\n     d";
+        assert_eq!(dedent_comment(ex1), "a\nb\nc\n  d");
+        let ex2 = "a\nb\nc";
+        assert_eq!(dedent_comment(ex2), ex2);
+        let ex3 = "   a\n   b\n\n     c";
+        assert_eq!(dedent_comment(ex3), "a\nb\n\n  c");
+    }
+
+    #[test]
+    fn test_single_line_comment_stripping() {
+        let ex1 = "    * a";
+        let ex2 = "    # a";
+        let ex3 = "   a";
+        let ex4 = "   *";
+        assert_eq!(cleanup_single_line(ex1), " a");
+        assert_eq!(cleanup_single_line(ex2), " a");
+        assert_eq!(cleanup_single_line(ex3), ex3);
+        assert_eq!(cleanup_single_line(ex4), "");
+    }
+
+    #[test]
+    fn test_single_line_retains_bold_headings() {
+        let ex1 = "   **Foo**:";
+        assert_eq!(cleanup_single_line(ex1), ex1);
+    }
+}
@@ -0,0 +1,40 @@
+// SPDX-FileCopyrightText: 2024 Jade Lovelace
+//
+// SPDX-License-Identifier: BSD-2-Clause OR MIT
+
+use rnix::types::{Lambda, TypedNode};
+use rnix::SyntaxKind::*;
+
+/// Pretty-prints the arguments to a function
+pub fn pprint_args(lambda: &Lambda) -> String {
+    // TODO: handle docs directly on NODE_IDENT args (uncommon case)
+    let mut lambda = lambda.clone();
+    let mut out = String::new();
+    loop {
+        let arg = lambda.arg().unwrap();
+        match arg.kind() {
+            NODE_IDENT => {
+                out += &format!("*{}*", &arg.to_string());
+                out.push_str(": ");
+                let body = lambda.body().unwrap();
+                if body.kind() == NODE_LAMBDA {
+                    lambda = Lambda::cast(body).unwrap();
+                } else {
+                    break;
+                }
+            }
+            NODE_PATTERN => {
+                out += &format!("*{}*", &arg.to_string());
+                out.push_str(": ");
+                break;
+            }
+            t => {
+                unreachable!("unhandled arg type {:?}", t);
+            }
+        }
+    }
+    out.push_str("...");
+    out
+
+    //pprint_arg(lambda.arg());
+}
@@ -1,17 +0,0 @@
-/// @file This is very bothersome code that has to be included in every
-/// executable to get the correct default ASan options. I am so sorry.
-
-extern "C" [[gnu::retain]] const char *__asan_default_options()
-{
-    // We leak a bunch of memory knowingly on purpose. It's not worthwhile to
-    // diagnose that memory being leaked for now.
-    //
-    // Instruction bytes are useful for finding the actual code that
-    // corresponds to an ASan report.
-    //
-    // TODO: setting log_path=asan.log or not: neither works, since you can't
-    // write to the fs in certain places in the testsuite, but you also cannot
-    // write arbitrarily to stderr in other places so the reports get eaten.
-    // pain 🥖
-    return "halt_on_error=1:abort_on_error=1:detect_leaks=0:print_summary=1:dump_instruction_bytes=1";
-}
@@ -1,93 +0,0 @@
-from typing import List, NamedTuple
-
-from common import cxx_literal, generate_file, load_data
-
-KNOWN_KEYS = set([
-    'name',
-    'type',
-    'constructorArgs',
-    'implementation',
-    'impure',
-    'renameInGlobalScope',
-])
-
-class BuiltinConstant(NamedTuple):
-    name: str
-    type: str
-    implementation: str
-    impure: bool
-    rename_in_global_scope: bool
-    documentation: str
-
-    def parse(datum):
-        unknown_keys = set(datum.keys()) - KNOWN_KEYS
-        if unknown_keys:
-            raise Exception('unknown keys', unknown_keys)
-        return BuiltinConstant(
-            name = datum['name'],
-            type = datum['type'],
-            implementation = ('{' + ', '.join([f'NewValueAs::{datum["type"]}', *datum['constructorArgs']]) + '}') if 'constructorArgs' in datum else datum['implementation'],
-            impure = datum.get('impure', False),
-            rename_in_global_scope = datum.get('renameInGlobalScope', True),
-            documentation = datum.content,
-        )
-
-VALUE_TYPES = {
-    'attrs': 'nAttrs',
-    'boolean': 'nBool',
-    'integer': 'nInt',
-    'list': 'nList',
-    'null': 'nNull',
-    'string': 'nString',
-}
-
-HUMAN_TYPES = {
-    'attrs': 'set',
-    'boolean': 'Boolean',
-    'integer': 'integer',
-    'list': 'list',
-    'null': 'null',
-    'string': 'string',
-}
-
-def main():
-    import argparse
-
-    ap = argparse.ArgumentParser()
-    ap.add_argument('--header', help='Path of the header to generate')
-    ap.add_argument('--docs', help='Path of the documentation file to generate')
-    ap.add_argument('defs', help='Builtin definition files', nargs='+')
-    args = ap.parse_args()
-
-    builtin_constants = load_data(args.defs, BuiltinConstant.parse)
-
-    generate_file(args.header, builtin_constants, lambda constant:
-        # `builtins` is magic and must come first
-        '' if constant.name == 'builtins' else constant.name,
-    lambda constant:
-        f'''{'if (!evalSettings.pureEval) ' if constant.impure else ''}{{
-    addConstant({cxx_literal(('__' if constant.rename_in_global_scope else '') + constant.name)}, {constant.implementation}, {{
-        .type = {VALUE_TYPES[constant.type]},
-        .doc = {cxx_literal(constant.documentation)},
-        .impureOnly = {cxx_literal(constant.impure)},
-    }});
-}}
-''')
-    generate_file(args.docs, builtin_constants, lambda constant: constant.name, lambda constant:
-        f'''<dt id="builtins-{constant.name}">
-  <a href="#builtins-{constant.name}"><code>{constant.name}</code></a> ({HUMAN_TYPES[constant.type]})
-</dt>
-<dd>
-
-{constant.documentation}
-
-''' + ('''> **Note**
->
-> Not available in [pure evaluation mode](@docroot@/command-ref/conf-file.md#conf-pure-eval).
-
-''' if constant.impure else '') + '''</dd>
-
-''')
-
-if __name__ == '__main__':
-    main()
@@ -1,82 +0,0 @@
-from typing import List, NamedTuple, Optional
-
-from build_experimental_features import ExperimentalFeature
-from common import cxx_literal, generate_file, load_data
-
-KNOWN_KEYS = set([
-    'name',
-    'implementation',
-    'renameInGlobalScope',
-    'args',
-    'experimentalFeature',
-])
-
-class Builtin(NamedTuple):
-    name: str
-    implementation: str
-    rename_in_global_scope: bool
-    args: List[str]
-    experimental_feature: Optional[str]
-    documentation: str
-
-    def parse(datum):
-        unknown_keys = set(datum.keys()) - KNOWN_KEYS
-        if unknown_keys:
-            raise Exception('unknown keys', unknown_keys)
-        return Builtin(
-            name = datum['name'],
-            implementation = datum['implementation'] if 'implementation' in datum else f'prim_{datum["name"]}',
-            rename_in_global_scope = datum.get('renameInGlobalScope', True),
-            args = datum['args'],
-            experimental_feature = datum.get('experimentalFeature', None),
-            documentation = datum.content,
-        )
-
-def main():
-    import argparse
-
-    ap = argparse.ArgumentParser()
-    ap.add_argument('--header', help='Path of the header to generate')
-    ap.add_argument('--docs', help='Path of the documentation file to generate')
-    ap.add_argument('--experimental-features', help='Directory containing the experimental feature definitions')
-    ap.add_argument('defs', help='Builtin definition files', nargs='+')
-    args = ap.parse_args()
-
-    builtins = load_data(args.defs, Builtin.parse)
-
-    experimental_feature_names = set([builtin.experimental_feature for (_, builtin) in builtins])
-    experimental_feature_names.discard(None)
-    experimental_feature_files = [f'{args.experimental_features}/{name}.md' for name in experimental_feature_names]
-    experimental_features = load_data(experimental_feature_files, ExperimentalFeature.parse)
-    experimental_features = dict(map(lambda path_and_feature:
-        (path_and_feature[1].name, f'Xp::{path_and_feature[1].internal_name}'), experimental_features))
-    experimental_features[None] = 'std::nullopt'
-
-    generate_file(args.header, builtins, lambda builtin: builtin.name, lambda builtin:
-        f'''{'' if builtin.experimental_feature is None else f'if (experimentalFeatureSettings.isEnabled({experimental_features[builtin.experimental_feature]})) '}{{
-    addPrimOp({{
-        .name = {cxx_literal(('__' if builtin.rename_in_global_scope else '') + builtin.name)},
-        .args = {cxx_literal(builtin.args)},
-        .arity = {len(builtin.args)},
-        .doc = {cxx_literal(builtin.documentation)},
-        .fun = {builtin.implementation},
-        .experimentalFeature = {experimental_features[builtin.experimental_feature]},
-    }});
-}}
-''')
-    generate_file(args.docs, builtins, lambda builtin: builtin.name, lambda builtin:
-        f'''<dt id="builtins-{builtin.name}">
-  <a href="#builtins-{builtin.name}"><code>{builtin.name} {' '.join([f'<var>{arg}</var>' for arg in builtin.args])}</code></a>
-</dt>
-<dd>
-
-{builtin.documentation}
-
-''' + (f'''This function is only available if the [{builtin.experimental_feature}](@docroot@/contributing/experimental-features.md#xp-feature-{builtin.experimental_feature}) experimental feature is enabled.
-
-''' if builtin.experimental_feature is not None else '') + '''</dd>
-
-''')
-
-if __name__ == '__main__':
-    main()
@@ -1,58 +0,0 @@
-from typing import NamedTuple
-
-from common import cxx_literal, generate_file, load_data
-
-KNOWN_KEYS = set([
-    'name',
-    'internalName',
-])
-
-class ExperimentalFeature(NamedTuple):
-    name: str
-    internal_name: str
-    description: str
-
-    def parse(datum):
-        unknown_keys = set(datum.keys()) - KNOWN_KEYS
-        if unknown_keys:
-            raise ValueError('unknown keys', unknown_keys)
-        return ExperimentalFeature(
-            name = datum['name'],
-            internal_name = datum['internalName'],
-            description = datum.content,
-        )
-
-def main():
-    import argparse
-
-    ap = argparse.ArgumentParser()
-    ap.add_argument('--deprecated', action='store_true', help='Generate deprecated features')
-    ap.add_argument('--header', help='Path of the declaration header to generate')
-    ap.add_argument('--impl-header', help='Path of the implementation header to generate')
-    ap.add_argument('--descriptions', help='Path of the description file to generate')
-    ap.add_argument('--shortlist', help='Path of the shortlist file to generate')
-    ap.add_argument('defs', help='Experimental feature definition files', nargs='+')
-    args = ap.parse_args()
-
-    features = load_data(args.defs, ExperimentalFeature.parse)
-
-    generate_file(args.header, features, lambda feature: feature.name, lambda feature:
-        f'    {feature.internal_name},\n')
-    generate_file(args.impl_header, features, lambda feature: feature.name, lambda feature:
-        f'''    {{
-        .tag = {"Dep" if args.deprecated else "Xp"}::{feature.internal_name},
-        .name = {cxx_literal(feature.name)},
-        .description = {cxx_literal(feature.description)},
-    }},
-''')
-    generate_file(args.descriptions, features, lambda feature: feature.name, lambda feature:
-        f'''## [`{feature.name}`]{{#{"dp" if args.deprecated else "xp"}-feature-{feature.name}}}
-
-{feature.description}
-
-''')
-    generate_file(args.shortlist, features, lambda feature: feature.name, lambda feature:
-        f'  - [`{feature.name}`](@docroot@/contributing/{"deprecated" if args.deprecated else "experimental"}-features.md#{"dp" if args.deprecated else "xp"}-feature-{feature.name})\n')
-
-if __name__ == '__main__':
-    main()
@@ -1,141 +0,0 @@
-from typing import List, NamedTuple, Optional
-
-from build_experimental_features import ExperimentalFeature
-from common import cxx_literal, generate_file, load_data
-
-KNOWN_KEYS = set([
-    'name',
-    'internalName',
-    'platforms',
-    'type',
-    'settingType',
-    'default',
-    'defaultExpr',
-    'defaultText',
-    'aliases',
-    'experimentalFeature',
-    'deprecated',
-])
-
-class Setting(NamedTuple):
-    name: str
-    internal_name: str
-    description: str
-    platforms: Optional[List[str]]
-    setting_type: str
-    default_expr: str
-    default_text: str
-    aliases: List[str]
-    experimental_feature: Optional[str]
-    deprecated: bool
-
-    def parse(datum):
-        unknown_keys = set(datum.keys()) - KNOWN_KEYS
-        if unknown_keys:
-            raise ValueError('unknown keys', unknown_keys)
-        default_text = f'`{nix_conf_literal(datum["default"])}`' if 'default' in datum else datum['defaultText']
-        if default_text == '``':
-            default_text = '*empty*'
-        return Setting(
-            name = datum['name'],
-            internal_name = datum['internalName'],
-            description = datum.content,
-            platforms = datum.get('platforms', None),
-            setting_type = f'Setting<{datum["type"]}>' if 'type' in datum else datum['settingType'],
-            default_expr = cxx_literal(datum['default']) if 'default' in datum else datum['defaultExpr'],
-            default_text = default_text,
-            aliases = datum.get('aliases', []),
-            experimental_feature = datum.get('experimentalFeature', None),
-            deprecated = datum.get('deprecated', False),
-        )
-
-platform_names = {
-    'darwin': 'Darwin',
-    'linux': 'Linux',
-}
-
-def nix_conf_literal(v):
-    if v is None:
-        return ''
-    elif isinstance(v, bool) and v == False: # 0 == False
-        return 'false'
-    elif isinstance(v, bool) and v == True: # 1 == True
-        return 'true'
-    elif isinstance(v, int):
-        return str(v)
-    elif isinstance(v, str):
-        return v
-    elif isinstance(v, list):
-        return ' '.join([nix_conf_literal(item) for item in v])
-    else:
-        raise NotImplementedError(f'Cannot represent {repr(v)} in nix.conf')
-
-def indent(prefix, body):
-    return ''.join(['\n' if line == '' else f'{prefix}{line}\n' for line in body.split('\n')])
-
-def main():
-    import argparse
-
-    ap = argparse.ArgumentParser()
-    ap.add_argument('--kernel', help='Name of the kernel Lix will run on')
-    ap.add_argument('--header', help='Path of the header to generate')
-    ap.add_argument('--docs', help='Path of the documentation file to generate')
-    ap.add_argument('--experimental-features', help='Directory containing the experimental feature definitions')
-    ap.add_argument('defs', help='Setting definition files', nargs='+')
-    args = ap.parse_args()
-
-    settings = load_data(args.defs, Setting.parse)
-
-    experimental_feature_names = set([setting.experimental_feature for (_, setting) in settings])
-    experimental_feature_names.discard(None)
-    experimental_feature_files = [f'{args.experimental_features}/{name}.md' for name in experimental_feature_names]
-    experimental_features = load_data(experimental_feature_files, ExperimentalFeature.parse)
-    experimental_features = dict(map(lambda path_and_feature:
-        (path_and_feature[1].name, f'Xp::{path_and_feature[1].internal_name}'), experimental_features))
-    experimental_features[None] = 'std::nullopt'
-
-    generate_file(args.header, settings, lambda setting: setting.name, lambda setting:
-        f'''{setting.setting_type} {setting.internal_name} {{
-    this,
-    {setting.default_expr},
-    {cxx_literal(setting.name)},
-    {cxx_literal(setting.description)},
-    {cxx_literal(setting.aliases)},
-    true,
-    {experimental_features[setting.experimental_feature]},
-    {cxx_literal(setting.deprecated)}
-}};
-
-''' if setting.platforms is None or args.kernel in setting.platforms else '')
-    generate_file(args.docs, settings, lambda setting: setting.name, lambda setting:
-        f'''- <span id="conf-{setting.name}">[`{setting.name}`](#conf-{setting.name})</span>
-
-{indent("  ", setting.description)}
-''' + (f'''  > **Note**
-  > This setting is only available on {', '.join([platform_names[platform] for platform in setting.platforms])} systems.
-
-''' if setting.platforms is not None else '') + (f'''  > **Warning**
-  > This setting is part of an
-  > [experimental feature](@docroot@/contributing/experimental-features.md).
-
-  To change this setting, you need to make sure the corresponding experimental feature,
-  [`{setting.experimental_feature}`](@docroot@/contributing/experimental-features.md#xp-feature-{setting.experimental_feature}),
-  is enabled.
-  For example, include the following in [`nix.conf`](#):
-
-  ```
-  extra-experimental-features = {setting.experimental_feature}
-  {setting.name} = ...
-  ```
-
-''' if setting.experimental_feature is not None else '') + ('''  > **Warning**
-  > This setting is deprecated and will be removed in a future version of Lix.
-
-''' if setting.deprecated else '') + f'''  **Default:** {setting.default_text}
-
-''' + (f'''  **Deprecated alias:** {', '.join([f'`{item}`' for item in setting.aliases])}
-
-''' if setting.aliases != [] else ''))
-
-if __name__ == '__main__':
-    main()
@@ -1,60 +0,0 @@
-import frontmatter
-import pathlib
-from collections import defaultdict
-
-def cxx_escape_character(c):
-    if ord(c) >= 0x20 and ord(c) < 0x7f and c != '"' and c != '?' and c != '\\':
-        return c
-    elif c == '\t':
-        return r'\t'
-    elif c == '\n':
-        return r'\n'
-    elif c == '\r':
-        return r'\r'
-    elif c == '"':
-        return r'\"'
-    elif c == '?':
-        return r'\?'
-    elif c == '\\':
-        return r'\\'
-    elif ord(c) <= 0xffff:
-        return str.format(r'\u{:04x}', ord(c))
-    else:
-        return str.format(r'\U{:08x}', ord(c))
-
-def cxx_literal(v):
-    if v is None:
-        return 'std::nullopt'
-    elif isinstance(v, bool) and v == False: # 0 == False
-        return 'false'
-    elif isinstance(v, bool) and v == True: # 1 == True
-        return 'true'
-    elif isinstance(v, int):
-        return str(v)
-    elif isinstance(v, str):
-        return ''.join(['"', *(cxx_escape_character(c) for c in v), '"'])
-    elif isinstance(v, list):
-        return f'{{{", ".join([cxx_literal(item) for item in v])}}}'
-    else:
-        raise NotImplementedError(f'cannot represent {repr(v)} in C++')
-
-def load_data(defs, parse_function):
-    data = []
-    for path in defs:
-        try:
-            datum = frontmatter.load(path)
-            data.append((path, parse_function(datum)))
-        except Exception as e:
-            e.add_note(f'in {path}')
-            raise
-    return data
-
-def generate_file(path, data, sort_key_function, generate_function):
-    if path is not None:
-        with open(path, 'w') as out:
-            for path, datum in sorted(data, key=lambda pathAndDatum: sort_key_function(pathAndDatum[1])):
-                try:
-                    out.write(generate_function(datum))
-                except Exception as e:
-                    e.add_note(f'in {path}')
-                    raise
@@ -1,8 +0,0 @@
-#pragma once
-/// @file
-
-namespace nix {
-
-void registerBuildRemote();
-
-}
@@ -1,35 +0,0 @@
-legacy_include_directories = include_directories('.')
-
-legacy_sources = files(
-  # `build-remote` is not really legacy (it powers all remote builds), but it's
-  # not a `nix3` command.
-  'build-remote.cc',
-  'dotgraph.cc',
-  'graphml.cc',
-  'nix-build.cc',
-  'nix-channel.cc',
-  'nix-collect-garbage.cc',
-  'nix-copy-closure.cc',
-  'nix-env.cc',
-  'nix-env.hh',
-  'nix-instantiate.cc',
-  'nix-store.cc',
-  'user-env.cc',
-)
-
-legacy_headers = files(
-  'build-remote.hh',
-  'nix-build.hh',
-  'nix-channel.hh',
-  'nix-collect-garbage.hh',
-  'nix-copy-closure.hh',
-  'nix-instantiate.hh',
-  'nix-store.hh',
-)
-
-legacy_generated_headers = [
-  gen_header.process('buildenv.nix', preserve_path_from: meson.current_source_dir()),
-  gen_header.process('unpack-channel.nix', preserve_path_from: meson.current_source_dir()),
-]
-
-fs.copyfile('unpack-channel.nix')
@@ -1,8 +0,0 @@
-#pragma once
-/// @file
-
-namespace nix {
-
-void registerNixBuildAndNixShell();
-
-}
@@ -1,8 +0,0 @@
-#pragma once
-/// @file
-
-namespace nix {
-
-void registerNixChannel();
-
-}
@@ -1,8 +0,0 @@
-#pragma once
-/// @file
-
-namespace nix {
-
-void registerNixCollectGarbage();
-
-}
@@ -1,8 +0,0 @@
-#pragma once
-/// @file
-
-namespace nix {
-
-void registerNixCopyClosure();
-
-}
@@ -1,8 +0,0 @@
-#pragma once
-/// @file
-
-namespace nix {
-
-void registerNixEnv();
-
-}
@@ -1,8 +0,0 @@
-#pragma once
-/// @file
-
-namespace nix {
-
-void registerNixInstantiate();
-
-}
@@ -1,8 +0,0 @@
-#pragma once
-/// @file
-
-namespace nix {
-
-void registerNixStore();
-
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jade Lovelace	5bf891b15a	release: 2.90.0 "Vanilla Ice Cream" Release produced with releng/create_release.xsh Change-Id: Ice53891cdeafff04bd6537be66e8cd6b7dd9678c	2024-07-10 08:40:42 -07:00
Raito Bezariusandjade	f72153a510	doc/release-notes: add date for major release Change-Id: I93aab93c069bb3989c3f8d17e0862899e6f76865 Signed-off-by: Raito Bezarius <raito@lix.systems>	2024-07-10 15:35:00 +00:00
Raito Bezarius	8da08ab551	version: finalize 2.90.0 Tested by Raito, pennae and time. It looks in good shape. Change-Id: I32492557361888c28fe40553c699833876a1deab Signed-off-by: Raito Bezarius <raito@lix.systems>	2024-07-10 15:32:19 +02:00
Jade Lovelace	98d0249d5c	releng: fix broken manifest from 2.90-rc1 Well that is embarrassing. I think the proper thing is to just quickly ship a -rc2, so I will open a backport of this. $ curl https://releases.lix.systems/manifest.nix # This file was generated by releng/create_release.xsh in Lix { aarch64-linux = "/nix/store/mrbknq000af7iaqhk53bnpk1fvfrc1xp-lix-2.90.0-rc1"; aarch64-darwin = "/nix/store/z1bdccwsk34iv491aygh0mm1lgpf7yy1-lix-2.90.0-rc1"; x86_64-darwin = "/nix/store/xqvfpdhzck44v6kyhgi9f8v0xybksb6a-lix-2.90.0-rc1"; x86_64-linux = "/nix/store/h2ml0nx4477r84y82jgm8y80jpr72gqw-lix-release-tarballs"; } Change-Id: I9cf007c850c2faf995a3a9d92457517b8501d1a1	2024-06-16 19:06:45 -07:00
				`@@ -1 +0,0 @@`
				`This is a file used by the dev shell shellHook in package.nix to check that this is actually a Lix repo before installing git hooks. Its contents have no meaning.`