Enable nixpkgsLibTests again

The required nixpkgs bumps have now been performed.

Change-Id: I6a6a6964316f8434c355405c52b0a7b7f70b4332

.clang-tidy

@@ -18,8 +18,6 @@ Checks:
   - -bugprone-branch-clone
     # extremely noisy before clang 19: https://github.com/llvm/llvm-project/issues/93959
   - -bugprone-multi-level-implicit-pointer-conversion
-    # we don't compile out our asserts
-  - -bugprone-assert-side-effect
     # all thrown exceptions must derive from std::exception
   - hicpp-exception-baseclass
     # capturing async lambdas are dangerous

.editorconfig

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

.github/ISSUE_TEMPLATE/missing_documentation.md

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

.gitignore

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

.mailmap

@@ -1,2 +0,0 @@
-Fiona Behrens <me@kloenk.dev>
-Fiona Behrens <me@kloenk.dev> <me@kloenk.de>

Cargo.toml

@@ -1,6 +0,0 @@
-[workspace]
-resolver = "2"
-members = ["lix/lix-doc"]
-
-[workspace.package]
-edition = "2021"

README.md

@@ -17,13 +17,10 @@ For systems that **already have a Nix implementation installed**, such as NixOS
 
 ## Building And Developing
 
-See our [Hacking guide](https://git.lix.systems/lix-project/lix/src/branch/main/doc/manual/src/contributing/hacking.md) in our manual for instruction on how to set up a development environment and build Lix from source.
+See our [Hacking guide](https://git.lix.systems/lix-project/lix/src/branch/main/doc/manual/src/contributing/hacking.md) in our manual for instruction on how to to set up a development environment and build Lix from source.
 
 ## Additional Resources
 
-- The Lix reference manual:
-  - [Stable](https://docs.lix.systems/manual/lix/stable/)
-  - [Nightly](https://docs.lix.systems/manual/lix/nightly/) (NOTE: [not automatically updated, yet](https://git.lix.systems/lix-project/lix/issues/742))
 - [Our wiki](https://wiki.lix.systems)
 - [Matrix - #space:lix.systems](https://matrix.to/#/#space:lix.systems)
 

bench/.gitignore

@@ -1,4 +1,3 @@
 bench-*.json
 bench-*.md
-perf-*.json
 nixpkgs

bench/bench.py

@@ -1,116 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i python3 -p python3 -p hyperfine -p "if stdenv.isLinux then linuxPackages.perf else null"
-
-import argparse
-import subprocess
-import os
-import json
-import tempfile
-import platform
-
-flake_args = ["--extra-experimental-features","'nix-command flakes'"]
-# hyperfine has its own variable substitution, so we use that and pass build="{BUILD}" here.
-# perf doesn't have variable substitution, so we call these with build being the actual build directory.
-cases = {
-    "search": lambda build: [f"{build}/bin/nix", *flake_args, "search", "--no-eval-cache", "github:nixos/nixpkgs/e1fa12d4f6c6fe19ccb59cac54b5b3f25e160870", "hello"],
-    "rebuild": lambda build: [f"{build}/bin/nix", *flake_args, "eval", "--raw", "--impure", "--expr", "'with import <nixpkgs/nixos> {}; system'"],
-    "rebuild_lh": lambda build: ["GC_INITIAL_HEAP_SIZE=10g", f"{build}/bin/nix", *flake_args, "eval", "--raw", "--impure", "--expr", "'with import <nixpkgs/nixos> {}; system'"],
-    "parse": lambda build: [f"{build}/bin/nix", *flake_args, "eval", "-f", "bench/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix"],
-}
-
-arg_parser = argparse.ArgumentParser()
-# FIXME(jade, gilice): it is a reasonable use case to want to run a benchmark run
-# on just one build. However, since we are using hyperfine in comparison
-# mode, we would have to combine the JSON ourselves to support that, which
-# would probably be better done by writing a benchmarking script in
-# not-bash.
-arg_parser.add_argument('builds', nargs='+', help="At least two build directories to compare, containing bin/nix")
-arg_parser.add_argument('--cases', type=str, help="A comma-separated list of cases you want to run. Defaults to running all")
-available_modes = [ "walltime" ] + [ "icount" ] if platform.system() == 'Linux' else [] # perf doesn't run on Darwin
-arg_parser.add_argument('--mode', choices=available_modes, default="walltime")
-args = arg_parser.parse_args()
-if len(args.builds) < 2:
-    raise ValueError("need at least two build directories to compare")
-
-benchmarks: list[str] = []
-if args.cases is None:
-    benchmarks = list(cases.keys())
-else:
-    for case in args.cases.split(","):
-        if case not in cases: raise ValueError(f"no such case: {case}")
-        benchmarks.append(case)
-
-def bench_walltime(env):
-    hyperfine_args = ["--parameter-list", "BUILD", ','.join(args.builds), "--warmup", "2", "--runs", "10"]
-    for case in benchmarks:
-        case_command = cases[case]("{BUILD}") # see the comment on cases
-        subprocess.run([
-            "taskset", "-c", "2,3",
-            "chrt", "-f","50",
-            "hyperfine", *hyperfine_args, "--export-json", f"bench/bench-{case}.json", "--export-markdown", f"bench/bench-{case}.md", "--", " ".join(case_command)
-        ], env=env, check=True)
-
-    print("Benchmarks summary\n---\n")
-    for case in benchmarks:
-        fd = open(f"bench/bench-{case}.json")
-        result_json = json.load(fd)
-        fd.close()
-        for result in result_json["results"]:
-            print(result["command"])
-            print("-" * min(80,len(result["command"])))
-            attr_rounded = lambda attr: f"{result[attr]:.3f}"
-            print("  mean:    ", attr_rounded("mean"), "±", attr_rounded("stddev"))
-            print("            user:",  attr_rounded("user"), "| system", attr_rounded("system"))
-            print("  median:  ", attr_rounded("median"))
-            print("  range:   ", attr_rounded("min") + "s.." + attr_rounded("max")+"s")
-            print("  relative:", f"{result["mean"]/result_json["results"][0]["mean"]:.3f}")
-            print("\n")
-
-
-def bench_icount(env):
-    perf_results_for: dict[str, list[tuple[str, float]]] = {}
-    for case in benchmarks:
-        for build in args.builds:
-            case_command = cases[case](build)
-            # the perf stat -j output (incorrectly) localizes numbers, which will trip up the json parser.
-            env["LC_ALL"]="C"
-            commandline = [
-                "perf", "stat", "-o", f"bench/perf-{case}.json", "-j", "sh", "-c", " ".join(case_command)
-            ]
-            subprocess.run(commandline, env=env, check=True, stdout=subprocess.DEVNULL) # warmup run
-            subprocess.run(commandline, env=env, check=True, stdout=subprocess.DEVNULL)
-            perf_fd = open(f"bench/perf-{case}.json")
-            perf_data = [json.loads(x) for x in perf_fd.readlines()]
-            perf_fd.close()
-
-            instr = next(x for x in perf_data if x["event"] in ["instructions", "instructions:u"]) # an implementation of a find_first iterator
-            if case not in perf_results_for: perf_results_for[case] = []
-            perf_results_for[case].append((" ".join(case_command), float(instr["counter-value"])))
-
-    print("Benchmarks summary\n---\n")
-    for (case, entries) in perf_results_for.items():
-        for entry in entries:
-            cmd,instr = entry
-            print(cmd)
-            print("-" * min(80,len(cmd)))
-            print("  instructions:         ", int(instr))
-            print("  relative instructions:", int(instr)/perf_results_for[case][0][1])
-            print("\n")
-
-
-with tempfile.TemporaryDirectory() as tmp_dir:
-    subprocess.run([
-        "nix", "build",
-        "--extra-experimental-features", "nix-command flakes",
-        "--impure", "--expr",'(builtins.getFlake "git+file:.").inputs.nixpkgs.outPath',
-        "-o","bench/nixpkgs"
-    ], check=True)
-    subenv = os.environ.copy()
-    subenv["NIX_CONF_DIR"] = "/var/empty"
-    subenv["NIX_REMOTE"] = tmp_dir
-    subenv["NIX_PATH"] = "nixpkgs=bench/nixpkgs:nixos-config=bench/configuration.nix"
-
-    if args.mode == "walltime":
-        bench_walltime(subenv)
-    else:
-        bench_icount(subenv)

bench/bench.sh

@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+shopt -s inherit_errexit
+
+scriptdir=$(cd "$(dirname -- "$0")" ; pwd -P)
+cd "$scriptdir/.."
+
+if [[ $# -lt 2 ]]; then
+    # FIXME(jade): it is a reasonable use case to want to run a benchmark run
+    # on just one build. However, since we are using hyperfine in comparison
+    # mode, we would have to combine the JSON ourselves to support that, which
+    # would probably be better done by writing a benchmarking script in
+    # not-bash.
+    echo "Fewer than two result dirs given, nothing to compare!" >&2
+    echo "Pass some directories (with names indicating which alternative they are) with bin/nix in them" >&2
+    echo "Usage: ./bench/bench.sh result-1 result-2 [result-3...]" >&2
+    exit 1
+fi
+
+_exit=""
+trap "$_exit" EXIT
+
+# XXX: yes this is very silly. flakes~!!
+nix build --impure --expr '(builtins.getFlake "git+file:.").inputs.nixpkgs.outPath' -o bench/nixpkgs
+
+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="--extra-experimental-features 'nix-command flakes'"
+
+hyperfineArgs=(
+    --parameter-list BUILD "$(IFS=,; echo "${builds[*]}")"
+    --warmup 2 --runs 10
+)
+
+declare -A cases
+cases=(
+    [search]="{BUILD}/bin/nix $flake_args search --no-eval-cache github:nixos/nixpkgs/e1fa12d4f6c6fe19ccb59cac54b5b3f25e160870 hello"
+    [rebuild]="{BUILD}/bin/nix $flake_args eval --raw --impure --expr 'with import <nixpkgs/nixos> {}; system'"
+    [rebuild-lh]="GC_INITIAL_HEAP_SIZE=10g {BUILD}/bin/nix eval $flake_args --raw --impure --expr 'with import <nixpkgs/nixos> {}; system'"
+    [parse]="{BUILD}/bin/nix $flake_args eval -f bench/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix"
+)
+
+benches=(
+    rebuild
+    rebuild-lh
+    search
+    parse
+)
+
+for k in "${benches[@]}"; do
+    taskset -c 2,3 \
+        chrt -f 50 \
+        hyperfine "${hyperfineArgs[@]}"  --export-json="bench/bench-${k}.json" --export-markdown="bench/bench-${k}.md" "${cases[$k]}"
+done
+
+echo "Benchmarks summary (from ./bench/summarize.jq bench/bench-*.json)"
+bench/summarize.jq bench/*.json

bench/configuration.nix

@@ -32,8 +32,8 @@
   hardware = {
     enableRedistributableFirmware = true;
     cpu.intel.updateMicrocode = true;
-    graphics.enable32Bit = true;
-    graphics.extraPackages = with pkgs; [
+    opengl.driSupport32Bit = true;
+    opengl.extraPackages = with pkgs; [
       vaapiIntel
       intel-media-driver
       intel-compute-runtime
@@ -93,17 +93,16 @@
 
   i18n = {
     defaultLocale = "en_US.UTF-8";
-    inputMethod.enable = true;
-    inputMethod.type = "ibus";
+    inputMethod.enabled = "ibus";
   };
 
   services = {
-    libinput.enable = true;
     xserver = {
       enable = true;
-      xkb.layout = "us";
-      xkb.variant = "altgr-intl";
-      xkb.options = "ctrl:nocaps";
+      layout = "us";
+      xkbVariant = "altgr-intl";
+      xkbOptions = "ctrl:nocaps";
+      libinput.enable = true;
       wacom.enable = true;
       videoDrivers = [ "modesetting" ];
       modules = [ pkgs.xf86_input_wacom ];
@@ -122,6 +121,17 @@
     '';
   };
 
+  sound.enable = true;
+  hardware.pulseaudio = {
+    enable = true;
+    package = pkgs.pulseaudioFull;
+    daemon.config = {
+      lock-memory = "yes";
+      realtime-scheduling = "yes";
+      rlimit-rtprio = "-1";
+    };
+  };
+
   programs = {
     light.enable = true;
     wireshark = {
@@ -136,7 +146,7 @@
   fonts.packages = with pkgs; [
     font-awesome
     noto-fonts
-    noto-fonts-cjk-sans
+    noto-fonts-cjk
     noto-fonts-emoji
     noto-fonts-extra
     dejavu_fonts
@@ -229,7 +239,7 @@
     file
     firefox
     fluidsynth
-    adwaita-icon-theme
+    gnome3.adwaita-icon-theme
     gnuplot
     graphviz
     helm
@@ -242,6 +252,7 @@
     libqalculate
     libreoffice
     man-pages
+    nheko
     nix-diff
     nix-index
     nix-output-monitor

bench/summarize.jq

@@ -0,0 +1,22 @@
+#!/usr/bin/env -S jq -Mrf
+
+def round3:
+    . * 1000 | round | . / 1000
+    ;
+
+def stats($first):
+    [
+        "  mean:     \(.mean | round3)s ± \(.stddev | round3)s",
+        "            user: \(.user | round3)s | system: \(.system | round3)s",
+        "  median:   \(.median | round3)s",
+        "  range:    \(.min | round3)s ... \(.max | round3)s",
+        "  relative: \(.mean / $first.mean | round3)"
+    ]
+    | join("\n")
+    ;
+
+def fmt($first):
+    "\(.command)\n" + (. | stats($first))
+    ;
+
+[.results | .[0] as $first | .[] | fmt($first)] | join("\n\n") | (. + "\n\n---\n")

doc/internal-api/doxygen.cfg.in

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

doc/internal-api/meson.build

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

doc/manual/book.toml

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

doc/manual/change-authors.yml

@@ -12,10 +12,6 @@
   forgejo: rbt
   github: 9999years
 
-9p4:
-  display_name: Ersei Saggi
-  github: 9p4
-
 Artturin:
   github: Artturin
 
@@ -40,23 +36,10 @@ alois31:
   forgejo: alois31
   github: alois31
 
-andrewhamon:
-  display_name: Andrew Hamon
-  github: andrewhamon
-
 artemist:
   display_name: Artemis Tosini
   forgejo: artemist
 
-bb010g:
-  display_name: Dusk Banks
-  forgejo: bb010g
-  github: bb010g
-
-blitz:
-  display_name: Julian Stecklina
-  github: blitz
-
 cole-h:
   display_name: Cole Helbling
   github: cole-h
@@ -66,13 +49,6 @@ delan:
   forgejo: delan
   github: delan
 
-detroyejr:
-  display_name: Jonathan De Troye
-  github: detroyejr
-
-edef:
-  github: edef1c
-
 edolstra:
   display_name: Eelco Dolstra
   github: edolstra
@@ -81,9 +57,6 @@ ericson:
   display_name: John Ericson
   github: ericson2314
 
-gilice:
-  forgejo: gilice
-
 goldstein:
   display_name: goldstein
   forgejo: goldstein
@@ -97,10 +70,6 @@ horrors:
 iFreilicht:
   github: iFreilicht
 
-ian-h-chamberlain:
-  forgejo: ian-h-chamberlain
-  github: ian-h-chamberlain
-
 isabelroses:
   forgejo: isabelroses
   github: isabelroses
@@ -109,37 +78,13 @@ jade:
   forgejo: jade
   github: lf-
 
-just1602:
-  forgejo: just1602
-
-kfears:
-  display_name: KFears
-  forgejo: kfearsoff
-  github: kfearsoff
-
-kiara:
-  github: KiaraGrouwstra
-
 kjeremy:
   github: kjeremy
 
 kloenk:
-  display_name: Fiona Behrens
   forgejo: kloenk
   github: kloenk
 
-lheckemann:
-  forgejo: lheckemann
-  github: lheckemann
-
-lily:
-  forgejo: lilyinstarlight
-  github: lilyinstarlight
-
-lilyball:
-  forgejo: lilyball
-  github: lilyball
-
 lovesegfault:
   github: lovesegfault
 
@@ -158,32 +103,16 @@ midnightveil:
 ncfavier:
   github: ncfavier
 
-p-e-meunier:
-  display_name: Pierre-Etienne Meunier
-  github: P-E-Meunier
-
-pamplemousse:
-  display_name: Xavier Maso
-  github: pamplemousse
-
 piegames:
   display_name: piegames
   forgejo: piegames
   github: piegamesde
 
-poliorcetics:
-  display_name: Poliorcetics
-  github: poliorcetics
-
 puck:
   display_name: puck
   forgejo: puck
   github: puckipedia
 
-quantenzitrone:
-  display_name: Zitrone
-  forgejo: quantenzitrone
-
 quantumjump:
   display_name: Quantum Jump
   github: QuantumBJump
@@ -200,21 +129,6 @@ roberth:
   display_name: Robert Hensing
   github: roberth
 
-sandydoo:
-  github: sandydoo
-
-seppel3210:
-  github: Seppel3210
-
-teofilc:
-  forgejo: teofilc
-  github: TeofilC
-
-thubrecht:
-  display_name: Tom Hubrecht
-  forgejo: tom-hubrecht
-  github: Tom-Hubrecht
-
 thufschmitt:
   display_name: Théophane Hufschmitt
   github: thufschmitt
@@ -227,23 +141,9 @@ valentin:
   display_name: Valentin Gagarin
   github: fricklerhandwerk
 
-vigress8:
-  display_name: Vigress
-  forgejo: vigress8
-  github: vigress8
-
 winter:
   forgejo: winter
   github: winterqt
 
-xanderio:
-  github: xanderio
-
-yorickvp:
-  github: yorickvp
-
 yshui:
   github: yshui
-
-zimbatm:
-  github: zimbatm

doc/manual/generate-builtin-constants.nix

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

doc/manual/generate-builtins.nix

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

doc/manual/generate-manpage.nix

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

doc/manual/generate-xp-features-shortlist.nix

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

doc/manual/generate-xp-features.nix

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

doc/manual/meson.build

@@ -1,7 +1,6 @@
 nix_env_for_docs = {
   'HOME': '/dummy',
   'NIX_CONF_DIR': '/dummy',
-  'XDG_CONFIG_HOME': '/dummy',
   'NIX_SSL_CERT_FILE': '/dummy/no-ca-bundle.crt',
   'NIX_STATE_DIR': '/dummy',
   'NIX_CONFIG': 'cores = 0',
@@ -16,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')
 
@@ -61,8 +106,6 @@ 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,
@@ -73,19 +116,20 @@ manual = custom_target(
     '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',
     [

doc/manual/src/SUMMARY.md

@@ -192,14 +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.93 (2025-05-09)](release-notes/rl-2.93.md)
-  - [Lix 2.92 (2025-01-18)](release-notes/rl-2.92.md)
   - [Lix 2.91 (2024-08-12)](release-notes/rl-2.91.md)
   - [Lix 2.90 (2024-07-10)](release-notes/rl-2.90.md)
   - [Nix 2.18 (2023-09-20)](release-notes/rl-2.18.md)

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

@@ -75,9 +75,7 @@ by spaces. Only the first element is required. To leave a field at its
 default, set it to `-`.
 
 1.  The URI of the remote store in the format
-    `ssh://[username@]hostname[?port=<port>]`, e.g. `ssh://nix@mac` or `ssh://mac`.
-    If the ssh server is not listening on port 22 (e.g. port 1337 in this case)
-    the URI would be `ssh://nix@mac?port=1337`
+    `ssh://[username@]hostname`, e.g. `ssh://nix@mac` or `ssh://mac`.
     For backward compatibility, `ssh://` may be omitted. The hostname
     may be an alias defined in your `~/.ssh/config`.
 

doc/manual/src/architecture/architecture.md

@@ -22,9 +22,9 @@ The following [concept map] shows its main components (rectangles), the objects
            |                   |
 +----------|-------------------|--------------------------------+
 | Nix impl.|                   V                                |
-| (Lix)    |       +------------------------+                   |
-|          |       | command line interface |------.            |
-|          |       +------------------------+      |            |
+| (Lix)    |      +-------------------------+                   |
+|          |      | commmand line interface |------.            |
+|          |      +-------------------------+      |            |
 |          |                   |                   |            |
 |    evaluated by            calls              manages         |
 |          |                   |                   |            |

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

@@ -34,15 +34,9 @@ keep-outputs = true       # Nice for developers
 keep-derivations = true   # Idem
 ```
 
-Other files can be included with a line like `include <path>`.
+Other files can be included with a line like `include <path>`, where `<path>` is interpreted relative to the current configuration file.
 A missing file is an error unless `!include` is used instead.
 
-Paths in `include`s and option values are interpreted relative to the current configuration file.
-In user configuration files, paths starting with `~/` are tilde expanded (by replacing the tilde by the value of `$HOME`).
-
-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.
-
 A configuration setting usually overrides any previous value.
 However, for settings that take a list of items, you can prefix the name of the setting by `extra-` to *append* to the previous value.
 

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

@@ -1,12 +0,0 @@
-<!--
-  File-ish argument syntax summary.
-  This file gets included into pages like nix-build.md and nix-instantiate.md, and each individual page that includes
-  this also links to nix-build.md for the full explanation.
--->
-- A normal filesystem path, like `/home/meow/nixfiles/default.nix`
-  - Or a directory, like `/home/meow/nixfiles`, equivalent to above
-- A single lookup path, like `<nixpkgs>` or `<nixos>`
-- A URL to a tarball, like `https://github.com/NixOS/nixpkgs/archive/refs/heads/release-23.11.tar.gz`
-- A [flakeref](@docroot@/command-ref/new-cli/nix3-flake.md#flake-references), introduced by the prefix `flake:`, like `flake:git+https://git.lix.systems/lix-project/lix`
-- A *nixpkgs* channel tarball name, introduced by the prefix `channel:`, like `channel:nixos-unstable`.
-  - This uses a hard-coded URL pattern and is *not* related to the subscribed channels managed by the [nix-channel](@docroot@/command-ref/nix-channel.md) command.

doc/manual/src/command-ref/meson.build

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

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

@@ -4,7 +4,7 @@
 
 # Synopsis
 
-`nix-build` [*fileish…*]
+`nix-build` [*paths…*]
   [`--arg` *name* *value*]
   [`--argstr` *name* *value*]
   [{`--attr` | `-A`} *attrPath*]
@@ -20,55 +20,19 @@ For documentation on the latter, run `nix build --help` or see `man nix3-build`.
 # Description
 
 The `nix-build` command builds the derivations described by the Nix
-expressions in each *fileish*. If the build succeeds, it places a symlink to
+expressions in *paths*. If the build succeeds, it places a symlink to
 the result in the current directory. The symlink is called `result`. If
 there are multiple Nix expressions, or the Nix expressions evaluate to
 multiple derivations, multiple sequentially numbered symlinks are
 created (`result`, `result-2`, and so on).
 
-If no *fileish* is specified, then `nix-build` will use `default.nix` in
+If no *paths* are specified, then `nix-build` will use `default.nix` in
 the current directory, if it exists.
 
-## Fileish Syntax
-
-A given *fileish* may take one of a few different forms, the first being a simple filesystem path, e.g. `nix-build /tmp/some-file.nix`.
-Like the [import builtin](../language/builtins.md#builtins-import) specifying a directory is equivalent to specifying `default.nix` within that directory.
-It may also be a [search path](./env-common.md#env-NIX_PATH) (also known as a lookup path) like `<nixpkgs>`, which is convenient to use with `--attr`/`-A`:
-
-```console
-$ nix-build '<nixpkgs>' -A firefox
-```
-
-(Note the quotation marks around `<nixpkgs>`, which will be necessary in most Unix shells.)
-
-If a *fileish* starts with `http://` or `https://`, it is interpreted as the URL of a tarball which will be fetched and unpacked.
-Lix will then `import` the unpacked directory, so these tarballs must include at least a single top-level directory with a file called `default.nix`
-For example, you could build from a specific version of Nixpkgs with something like:
-
-```console
-$ nix-build "https://github.com/NixOS/nixpkgs/archive/refs/heads/release-23.11.tar.gz" -A firefox
-```
-
-If a path starts with `flake:`, the rest of the argument is interpreted as a [flakeref](./new-cli/nix3-flake.md#flake-references) (see `nix flake --help` or `man nix3-flake`), which requires the "flakes" experimental feature to be enabled.
-Lix will fetch the flake, and then `import` its unpacked directory, so the flake must include a file called `default.nix`.
-For example, the flake analogues to the above `nix-build` commands are:
-
-```console
-$ nix-build flake:nixpkgs -A firefox
-$ nix-build flake:github:NixOS/nixpkgs/release-23.11 -A firefox
-```
-
-Finally, for legacy reasons, if a path starts with `channel:`, the rest of the argument is interpreted as the name of a *nixpkgs* channel tarball to fetch from `https://nixos.org/channels/$CHANNEL_NAME/nixexprs.tar.xz`.
-This is a **hard coded URL** pattern and is *not* related to the subscribed channels managed by the [nix-channel](./nix-channel.md) command.
-
-> **Note**: any of the special syntaxes may always be disambiguated by prefixing the path.
-> For example: a file in the current directory literally called `<nixpkgs>` can be addressed as `./<nixpkgs>`, to escape the special interpretation.
-
-In summary, a path argument may be one of:
-
-{{#include ./fileish-summary.md}}
-
-## Notes
+If an element of *paths* starts with `http://` or `https://`, it is
+interpreted as the URL of a tarball that will be downloaded and unpacked
+to a temporary location. The tarball must include a single top-level
+directory containing at least a file named `default.nix`.
 
 `nix-build` is essentially a wrapper around
 [`nix-instantiate`](nix-instantiate.md) (to translate a high-level Nix

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

@@ -14,7 +14,7 @@ The moving parts of channels are:
 - The official channels listed at <https://nixos.org/channels>
 - The user-specific list of [subscribed channels](#subscribed-channels)
 - The [downloaded channel contents](#channels)
-- The [Nix expression search path](@docroot@/command-ref/conf-file.md#conf-nix-path), set with the [`-I` option](#opt-I) or the [`NIX_PATH` environment variable](#env-NIX_PATH)
+- The [Nix expression search path](@docroot@/command-ref/conf-file.md#conf-nix-path), set with the [`-I` option](#opt-i) or the [`NIX_PATH` environment variable](#env-NIX_PATH)
 
 > **Note**
 >

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

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

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

@@ -8,7 +8,7 @@
   [`--option` *name* *value*]
   [`--arg` *name* *value*]
   [`--argstr` *name* *value*]
-  [{`--file` | `-f`} *fileish*]
+  [{`--file` | `-f`} *path*]
   [{`--profile` | `-p`} *path*]
   [`--system-filter` *system*]
   [`--dry-run`]

doc/manual/src/command-ref/nix-env/delete-generations.md

@@ -26,7 +26,7 @@ This operation deletes the specified generations of the current profile.
   >
   > Older *and newer* generations will be deleted by this operation.
   >
-  > One might expect this to just delete older generations than the current one, but that is only true if the current generation is also the latest.
+  > One might expect this to just delete older generations than the curent one, but that is only true if the current generation is also the latest.
   > Because one can roll back to a previous generation, it is possible to have generations newer than the current one.
   > They will also be deleted.
 

doc/manual/src/command-ref/nix-env/install.md

@@ -11,7 +11,6 @@
   [`--from-profile` *path*]
   [`--preserve-installed` | `-P`]
   [`--remove-all` | `-r`]
-  [`--priority` *priority*]
 
 # Description
 
@@ -60,11 +59,6 @@ a number of possible ways:
     unambiguous way, which is necessary if there are multiple
     derivations with the same name.
 
-  - If `--priority` *priority* is given, the priority of the derivations being
-    installed is set to *priority*. This can be used to override the priority of
-    the derivations being installed. This is useful if *args* are store paths,
-    which don't have any priority information.
-
   - If *args* are [store derivations](@docroot@/glossary.md#gloss-store-derivation), then these are
     [realised](@docroot@/command-ref/nix-store/realise.md), and the resulting output paths
     are installed.

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

@@ -2,16 +2,16 @@
 
 The following options are allowed for all `nix-env` operations, but may not always have an effect.
 
-  - `--file` / `-f` *fileish*\
+  - `--file` / `-f` *path*\
     Specifies the Nix expression (designated below as the *active Nix
     expression*) used by the `--install`, `--upgrade`, and `--query
     --available` operations to obtain derivations. The default is
     `~/.nix-defexpr`.
 
-    *fileish* is interpreted the same as with [nix-build](../nix-build.md#fileish-syntax).
-    See that section for complete details (`nix-build --help`), but in summary, a path argument may be one of:
-
-    {{#include ../fileish-summary.md}}
+    If the argument starts with `http://` or `https://`, it is
+    interpreted as the URL of a tarball that will be downloaded and
+    unpacked to a temporary location. The tarball must include a single
+    top-level directory containing at least a file named `default.nix`.
 
   - `--profile` / `-p` *path*\
     Specifies the profile to be used by those operations that operate on

doc/manual/src/command-ref/nix-env/upgrade.md

@@ -22,7 +22,7 @@ left untouched; this is not an error. It is also not an error if an
 element of *args* matches no installed derivations.
 
 For a description of how *args* is mapped to a set of store paths, see
-[`--install`](install.md). If *args* describes multiple
+[`--install`](#operation---install). If *args* describes multiple
 store paths with the same symbolic name, only the one with the highest
 version is installed.
 

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

@@ -11,7 +11,7 @@
   [{`--attr`| `-A`} *attrPath*]
   [`--add-root` *path*]
   [`--expr` | `-E`]
-  *fileish…*
+  *files…*
 
 `nix-instantiate` `--find-file` *files…*
 
@@ -25,11 +25,8 @@ of the resulting store derivations are printed on standard output.
 
 [store derivation]: ../glossary.md#gloss-store-derivation
 
-If *fileish* is the character `-`, then a Nix expression will be read from standard input.
-Otherwise, each *fileish* is interpreted the same as with [nix-build](./nix-build.md#fileish-syntax).
-See that section for complete details (`nix-build --help`), but in summary, a path argument may be one of:
-
-{{#include ./fileish-summary.md}}
+If *files* is the character `-`, then a Nix expression will be read from
+standard input.
 
 # Options
 
@@ -38,14 +35,7 @@ See that section for complete details (`nix-build --help`), but in summary, a pa
 
   - `--parse`\
     Just parse the input files, and print their abstract syntax trees on
-    standard output. The output format of the AST depends on the current
-    internal representation and may change in the future.
-
-    Tooling can use the stderr and exit code of `--parse` to check any
-    Nix code for correctness, but should not rely on stdout without careful
-    versioning. Note that `--parse` also checks for unbound variables.
-    In cases where this is undesired, `with {};` can be prepended
-    to the program to transform all such parse errors into eval errors.
+    standard output as a Nix expression.
 
   - `--eval`\
     Just parse and evaluate the input files, and print the resulting

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

@@ -33,9 +33,10 @@ the environment of a derivation for development.
 If *path* is not given, `nix-shell` defaults to `shell.nix` if it
 exists, and `default.nix` otherwise.
 
-If *path* is given it is interpreted like a [*fileish* argument to nix-build](./nix-build.md#fileish-syntax):
-
-{{#include ./fileish-summary.md}}
+If *path* starts with `http://` or `https://`, it is interpreted as the
+URL of a tarball that will be downloaded and unpacked to a temporary
+location. The tarball must include a single top-level directory
+containing at least a file named `default.nix`.
 
 If the derivation defines the variable `shellHook`, it will be run
 after `$stdenv/setup` has been sourced. Since this hook is not executed

doc/manual/src/command-ref/nix-store/delete.md

@@ -4,7 +4,7 @@
 
 # Synopsis
 
-`nix-store` `--delete` [`--ignore-liveness`] [`--skip-live`] [`--delete-closure`] *paths…*
+`nix-store` `--delete` [`--ignore-liveness`] *paths…*
 
 # Description
 
@@ -18,13 +18,6 @@ With the option `--ignore-liveness`, reachability from the roots is
 ignored. However, the path still won’t be deleted if there are other
 paths in the store that refer to it (i.e., depend on it).
 
-This operation will raise an error if any of the paths are still live
-and `--ignore-liveness` is not passed. Passing `--skip-live` will
-prevent this from being considered an error.
-
-The option `--delete-closure` will also attempt to delete any paths
-that are in the given path's dependency closure.
-
 {{#include ./opt-common.md}}
 
 {{#include ../opt-common.md}}

doc/manual/src/command-ref/nix-store/query.md

@@ -93,12 +93,9 @@ symlink.
     [deriver]: ../../glossary.md#gloss-deriver
 
   - `--valid-derivers`\
-    Prints the set of all [derivers](../../glossary.md#gloss-deriver) that can be
-    used to build the store paths *paths*.
-    This differs from `--deriver`, which prints the deriver that actually
-    produced *paths*.
-    No deriver may be returned if is not present in the store,
-    eg, if *paths* were substituted from a binary cache.
+    Prints a set of derivation files (`.drv`) which are supposed produce
+    said paths when realized. Might print nothing, for example for source paths
+    or paths subsituted from a binary cache.
 
   - `--graph`\
     Prints the references graph of the store paths *paths* in the format

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

@@ -85,7 +85,7 @@ Most commands in Lix accept the following command-line options:
 
   - `multiline-with-logs`
 
-    Display the raw logs, with a progress bar and activities each in a new line at the bottom.
+    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`

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

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

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

@@ -99,4 +99,4 @@ This means that experimental features and RFCs are orthogonal mechanisms, and ca
 
 # Currently available experimental features
 
-{{#include @generated@/../../../lix/libutil/experimental-feature-descriptions.md}}
+{{#include @generated@/contributing/experimental-feature-descriptions.md}}

doc/manual/src/contributing/hacking.md

@@ -39,28 +39,17 @@ $ nix-shell -A native-clangStdenvPackages
 
 ### Building from the development shell
 
-Run a clean build and test with `just clean build install test`.
-
-You can also run the unit tests and integration tests separately:
+You can build and test Lix with just:
 
 ```bash
-$ just setup build test-unit
-$ just install test-integration
+$ just setup
+$ just build
+$ just test --suite=check
+$ just install
+$ just test --suite=installcheck
 ```
 
-Many targets have a `-custom` variant which pass extra arguments to `meson`.
-For example, to work on both Lix and nix-eval-jobs you can run:
-
-```
-$ just setup-custom -Dnix-eval-jobs=enabled
-$ # or
-$ mesonFlags=-Dnix-eval-jobs=enabled just setup
-```
-
-Note that only targets which don't accept extra arguments can be used when
-running multiple targets at once; `just setup build` is fine, but `just
-setup-custom build` is an error. The `test` target is usually the last one to
-run, so it always accepts extra arguments.
+(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:
 
@@ -113,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:
@@ -152,7 +141,6 @@ Lix can be built for various platforms, as specified in [`flake.nix`]:
 
 - `x86_64-linux`
 - `x86_64-darwin`
-- `x86_64-freebsd`
 - `i686-linux`
 - `aarch64-linux`
 - `aarch64-darwin`
@@ -229,7 +217,7 @@ Lix uses a string with the following format to identify the *system type* or *pl
 
 It is set when Lix is compiled for the given system, and determined by [Meson's `host_machine.cpu_family()` and `host_machine.system()` values](https://mesonbuild.com/Reference-manual_builtin_host_machine.html).
 
-For historic reasons and backward-compatibility, some CPU and OS identifiers are translated from the GNU Autotools naming convention in [`meson.build`](https://git.lix.systems/lix-project/lix/src/branch/main/meson.build) as follows:
+For historic reasons and backward-compatibility, some CPU and OS identifiers are translated from the GNU Autotools naming convention in [`meson.build`](https://git.lix.systems/lix-project/lix/blob/main/meson.build) as follows:
 
 | `host_machine.cpu_family()`             | Nix                 |
 |----------------------------|---------------------|
@@ -256,13 +244,13 @@ To build with one of those environments, you can use
 $ nix build .#nix-ccacheStdenv
 ```
 
-for <a id="nix-with-flakes">flake-enabled Nix</a>, or
+for flake-enabled Nix, or
 
 ```console
 $ nix-build --attr nix-ccacheStdenv
 ```
 
-for <a id="classic-nix">classic Nix</a>.
+for classic Nix.
 
 You can use any of the other supported environments in place of `nix-ccacheStdenv`.
 
@@ -411,76 +399,3 @@ The following properties are supported:
 
 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 definition 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 builtin 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`.

doc/manual/src/contributing/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',
+)

doc/manual/src/contributing/testing.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
@@ -345,7 +345,7 @@ rg '(?:[^A-Za-z]|^)(_[A-Z][^-\[ }/:");$(]+)' -r '$1' --no-filename --only-matchi
 rg '\$\{?([A-Z][^-\[ }/:");]+)' -r '$1' --no-filename --only-matching tests | sort -u > vars.txt
 ```
 
-I grepped `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 +361,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 +374,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`.

doc/manual/src/glossary.md

@@ -101,7 +101,7 @@
 
   See [File System Object](@docroot@/architecture/file-system-object.md) for details.
 
-  [file system object]: #gloss-store-path
+  [file system object]: #gloss-file-system-object
 
 - [store object]{#gloss-store-object}
 
@@ -249,7 +249,7 @@
   links.  NARs are generated and unpacked using `nix-store --dump`
   and `nix-store --restore`.
 
-- [`∅`]{#gloss-empty-set}
+- [`∅`]{#gloss-emtpy-set}
 
   The empty set symbol. In the context of profile history, this denotes a package is not present in a particular version of the profile.
 

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

@@ -1,6 +1,6 @@
 # Installing a Binary Distribution
 
-See <https://lix.systems/install/> for more details.
+See https://lix.systems/install/ for more details.
 
 <!--
 

doc/manual/src/installation/multi-user.md

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

doc/manual/src/introduction.md

@@ -148,7 +148,7 @@ paths) are set.
 
 For example, the following command gets all dependencies of the
 Pan newsreader, as described by [its
-Nix expression](https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/pa/pan/package.nix):
+Nix expression](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/newsreaders/pan/default.nix):
 
 ```console
 $ nix-shell '<nixpkgs>' --attr pan

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

@@ -261,7 +261,7 @@ Derivations can declare some infrequently used optional attributes.
     useful for very trivial derivations (such as `writeText` in Nixpkgs)
     that are cheaper to build than to substitute from a binary cache.
 
-    You may disable the effects of this attribute by enabling the
+    You may disable the effects of this attibute by enabling the
     `always-allow-substitutes` configuration option in Lix.
 
     > **Note**

doc/manual/src/language/builtin-constants.md

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

doc/manual/src/language/builtins.md

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

doc/manual/src/language/meson.build

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

doc/manual/src/language/operators.md

@@ -26,8 +26,8 @@
 | 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         |
+| \[Experimental\] [Function piping]     | *expr* |> *func*                           | left          | 15         |
+| \[Experimental\] [Function piping]     | *expr* <| *func*                           | right         | 16         |
 
 [string]: ./values.md#type-string
 [path]: ./values.md#type-path

doc/manual/src/language/values.md

@@ -77,6 +77,12 @@
   }
   ```
 
+  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*
@@ -164,7 +170,7 @@ Note that lists are only lazy in values, and they are strict in length.
 
 An attribute set is a collection of name-value-pairs (called *attributes*) enclosed in curly brackets (`{ }`).
 
-An attribute name can be an identifier or a [string](#type-string).
+An attribute name can be an identifier or a [string](#string).
 An identifier must start with a letter (`a-z`, `A-Z`) or underscore (`_`), and can otherwise contain letters (`a-z`, `A-Z`), numbers (`0-9`), underscores (`_`), apostrophes (`'`), or dashes (`-`).
 
 > *name* = *identifier* | *string* \

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

@@ -126,7 +126,7 @@ $ nix-env --install --attr nixpkgs.subversion
 ```
 
 will install the package called `subversion` from `nixpkgs` channel (which is, of course, the
-[Subversion version management system](https://subversion.apache.org/)).
+[Subversion version management system](http://subversion.tigris.org/)).
 
 > **Note**
 >

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

@@ -13,7 +13,7 @@
 
 - The `discard-references` feature has been stabilized.
   This means that the
-  `unsafeDiscardReferences`
+  [unsafeDiscardReferences](@docroot@/contributing/experimental-features.md#xp-feature-discard-references)
   attribute is no longer guarded by an experimental flag and can be used
   freely.
 

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

@@ -1,4 +1,114 @@
 # Lix 2.91 "Dragon's Breath" (2024-08-12)
+# Lix 2.91.3 (2025-06-30)
+
+## Fixes
+- Revert CVE-2025-52992 failed mitigation [fj#883](https://git.lix.systems/lix-project/lix/issues/883) [fj#887](https://git.lix.systems/lix-project/lix/issues/887) [cl/3420](https://gerrit.lix.systems/c/lix/+/3420) [cl/3524](https://gerrit.lix.systems/c/lix/+/3524) [cl/3523](https://gerrit.lix.systems/c/lix/+/3523) [cl/3522](https://gerrit.lix.systems/c/lix/+/3522)
+
+  Following the initial mitigation of **CVE-2025-52992** in `cl/3420`, we
+  received reports of **unexpected deletion of in-use store paths**.
+
+  Upon investigation, we found that the patch did **not correctly cancel all
+  automatic deleters**, resulting in potentially critical path loss during normal
+  operation.
+
+  Given the severity and time-sensitive nature of the situation ([see incident
+  report](https://lix.systems/blog/2025-06-27-lix-critical-bug/)), we evaluated
+  possible options to repair the behavior safely. However, we concluded that a
+  rushed fix would either:
+
+  * **Overdelete**, i.e. breaking running systems, or,
+  * **Underdelete**, effectively **reopening CVE-2025-52992** while leaving
+    orphaned paths behind.
+
+  As **CVE-2025-52992 has no known exploit vector**, and correctness is critical
+  in the Lix project, we have **fully reverted the previous mitigations**.
+
+  Moving forward, the Lix team will rework this code path in a **long-term,
+  correctness-first fix** on the main branch. We will explore backporting it to
+  stable channels once its safety is assured.
+
+  We are deeply sorry for the stability incident and the Lix team remain
+  available for assisting you in recovering your systems.
+
+  Many thanks to [Raito Bezarius](https://git.lix.systems/raito) and [eldritch horrors](https://git.lix.systems/pennae) for this.
+- Fallback to safe temp dir when build-dir is unwritable [fj#876](https://git.lix.systems/lix-project/lix/issues/876) [cl/3502](https://gerrit.lix.systems/c/lix/+/3502)
+
+  Non-daemon builds started failing with a permission error after introducing the `build-dir` option:
+
+  ```
+  $ nix build --store ~/scratch nixpkgs#hello --rebuild
+  error: creating directory '/nix/var/nix/builds/nix-build-hello-2.12.2.drv-0': Permission denied
+  ```
+
+  This happens because:
+
+  1. These builds are not run via the daemon, which owns `/nix/var/nix/builds`.
+  2. The user lacks permissions for that path.
+
+  We considered making `build-dir` a store-level option and defaulting it to `<chroot-root>/nix/var/nix/builds` for chroot stores, but opted instead for a fallback: if the default fails, Nix now creates a safe build directory under `/tmp`.
+
+  To avoid CVE-2025-52991, the fallback uses an extra path component between `/tmp` and the build dir.
+
+  **Note**: this fallback clutters `/tmp` with build directories that are not cleaned up. To prevent this, explicitly set `build-dir` to a path managed by Lix, even for local workloads.
+
+  Many thanks to [Raito Bezarius](https://git.lix.systems/raito) and [eldritch horrors](https://git.lix.systems/pennae) for this.
+
+
+# Lix 2.91.2 (2025-06-23)
+
+## Breaking Changes
+- Fixed output derivations can be run using `pasta` network isolation [fj#285](https://git.lix.systems/lix-project/lix/issues/285) [cl/3418](https://gerrit.lix.systems/c/lix/+/3418)
+
+  Fixed output derivations traditionally run in the host network namespace.
+  On Linux this allows such derivations to communicate with other sandboxes
+  or the host using the abstract Unix domains socket namespace; this hasn't
+  been unproblematic in the past and has been used in two distinct exploits
+  to break out of the sandbox. For this reason fixed output derivations can
+  now run in a network namespace (provided by [`pasta`]), restricted to TCP
+  and UDP communication with the rest of the world. When enabled this could
+  be a breaking change and we classify it as such, even though we don't yet
+  enable or require such isolation by default. We may enforce this in later
+  releases of Lix once we have sufficient confidence that breakage is rare.
+
+  [`pasta`]: https://passt.top/
+
+  Many thanks to [eldritch horrors](https://git.lix.systems/pennae) and [puck](https://git.lix.systems/puck) for this.
+
+## Fixes
+- Always clean up scratch paths after derivations failed to build [cl/3420](https://gerrit.lix.systems/c/lix/+/3420)
+
+  Previously, scratch paths created during builds were not always cleaned up if
+  the derivation failed, potentially leaving behind unnecessary temporary files
+  or directories in the Nix store.
+
+  This fix ensures that such paths are consistently removed after a failed build,
+  improving Nix store hygiene, hardening Lix against mis-reuse of failed builds
+  scratch paths.
+
+  Many thanks to [Raito Bezarius](https://git.lix.systems/raito) and [eldritch horrors](https://git.lix.systems/pennae) for this.
+- `build-dir` no longer defaults to `temp-dir` [cl/3419](https://gerrit.lix.systems/c/lix/+/3419)
+
+  The directory in which temporary build directories are created no longer defaults
+  to the value of the `temp-dir` setting to avoid builders making their directories
+  world-accessible. This behavior has been used to escape the build sandbox and can
+  cause build impurities even when not used maliciously. We now default to `builds`
+  in `NIX_STATE_DIR` (which is `/nix/var/nix/builds` in the default configuration).
+
+  Many thanks to [eldritch horrors](https://git.lix.systems/pennae) for this.
+
+
+# Lix 2.91.1 (2024-10-18)
+
+## Fixes
+- `<nix/fetchurl.nix>` now uses TLS verification [#11585](https://github.com/NixOS/nix/pull/11585)
+
+  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.
+
+  Many thanks to [Eelco Dolstra](https://github.com/edolstra) for this.
+
+
 
 
 # Lix 2.91.0 (2024-08-12)

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

@@ -1,428 +0,0 @@
-# Lix 2.92 "Bombe glacée" (2025-01-18)
-
-
-# Lix 2.92.0 (2025-01-18)
-
-## Breaking Changes
-- Deprecated language features [fj#437](https://git.lix.systems/lix-project/lix/issues/437) [#861](https://github.com/NixOS/nix/issues/861) [cl/1785](https://gerrit.lix.systems/c/lix/+/1785) [cl/1736](https://gerrit.lix.systems/c/lix/+/1736) [cl/1735](https://gerrit.lix.systems/c/lix/+/1735) [cl/1744](https://gerrit.lix.systems/c/lix/+/1744) [cl/2206](https://gerrit.lix.systems/c/lix/+/2206)
-
-  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` and `__lessThan`. 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.
-    - **Call to action:** If you have any use cases or workflows that depend on being able to override the `__nixPath` and `__findFile` symbols, please reach out to us. We want to eventually deprecate overriding these as well, and need input on how to design a better alternative.
-
-  Many thanks to [piegames](https://git.lix.systems/piegames) and [eldritch horrors](https://git.lix.systems/pennae) for this.
-- transfers no longer allow arbitrary url schemas [cl/2106](https://gerrit.lix.systems/c/lix/+/2106)
-
-  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.
-
-  Many thanks to [eldritch horrors](https://git.lix.systems/pennae) for this.
-- Removing the `.` default argument passed to the `nix fmt` formatter [#11438](https://github.com/NixOS/nix/pull/11438) [cl/1902](https://gerrit.lix.systems/c/lix/+/1902)
-
-  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 ]]; then set -- .; fi
-            exec "${pkgs.nixfmt-rfc-style}/bin/nixfmt" "$@"
-          '');
-      };
-  }
-  ```
-
-  Many thanks to [zimbatm](https://github.com/zimbatm) for this.
-
-## Features
-- Relative and tilde paths in configuration [fj#482](https://git.lix.systems/lix-project/lix/issues/482) [cl/1851](https://gerrit.lix.systems/c/lix/+/1851) [cl/1863](https://gerrit.lix.systems/c/lix/+/1863) [cl/1864](https://gerrit.lix.systems/c/lix/+/1864)
-
-  [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.
-
-  Many thanks to [wiggles](https://git.lix.systems/rbt) for this.
-
-## Improvements
-- Improved error messages for bad attr paths [cl/2277](https://gerrit.lix.systems/c/lix/+/2277) [cl/2280](https://gerrit.lix.systems/c/lix/+/2280)
-
-  Lix now includes much more detail when a bad attribute path is accessed at the command line:
-
-  ```
-   » nix eval -f '<nixpkgs>' lixVersions.lix_2_92
-  error: attribute 'lix_2_92' in selection path 'lixVersions.lix_2_92' not found
-         Did you mean one of lix_2_90 or lix_2_91?
-  ```
-
-  After:
-
-  ```
-   » nix eval --impure -f '<nixpkgs>' lixVersions.lix_2_92
-  error: attribute 'lix_2_92' in selection path 'lixVersions.lix_2_92' not found inside path 'lixVersions', whose contents are: { __unfix__ = «lambda @ /nix/store/hfz1qqd0z8amlgn8qwich1dvkmldik36-source/lib/fixed-points.nix:
-  447:7»; buildLix = «thunk»; extend = «thunk»; latest = «thunk»; lix_2_90 = «thunk»; lix_2_91 = «thunk»; override = «thunk»; overrideDerivation = «thunk»; recurseForDerivations = true; stable = «thunk»; }
-         Did you mean one of lix_2_90 or lix_2_91?
-  ```
-
-  This should avoid some unnecessary trips to the repl or to the debugger by giving some information about the value being selected on that was unexpected.
-
-  Many thanks to [jade](https://git.lix.systems/jade) for this.
-- Small error message improvements [cl/2185](https://gerrit.lix.systems/c/lix/+/2185) [cl/2187](https://gerrit.lix.systems/c/lix/+/2187)
-
-  When an attribute selection fails, the error message now correctly points to the attribute in the chain that failed instead of at the beginning of the entire chain.
-  ```diff
-   error: attribute 'x' missing
-  -       at /pwd/lang/eval-fail-remove.nix:4:3:
-  +       at /pwd/lang/eval-fail-remove.nix:4:29:
-               3| in
-               4|   (removeAttrs attrs ["x"]).x
-  -             |   ^
-  +             |                             ^
-               5|
-  ```
-
-  Failed asserts don't print the failed assertion expression anymore in the error message. That code was buggy and the information was redundant anyways, given that the error position already more accurately shows what exactly failed.
-
-  Many thanks to [piegames](https://git.lix.systems/piegames) for this.
-- Improvements to interactive flake config [cl/2066](https://gerrit.lix.systems/c/lix/+/2066)
-
-  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.
-
-  Many thanks to [ma27](https://git.lix.systems/ma27) for this.
-- `nix --version` now shows details about the installation by default [fj#620](https://git.lix.systems/lix-project/lix/issues/620) [cl/2365](https://gerrit.lix.systems/c/lix/+/2365)
-
-  This happened with `nix-env --version` by default, but due to [oddities around the nix3 CLI's verbosity](https://gerrit.lix.systems/c/lix/+/1370), it used to be `nix --verbose --version`.
-
-  No longer:
-
-  ```
-  $ nix --version
-  nix (Lix, like Nix) 2.92.0-dev-pre20250117-0d14c2b
-  System type: x86_64-linux
-  Additional system types: i686-linux, x86_64-v1-linux, x86_64-v2-linux, x86_64-v3-linux
-  Features: gc, signed-caches
-  System configuration file: /etc/nix/nix.conf
-  User configuration files: /home/jade/.config/nix/nix.conf:/etc/xdg/nix/nix.conf
-  Store directory: /nix/store
-  State directory: /nix/var/nix
-  Data directory: /nix/store/rliimcnqkplrqdgm4z6yqclpr6c32wh6-lix-2.92.0-dev-pre20250117-0d14c2b/share
-  ```
-
-  Many thanks to [just1602](https://git.lix.systems/just1602) for this.
-- `nix repl` correctly tab-completes attribute names that require quotes [cl/1783](https://gerrit.lix.systems/c/lix/+/1783)
-
-  The REPL (`nix repl`) now includes quotes as part of attribute names while completing with `<TAB>`,
-  if necessary. For example, attribute names like `"hello@example.com"` or `"hello world"` would
-  be suggested without quotes, resulting in invalid syntax.
-
-  Many thanks to [ian-h-chamberlain](https://git.lix.systems/ian-h-chamberlain) for this.
-- Reproducibility check builds now report all differing outputs [cl/2069](https://gerrit.lix.systems/c/lix/+/2069)
-
-  `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'
-  ```
-
-  Many thanks to [lheckemann](https://git.lix.systems/lheckemann) for this.
-- Some Lix crashes now produce reporting instructions and a stack trace, then abort [cl/1854](https://gerrit.lix.systems/c/lix/+/1854)
-
-  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
-   ...
-  ```
-
-  Many thanks to [jade](https://git.lix.systems/jade) for this.
-- Add a `temp-dir` setting to set the temporary directory location [#7731](https://github.com/NixOS/nix/issues/7731) [#8995](https://github.com/NixOS/nix/issues/8995) [fj#112](https://git.lix.systems/lix-project/lix/issues/112) [fj#253](https://git.lix.systems/lix-project/lix/issues/253) [cl/2103](https://gerrit.lix.systems/c/lix/+/2103)
-
-  [`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.
-
-  Many thanks to [lilyball](https://git.lix.systems/lilyball) for this.
-
-## Fixes
-- Build failures caused by `allowSubstitutes = false` while being the wrong system now produce a decent error [fj#484](https://git.lix.systems/lix-project/lix/issues/484) [cl/1841](https://gerrit.lix.systems/c/lix/+/1841)
-
-  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.
-  ```
-
-  Many thanks to [jade](https://git.lix.systems/jade) for this.
-- `Alt+Left` and `Alt+Right` go back/forwards by words in `nix repl` [fj#501](https://git.lix.systems/lix-project/lix/issues/501) [cl/1883](https://gerrit.lix.systems/c/lix/+/1883)
-
-  `nix repl` now recognizes `Alt+Left` and `Alt+Right` for navigating by words
-  when entering input in `nix repl` on more terminals/platforms.
-
-  Many thanks to [wiggles](https://git.lix.systems/rbt) for this.
-- Ctrl-C stops Nix commands much more reliably and responsively [#7245](https://github.com/NixOS/nix/issues/7245) [fj#393](https://git.lix.systems/lix-project/lix/issues/393) [#11618](https://github.com/NixOS/nix/pull/11618) [cl/2016](https://gerrit.lix.systems/c/lix/+/2016)
-
-  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.
-
-  Many thanks to [Robert Hensing](https://github.com/roberth) and [wiggles](https://git.lix.systems/rbt) for this.
-- restore backwards-compatibility of `builtins.fetchGit` with Nix 2.3 [#5291](https://github.com/NixOS/nix/issues/5291) [#5128](https://github.com/NixOS/nix/issues/5128)
-
-  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.
-
-  Many thanks to [ma27](https://git.lix.systems/ma27) for this.
-- Flakes/restrict-eval no longer allow reading contents of impure paths
-
-  Flakes and `--restrict-eval` now correctly restrict access to paths as intended.
-  In prior versions since at least 2.18, `nix eval --raw .#lol` for the following flake didn't throw an error and acted as if `--impure` was passed.
-
-  Thanks to the person who reported this for telling us about it.
-  This was handled as a low-severity security bug, but is not a violation of the [documented security model](../installation/multi-user.md) as untrusted Nix code should be assumed to have the privileges of the user running the evaluator.
-  To report a security bug, email a report to `security at lix dot systems`.
-
-  ```nix
-  {
-    inputs = {};
-    outputs = {...}: {
-      lol = builtins.readFile "${/etc/passwd}";
-    };
-  }
-  ```
-
-  Many thanks to [eldritch horrors](https://git.lix.systems/pennae) for this.
-- HTTP proxy environment variables are now respected for S3 binary cache stores [fj#433](https://git.lix.systems/lix-project/lix/issues/433) [cl/1788](https://gerrit.lix.systems/c/lix/+/1788)
-
-  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.
-
-  Many thanks to [jade](https://git.lix.systems/jade) for this.
-- Fix potential store corruption with auto-optimise-store [#7273](https://github.com/NixOS/nix/issues/7273) [cl/2100](https://gerrit.lix.systems/c/lix/+/2100)
-
-  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.
-
-  Many thanks to [lilyball](https://git.lix.systems/lilyball) for this.
-- Change `nix-build -o ""` to behave like `--no-out-link` [cl/2103](https://gerrit.lix.systems/c/lix/+/2103)
-
-  [`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.
-
-  Many thanks to [lilyball](https://git.lix.systems/lilyball) for this.
-- Ignore broken `/etc/ssl/certs/ca-certificates.crt` symlink [fj#560](https://git.lix.systems/lix-project/lix/issues/560) [cl/2144](https://gerrit.lix.systems/c/lix/+/2144)
-
-  [`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`.
-
-  Many thanks to [lilyball](https://git.lix.systems/lilyball) for this.
-- `<nix/fetchurl.nix>` now uses TLS verification [#11585](https://github.com/NixOS/nix/pull/11585)
-
-  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.
-
-  Many thanks to [Eelco Dolstra](https://github.com/edolstra) for this.
-
-## Packaging
-- readline support removed [cl/1885](https://gerrit.lix.systems/c/lix/+/1885)
-
-  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
-
-  Many thanks to [wiggles](https://git.lix.systems/rbt) for this.
-
-## Development
-- Includes are now qualified with library name everywhere [cl/2178](https://gerrit.lix.systems/c/lix/+/2178) [cl/2362](https://gerrit.lix.systems/c/lix/+/2362)
-
-  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.
-
-  Lix 2.92 removes support for the old `"foo.hh"` include form either internally or externally (that is, via pkg-config for things linking to Lix).
-
-  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), use a checkout of Lix 2.91 to run the following:
-
-  ```
-  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
-  ```
-
-  Many thanks to [jade](https://git.lix.systems/jade) for this.
-- The beginnings of a new pytest-based functional test suite [cl/2036](https://gerrit.lix.systems/c/lix/+/2036) [cl/2037](https://gerrit.lix.systems/c/lix/+/2037)
-
-  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.
-
-  Many thanks to [jade](https://git.lix.systems/jade) for this.
-- Dependency on monolithic coreutils removed [cl/2108](https://gerrit.lix.systems/c/lix/+/2108)
-
-  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.
-
-  Many thanks to [Vigress](https://git.lix.systems/vigress8) for this.
-- All Lix threads are named [cl/2210](https://gerrit.lix.systems/c/lix/+/2210)
-
-  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
-  ```
-
-  Many thanks to [jade](https://git.lix.systems/jade) for this.
-- Set `X-GitHub-Api-Version` header [fj#255](https://git.lix.systems/lix-project/lix/issues/255) [cl/1925](https://gerrit.lix.systems/c/lix/+/1925)
-
-  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.
-
-  Many thanks to [kiara](https://github.com/KiaraGrouwstra) for this.
-
-## Miscellany
-- Drop support for `xz` and `bzip2` Content-Encoding [cl/2134](https://gerrit.lix.systems/c/lix/+/2134)
-
-  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.
-
-  Many thanks to [eldritch horrors](https://git.lix.systems/pennae) for this.

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

@@ -1,953 +0,0 @@
-# Lix 2.93 "Bici Bici" (2025-05-09)
-# Lix 2.93.4 (2026-05-04)
-## Fixes
-
-- `build-dir` no longer defaults to `temp-dir` [cl/3453](https://gerrit.lix.systems/c/lix/+/3453)
-
-  The directory in which temporary build directories are created no longer defaults
-  to the value of the `temp-dir` setting to avoid builders making their directories
-  world-accessible. This behavior has been used to escape the build sandbox and can
-  cause build impurities even when not used maliciously. We now default to `builds`
-  in `NIX_STATE_DIR` (which is `/nix/var/nix/b` in the default configuration).
-
-  Many thanks to [eldritch horrors](https://git.lix.systems/pennae) for this.
-
-- Fix develop shells for derivations with escape codes [fj#991](https://git.lix.systems/lix-project/lix/issues/991) [cl/4154](https://gerrit.lix.systems/c/lix/+/4154) [cl/4155](https://gerrit.lix.systems/c/lix/+/4155)
-
-  ASCII control characters (including `\e`, used for ANSI escape codes) in derivation variables are now correctly escaped for `nix develop` and `nix print-dev-env`, instead of erroring.
-
-  Many thanks to [Qyriad](https://git.lix.systems/Qyriad) for this.
-
-- Fix nix develop for derivations that rejects dependencies with structured attrs [fj#997](https://git.lix.systems/lix-project/lix/issues/997) [cl/4182](https://gerrit.lix.systems/c/lix/+/4182) [cl/4214](https://gerrit.lix.systems/c/lix/+/4214)
-
-  For the sake of concision, we refer to `disallowedReferences` in what follows,
-  but all output checks were equally fixed:
-  `{dis,}allowed{References,Requisites}`.
-
-  Derivations can define *output checks* to reject unwanted dependencies, such as
-  interpreters like `bash` or compilers like `gcc`. This can be done in two ways:
-
-  * **Legacy style**: `disallowedReferences = [ ... ]` in the environment.
-  * **Structured attrs**: `outputChecks.<output>.disallowedReferences = [ ... ]`,
-    typically used in `__json`.
-
-  Only the structured form supports derivations with multiple outputs.
-
-  `nix develop` internally rewrites derivations to create development shells. It
-  relied on the legacy `disallowedReferences`, and failed to honor the structured
-  variant. This led to broken shells in cases where `bashInteractive` was
-  explicitly disallowed using structured output checks, e.g. `nix develop
-  nixpkgs#systemd` after the "bash-less NixOS" changes.
-
-  This fix teaches `nix develop` to respect structured output checks, restoring
-  support for such derivations.
-
-  Many thanks to [Raito Bezarius](https://git.lix.systems/raito) for this.
-
-- `nix-shell` default shell directory is not `/tmp` anymore for `$NIX_BUILD_TOP` [fj#940](https://git.lix.systems/lix-project/lix/issues/940)
-
-  Previously, Lix `nix-shell`s could exit non-zero status when `stdenv`'s `dumpVars` phase failed to write to `$NIX_BUILD_TOP/env-vars`, despite `dumpVars` being intended as a debugging aid.
-
-  This happens when `TMPDIR` is not set and defaults therefore to `/tmp`, resulting in a `/tmp/env-vars` global file that every `nix-shell` wants to write.
-
-  We fix this issue by reusing a pre-created, unique, and writable location, as the build top directory, avoiding shell exiting from write failures silently.
-
-  Many thanks to [Raito Bezarius](https://git.lix.systems/raito) for this.
-
-- Fix unsigned overflow leading to out-of-band write in the NAR parser [cl/5537](https://gerrit.lix.systems/c/lix/+/5537)
-
-  The NAR parser contained an unsigned integer overflow that could be used by an
-  attacker to write arbitrary data to an unknown memory location and possibly
-  achieve code execution. A successful attack on the system-wide Lix daemon
-  could lead to privilege escalation to root. Any process that involves NAR
-  serialization could trigger this issue, including (but not limited to)
-
-    - local user interaction, whether the users are trusted or untrusted
-    - malicious substituters sending malformed NARs
-    - remote builders sending malformed build results
-    - remote daemons sending malformed inputs when requesting remote builds
-
-  Successful attacks using this bug require ASLR weakening of some sort, whether
-  by architecture constraints (e.g. on 32 bit systems, where little randomization
-  is possible) or system configuration (e.g. low ASLR entropy when loading
-  libraries), and millions of attempts. Local attacks can be mounted in less than
-  an hour. Remote builds typically require a fresh SSH connection for each build
-  and are thus less susceptible. Only one attempt can be made by substituters for
-  every build using substituters, they are thus not a likely vector for attacks.
-
-  At the time of writing, MITRE has not assigned this a CVE yet.
-
-  Many thanks to [eldritch horrors](https://git.lix.systems/pennae), [Raito Bezarius](https://git.lix.systems/raito), [edef](https://github.com/edef1c), and [sandydoo](https://github.com/sandydoo) for this.
-
-
-
-
-# Lix 2.93.3 (2025-07-22)
-## Improvements
-
-- `--keep-failed` chowns the build directory to the user that request the build [cl/3678](https://gerrit.lix.systems/c/lix/+/3678)
-
-  Running a build with `--keep-failed` now chowns the temporary directory from the
-  builder user and group to the user that request the build if the build came from
-  a local user connected to the daemon. This makes inspecting failed derivations a
-  lot easier. On Linux the build directory made visible to the user will not be in
-  the same path as it was in the sandbox and continuing builds will usually break.
-
-  Many thanks to [eldritch horrors](https://git.lix.systems/pennae) for this.
-
-
-
-
-# Lix 2.93.2 (2025-06-30)
-## Fixes
-
-- Revert CVE-2025-52992 failed mitigation [fj#883](https://git.lix.systems/lix-project/lix/issues/883) [fj#887](https://git.lix.systems/lix-project/lix/issues/887) [cl/3444](https://gerrit.lix.systems/c/lix/+/3444) [cl/3528](https://gerrit.lix.systems/c/lix/+/3528)
-
-  Following the initial mitigation of **CVE-2025-52992** in `cl/3444`, we
-  received reports of **unexpected deletion of in-use store paths**.
-
-  Upon investigation, we found that the patch did **not correctly cancel all
-  automatic deleters**, resulting in potentially critical path loss during normal
-  operation.
-
-  Given the severity and time-sensitive nature of the situation ([see incident
-  report](https://lix.systems/blog/2025-06-27-lix-critical-bug/)), we evaluated
-  possible options to repair the behavior safely. However, we concluded that a
-  rushed fix would either
-
-  * **Overdelete**, i.e. breaking running systems, or,
-  * **Underdelete**, effectively **reopening CVE-2025-52992** while leaving
-    orphaned paths behind.
-
-  As **CVE-2025-52992 has no known exploit vector**, and correctness is critical
-  in the Lix project, we have **fully reverted the previous mitigations**.
-
-  The affected patches (`cl/3444`) have been rolled back for the time being.
-
-  Moving forward, the Lix team will rework this code path in a **long-term,
-  correctness-first fix** on the main branch. We will explore backporting it to
-  stable channels once its safety is assured.
-
-  We are deeply sorry for the stability incident and the Lix team remain
-  available for assisting you in recovering your systems.
-
-  Many thanks to [Raito Bezarius](https://git.lix.systems/raito) and [eldritch horrors](https://git.lix.systems/pennae) for this.
-
-- Fallback to safe temp dir when build-dir is unwritable [fj#876](https://git.lix.systems/lix-project/lix/issues/876) [cl/3501](https://gerrit.lix.systems/c/lix/+/3501)
-
-  Non-daemon builds started failing with a permission error after introducing the `build-dir` option:
-
-  ```
-  $ nix build --store ~/scratch nixpkgs#hello --rebuild
-  error: creating directory '/nix/var/nix/builds/nix-build-hello-2.12.2.drv-0': Permission denied
-  ```
-
-  This happens because:
-
-  1. These builds are not run via the daemon, which owns `/nix/var/nix/builds`.
-  2. The user lacks permissions for that path.
-
-  We considered making `build-dir` a store-level option and defaulting it to `<chroot-root>/nix/var/nix/builds` for chroot stores, but opted instead for a fallback: if the default fails, Nix now creates a safe build directory under `/tmp`.
-
-  To avoid CVE-2025-52991, the fallback uses an extra path component between `/tmp` and the build dir.
-
-  **Note**: this fallback clutters `/tmp` with build directories that are not cleaned up. To prevent this, explicitly set `build-dir` to a path managed by Lix, even for local workloads.
-
-  Many thanks to [Raito Bezarius](https://git.lix.systems/raito) and [eldritch horrors](https://git.lix.systems/pennae) for this.
-
-
-
-
-# Lix 2.93.1 (2025-06-23)
-## Breaking Changes
-
-- Fixed output derivations can be run using `pasta` network isolation [fj#285](https://git.lix.systems/lix-project/lix/issues/285) [cl/3442](https://gerrit.lix.systems/c/lix/+/3442)
-
-  Fixed output derivations traditionally run in the host network namespace.
-  On Linux this allows such derivations to communicate with other sandboxes
-  or the host using the abstract Unix domains socket namespace; this hasn't
-  been unproblematic in the past and has been used in two distinct exploits
-  to break out of the sandbox. For this reason fixed output derivations can
-  now run in a network namespace (provided by [`pasta`]), restricted to TCP
-  and UDP communication with the rest of the world. When enabled this could
-  be a breaking change and we classify it as such, even though we don't yet
-  enable or require such isolation by default. We may enforce this in later
-  releases of Lix once we have sufficient confidence that breakage is rare.
-
-  [`pasta`]: https://passt.top/
-
-  Many thanks to [eldritch horrors](https://git.lix.systems/pennae) and [puck](https://git.lix.systems/puck) for this.
-
-
-## Fixes
-
-- Always clean up scratch paths after derivations failed to build [cl/3444](https://gerrit.lix.systems/c/lix/+/3444)
-
-  Previously, scratch paths created during builds were not always cleaned up if
-  the derivation failed, potentially leaving behind unnecessary temporary files
-  or directories in the Nix store.
-
-  This fix ensures that such paths are consistently removed after a failed build,
-  improving Nix store hygiene, hardening Lix against mis-reuse of failed builds
-  scratch paths.
-
-  Many thanks to [Raito Bezarius](https://git.lix.systems/raito) and [eldritch horrors](https://git.lix.systems/pennae) for this.
-
-- `build-dir` no longer defaults to `temp-dir` [cl/3443](https://gerrit.lix.systems/c/lix/+/3443)
-
-  The directory in which temporary build directories are created no longer defaults
-  to the value of the `temp-dir` setting to avoid builders making their directories
-  world-accessible. This behavior has been used to escape the build sandbox and can
-  cause build impurities even when not used maliciously. We now default to `builds`
-  in `NIX_STATE_DIR` (which is `/nix/var/nix/builds` in the default configuration).
-
-  Many thanks to [eldritch horrors](https://git.lix.systems/pennae) for this.
-
-- Remove reliance on Bash for remote stores via SSH [fj#830](https://git.lix.systems/lix-project/lix/issues/830) [fj#805](https://git.lix.systems/lix-project/lix/issues/805) [fj#304](https://git.lix.systems/lix-project/lix/issues/304) [cl/3159](https://gerrit.lix.systems/c/lix/+/3159)
-
-  The pre-flight `echo started` handshake -- added years ago to catch race conditions -- has been removed.
-
-  After removal of connection sharing in Lix 2.93, it required a Bash-compatible shell and a standard `echo`, so it failed on:
-
-    * builders protected by `ForceCommand` wrappers (e.g. `nix-remote-build`),
-    * BusyBox / initrd images with no Bash,
-    * hosts using non-POSIX shells such as Nushell.
-
-  The race the probe once addressed was tied to SSH connection-sharing -- since connection-sharing code has already been removed, the probe is now pointless.
-
-  Real connection or protocol errors are now left to SSH/Nix to report directly.
-
-  This is technically a breaking change if you had scripts that relied on the literal "started" which needs to be updated to rely on other signals, e.g., exit codes.
-
-  Many thanks to [Raito Bezarius](https://git.lix.systems/raito) for this.
-
-
-## Miscellany
-
-- Deprecation of CA derivations, dynamic derivations, and impure derivations [fj#815](https://git.lix.systems/lix-project/lix/issues/815)
-
-  Content-addressed derivations are now deprecated and slated for removal in Lix 2.94.
-  We're doing this because the CA derivation system has been a known cause of problems
-  and inconsistencies, is unmaintained, habitually makes improving the store code very
-  difficult (or blocks such improvements outright), and is beset by a number of design
-  flaws that in our opinion cannot be fixed without a full reimplementation from zero.
-  Dynamic derivations and impure derivations are built on the CA derivation framework,
-  and owing to this they too are deprecated and slated for removal in another release.
-
-
-
-
-
-
-# Lix 2.93.0 (2025-05-09)
-## Breaking Changes
-
-- more deprecated features
-
-  This release cycle features a new batch of deprecated (anti-)features.
-  You can opt in into the old behavior with `--extra-deprecated-features` or any equivalent configuration option.
-
-  - `cr-line-endings`: Current handling of CR (`\r`) or CRLF (`\r\n`) line endings in Nix is inconsistent and broken, and will lead to unexpected evaluation results with certain strings. Given that fixing the semantics might silently alter the evaluation result of derivations, the only option at the moment is to disallow them altogether. More proper support for CRLF is planned to be added back again in the future. Until then, all files must use `\n` exclusively.
-  - `nul-bytes`: Currently the Nix grammar allows NUL bytes (`\0`) in strings, and thus indirectly also in identifiers. Unfortunately, several core parts of the code base still work with NUL-terminated strings and cannot easily be migrated. Also note that it is still possible to introduce NUL bytes and thus problematic behavior via other means, those are tracked separately.
-
-  Many thanks to [piegames](https://git.lix.systems/piegames) and [eldritch horrors](https://git.lix.systems/pennae) for this.
-
-- Removal of the `recursive-nix` experimental feature [fj#767](https://git.lix.systems/lix-project/lix/issues/767) [cl/2872](https://gerrit.lix.systems/c/lix/+/2872)
-
-  The `recursive-nix` experimental feature and all associated code have been removed.
-
-  `recursive-nix` enabled running Nix operations (like evaluations and builds) *inside* a derivation builder. This worked by spawning a temporary Nix daemon socket within the build environment, allowing the derivation to emit outputs that appeared in the outer store. This was primarily used to prototype **dynamic derivations** (dyndrvs), where build plans are generated on-the-fly during a build.
-
-  However, this approach introduced critical issues:
-
-  - It entrenched the legacy Nix daemon protocol as part of the derivation ABI, which is a blocker for future stabilization.
-  - It imposed tight coupling between sandbox setup code and knowledge of Nix internals, complicating refactoring and long-term maintenance.
-  - It was never intended to be the final design for dynamic derivations. The original Nix implementation team, who are leading dyndrv development, have agreed it will be replaced (likely via `varlink` or similar) before any stabilization.
-  - There is currently no known usage of `recursive-nix` on `lix` or elsewhere **in production**.
-
-  If you're using `recursive-nix` for something niche or experimental, we'd love to hear from you on the RFD issue.
-  You can still run `nix` inside a builder manually if needed — including with isolated user namespaces and fake stores — but the special daemon-handshake machinery is gone.
-
-  This removal unblocks several important internal cleanups.
-
-  Many thanks to [Raito Bezarius](https://git.lix.systems/raito) for this.
-
-- Flake inputs/`builtins.fetchTree` invocations with `type = "file"` now have consistent (but different from previous versions) resulting paths [fj#750](https://git.lix.systems/lix-project/lix/issues/750) [cl/2864](https://gerrit.lix.systems/c/lix/+/2864)
-
-  Previously `fetchTree { type = "file"; url = "...", narHash = "sha256-..."; }` could return a different result depending on whether someone has run `nix store add-path --name source ...` on a path with the same `narHash` as the flake input/`fetchTree` invocation (or if such a path exists in an accessible binary cache).
-
-  In the past `type = "file"` flake inputs were, in contrast to all other flake inputs, hashed in *flat* hash mode rather than *recursive* hash mode.
-  The difference between the two is that *flat* mode hashes are just what you get from `sha256sum` of a single file, whereas *recursive* hashes are the SHA256 sum of a NAR (Nix ARchive, a deterministic tarball-like format) of a file tree.
-
-  Much of flakes assumes that everything is recursive-hashed including `nix flake archive`, substitution of flake inputs from binary caches, and more, which led to the substitution path code being taken if such a path is present, yielding a different store path non-deterministically.
-
-  To fix this non-deterministic evaluation bug, we needed to break derivation hash stability, so some Nix evaluations now produce different results than previous versions of Lix.
-  Lix now has consistent behaviour with CppNix 2.24 with respect to `file` flake inputs: they are *always* recursively hashed.
-
-  Many thanks to [jade](https://git.lix.systems/jade) for this.
-
-- Builders are always started in a fresh cgroup namespace [cl/1996](https://gerrit.lix.systems/c/lix/+/1996)
-
-  If you haven't enabled the experimental `cgroups` feature, Nix previously launched builder processes in new namespaces but did not create new cgroup namespaces. As a result, derivations could access and observe the parent cgroup namespace.
-
-  Although this update introduces a breaking change, it ensures that all derivations now start in a fresh cgroup namespace by default. This reduces potential impurities observable within the sandbox, improving the likelihood of reproducible builds across different environments.
-
-  Many thanks to [Raito Bezarius](https://git.lix.systems/raito) for this.
-
-- `nix-instantiate --parse` outputs json [fj#487](https://git.lix.systems/lix-project/lix/issues/487) [nix#11124](https://github.com/NixOS/nix/issues/11124) [nix#4726](https://github.com/NixOS/nix/issues/4726) [nix#3077](https://github.com/NixOS/nix/issues/3077) [cl/2190](https://gerrit.lix.systems/c/lix/+/2190)
-
-  `nix-instantiate --parse` does not print out the AST in a Nix-like format anymore.
-  Instead, it now prints a JSON representation of the internal expression tree.
-  Tooling should not rely on the stdout of `nix-instantiate --parse`.
-
-  We've done our best to ensure that the new behavior is as compatible with the old one as possible.
-  If you depend on the old behavior in ways that are not covered anymore or are otherwise negatively affected by this change,
-  then please reach out so that we can find a sustainable solution together.
-
-  Many thanks to [piegames](https://git.lix.systems/piegames) and [eldritch horrors](https://git.lix.systems/pennae) for this.
-
-- Remove experimental repl-flake [gh#10103](https://github.com/NixOS/nix/issues/10103) [fj#557](https://git.lix.systems/lix-project/lix/issues/557) [gh#10299](https://github.com/NixOS/nix/pull/10299) [cl/2147](https://gerrit.lix.systems/c/lix/+/2147)
-
-  The `repl-flake` experimental feature flag has been removed, its functionality is now the default when `flakes` experimental feature is active. The `nix repl` command now works like the rest of the new CLI in that `nix repl {path}` now tries to load a flake at `{path}` (or fails if the `flakes` experimental feature isn't enabled).
-
-  Many thanks to [Jonathan De Troye](https://github.com/detroyejr) and [KFears](https://git.lix.systems/kfearsoff) for this.
-
-
-## Features
-
-- `lix foo` now invokes `lix-foo` from PATH [cl/2119](https://gerrit.lix.systems/c/lix/+/2119)
-
-  Lix introduces the ability to extend the Nix command line by adding custom
-  binaries to the `PATH`, similar to how Git integrates with other tools. This
-  feature allows developers and end users to enhance their workflow by
-  integrating additional functionalities directly into the Nix CLI.
-
-  #### Examples
-
-  For example, a user can create a custom deployment tool, `lix-deploy-tool`, and
-  place it in their `PATH`. This allows them to execute `lix deploy-tool`
-  directly from the command line, streamlining the process of deploying
-  applications without needing to switch contexts or use separate commands.
-
-  #### Limitations
-
-  For now, autocompletion is supported to discover new custom commands, but the
-  documentation will not render them. Argument autocompletion of the custom
-  command is not supported either.
-
-  This is also locked behind a new experimental feature called
-  `lix-custom-sub-commands` to enable developing all the required features.
-
-  Only the top-level `lix` command can be extended, this is an artificial
-  limitation for the time being until we flesh out this feature.
-
-  #### Outline
-
-  In the future, this feature may pave the way for moving the Flake subcommand
-  line to its own standalone binary, allowing for a more focused approach to
-  managing Nix Flakes while letting the community explore alternatives to
-  dependency management.
-
-  Many thanks to [Raito Bezarius](https://git.lix.systems/raito) for this.
-
-- `nix-env --install` now accepts a `--priority` flag [cl/2607](https://gerrit.lix.systems/c/lix/+/2607)
-
-  `nix-env --install` now has an optional `--priority` flag.
-
-  Previously, it was only possible to specify a priority by adding a
-  `meta.priority` attribute to a derivation. `meta` attributes only exist during
-  eval, so that wouldn't work for installing a store path. It was also possible
-  to change a priority after initial installation using `nix-env --set-flag`,
-  however if there is already a conflict that needs to be resolved via priorities,
-  this will not work.
-
-  Now, a priority can be set at install time using `--priority`, which allows for
-  cleanly overriding the priority at install time.
-
-  #### Example
-
-  ```console
-  $ nix-build
-  $ nix-env --install --priority 100 ./result
-  ```
-
-  Many thanks to [Andrew Hamon](https://github.com/andrewhamon) for this.
-
-- Add support for eBPF USDT/dtrace probes inside Lix [fj#727](https://git.lix.systems/lix-project/lix/issues/727) [cl/2884](https://gerrit.lix.systems/c/lix/+/2884)
-
-  eBPF tracers like `bpftrace` and `dtrace` are a group of similar tools for debugging production systems.
-  User-space statically defined tracing probes (USDT) allow for defining zero or near-zero disabled-probe-effect probes, thus allowing instrumentation of hot paths in production builds.
-  Lix now has internal support for defining these probes and has shipped its first probe.
-
-  As of this writing it is available by default in the Linux build of Lix.
-
-  To try it out on Linux, you can use the following example command:
-
-  ```
-  $ sudo bpftrace -l 'usdt:/path/to/liblixstore.so:*:*'
-  usdt:/path/to/liblixstore.so:lix_store:filetransfer__read
-
-  $ sudo bpftrace -e 'usdt:*:lix_store:filetransfer__read { printf("%s read %d\n", str(arg0), arg1); }'
-  Attaching 1 probe...
-  https://cache.nixos.org/wvpzaycmvs39h5bcsfrxkjsg48mj4h73.narinf.. read 8192
-  https://cache.nixos.org/wvpzaycmvs39h5bcsfrxkjsg48mj4h73.narinf.. read 8192
-  https://cache.nixos.org/nar/1qshsc30nlarzdig0v9b1aasdkwaxhnv0a0.. read 65536
-  https://cache.nixos.org/nar/1qshsc30nlarzdig0v9b1aasdkwaxhnv0a0.. read 65536
-  ```
-
-  Note that bpftrace does not offer any way to list the arguments to USDT probes in a human readable form.
-  To get the probe definitions, see the `*.d` files in the Lix source code, for example, `lix/libstore/trace-probes.d`.
-
-  For more resources on eBPF/bpftrace and dtrace, see:
-  * The book "BPF Performance Tools" by Brendan Gregg, which discusses bpftrace at length.
-  * <https://ebpf.io/get-started/>
-  * [Illumos' dtrace book](https://illumos.org/books/dtrace/preface.html)
-
-  Many thanks to [jade](https://git.lix.systems/jade) for this.
-
-
-## Improvements
-
-- Always print `post-build-hook` logs [fj#675](https://git.lix.systems/lix-project/lix/issues/675) [cl/2801](https://gerrit.lix.systems/c/lix/+/2801)
-
-  Logs of `post-build-hook` are now printed unconditionally.
-  They used to be tied to whether print-build-logs is set, which made debugging them a nightmare when they fail, since the failure output would be eaten if build logs are disabled.
-  Most usages of `post-build-hook` are pretty quiet especially compared to build logs, so it should not be that bothersome to not be able to turn off.
-
-  Many thanks to [jade](https://git.lix.systems/jade) for this.
-
-- Crashes land in syslog now [cl/2640](https://gerrit.lix.systems/c/lix/+/2640)
-
-  When Lix crashes with unexpected exceptions and in some other conditions, it prints bug reporting instructions.
-  Previously, these only landed in stderr and not in syslog.
-  However, on larger Lix installations, it may be the case that Lix crashes in the client without the logs landing in the system logs, which impeded diagnosis.
-
-  Now, such crashes always land in syslog too.
-
-  Many thanks to [jade](https://git.lix.systems/jade) for this.
-
-- Deletion of specific paths no longer fails fast [cl/2778](https://gerrit.lix.systems/c/lix/+/2778)
-
-  `nix-store --delete` and `nix store delete` now continue deleting
-  paths even if some of the given paths are still live. An error is only
-  thrown once deletion of all the given paths has been
-  attempted. Previously, if some paths were deletable and others
-  weren't, the deletable ones would be deleted iff they preceded the
-  live ones in lexical sort order.
-
-  The error message for still-live paths no longer reports the paths
-  that could not be deleted, because there could potentially be many of
-  these.
-
-  Many thanks to [lheckemann](https://git.lix.systems/lheckemann) for this.
-
-- `--skip-live` for path deletion [cl/2778](https://gerrit.lix.systems/c/lix/+/2778)
-
-  `nix-store --delete` and `nix store delete` now support a
-  `--skip-live` option and a `--delete-closure` option.
-
-  This makes custom garbage-collection logic a lot easier to implement
-  and experiment with:
-
-  - Paths known to be large can be thrown at `nix store delete` without
-    having to manually filter out those that are still reachable from a
-    root, e.g.
-    `nix store delete /nix/store/*mbrola-voices*`
-
-  - The `--delete-closure` option allows extending this to paths that are
-    not large themselves but do have a large closure size, e.g.
-    `nix store delete /nix/store/*nixos-system-gamingpc*`.
-
-  - Other heuristics like atime-based deletion can be applied more
-    easily, because `nix store delete` once again takes over the task of
-    working out which paths can't be deleted.
-
-  Many thanks to [lheckemann](https://git.lix.systems/lheckemann) for this.
-
-- Allow `nix store diff-closures` to output JSON [cl/2360](https://gerrit.lix.systems/c/lix/+/2360)
-
-  Add the `--json` option to the `nix store diff-closures` command to allow users to collect diff information into a machine readable format.
-
-  ```bash
-  $ build/lix/nix/nix store diff-closures --json /run/current-system /nix/store/n1prick95pihd4lkv58nn3pzg1yivcdb-neovim-0.10.4/bin/nvim | jq | head -n 23
-  {
-    "packages": {
-      "02overridedns": {
-        "sizeDelta": -688,
-        "versionsAfter": [],
-        "versionsBefore": [
-          ""
-        ]
-      },
-      "50-coredump.conf": {
-        "sizeDelta": -1976,
-        "versionsAfter": [],
-        "versionsBefore": [
-          ""
-        ]
-      },
-      "Diff": {
-        "sizeDelta": -514864,
-        "versionsAfter": [],
-        "versionsBefore": [
-          "0.4.1"
-        ]
-      },
-  ```
-
-  Many thanks to [Xavier Maso](https://github.com/pamplemousse) for this.
-
-- Show all missing and unexpected arguments in erroneous function calls [cl/2477](https://gerrit.lix.systems/c/lix/+/2477)
-
-  When calling a function that expects an attribute set, lix will now show all
-  missing and unexpected arguments.
-  e.g. with `({ a, b, c } : a + b + c) { a = 1; d = 1; }` lix will now show the error:
-  ```
-  [...]
-  error: function 'anonymous lambda' called without required arguments 'b' and 'c' and with unexpected argument 'd'
-  [...]
-  ```
-  Previously lix would just show `b`.
-  Furthermore lix will now only suggest arguments that aren't yet used.
-  e.g. with `({ a?1, b?1, c?1 } : a + b + c) { a = 1; d = 1; e = 1; }` lix will now show the error:
-  ```
-  [...]
-  error: function 'anonymous lambda' called with unexpected arguments 'd' and 'e'
-         at «string»:1:2:
-              1| ({ a?1, b?1, c?1 } : a + b + c) { a = 1; d = 1; e = 1; }
-               |  ^
-         Did you mean one of b or c?
-  ```
-  Previously lix would also suggest `a`.
-  Suggestions are unfortunately still currently just for the first missing argument.
-
-  Many thanks to [Zitrone](https://git.lix.systems/quantenzitrone) for this.
-
-- REPL improvements [cl/2319](https://gerrit.lix.systems/c/lix/+/2319) [cl/2320](https://gerrit.lix.systems/c/lix/+/2320) [cl/2321](https://gerrit.lix.systems/c/lix/+/2321)
-
-  The REPL has seen various minor improvements:
-
-  - Variable declarations have been improved, making copy-pasting code from attrsets a lot easier:
-    - Declarations can now optionally end with a semicolon
-    - Multiple declarations can be done within one command, separated by semicolon
-    - The `foo.bar = "baz";` syntax from attrsets is also supported, however without the attrset merging rules and with restrictions on dynamic attrs like in `let` bindings.
-    - Variable names now use the proper Nix grammar rules, instead of a regex that only vaguely matched legal identifiers.
-  - Better error messages overall
-  - The `:env` command to print currently available variables now also works outside of debug mode
-  - Adding variables to the REPL now prints a small message on success
-
-  Many thanks to [piegames](https://git.lix.systems/piegames) for this.
-
-- Consistently use SRI hashes in hash mismatch errors [cl/2868](https://gerrit.lix.systems/c/lix/+/2868)
-
-  Previously there were a few weird cases (flake inputs, e.g., among others) where Lix would print the old Nix base-32 hash format (sha256:abcd...) rather than the newer [SRI base64 format](https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity) (sha256-AAAA...) that is used in most Lix hash mismatch errors.
-  This made it annoying to compare them to hashes shown by most of the modern UI surface of Lix which uses SRI.
-
-  Many thanks to [jade](https://git.lix.systems/jade) for this.
-
-- Allow specifying ports for remote ssh[-ng] stores [cl/2432](https://gerrit.lix.systems/c/lix/+/2432)
-
-  You can now specify which port should be used for a remote ssh store (e.g. for remote/distributed builds) through a uri parameter.
-  E.g., when a remote builder `foo` is listening on port `1234` instead of the default, it can be specified like this `ssh://foo?port=1234`.
-
-  Many thanks to [seppel3210](https://github.com/Seppel3210) for this.
-
-- Implicit `__toString` now have stack trace entries [cl/3055](https://gerrit.lix.systems/c/lix/+/3055)
-
-  Coercion of attribute sets to strings via their `__toString` attribute now produce stack
-  frames pointing to the coercion site and the attribute definition. This makes locating a
-  coercion function error easier as the fault location is now more likely to be presented.
-
-  Previously:
-  ```
-  nix-repl> builtins.substring 1 1 "${{ __toString = self: throw ''bar''; }}"
-  error:
-         … while calling the 'substring' builtin
-           at «string»:1:1:
-              1| builtins.substring 1 1 "${{ __toString = self: throw ''bar''; }}"
-               | ^
-
-         … caused by explicit throw
-           at «string»:1:48:
-              1| builtins.substring 1 1 "${{ __toString = self: throw ''bar''; }}"
-               |                                                ^
-
-         error: bar
-  ```
-
-  Now:
-  ```
-  nix-repl> builtins.substring 1 1 "${{ __toString = self: throw ''bar''; }}"
-  error:
-         … while calling the 'substring' builtin
-           at «string»:1:1:
-              1| builtins.substring 1 1 "${{ __toString = self: throw ''bar''; }}"
-               | ^
-
-         … while converting a set to string
-           at «string»:1:25:
-              1| builtins.substring 1 1 "${{ __toString = self: throw ''bar''; }}"
-               |                         ^
-
-         … from call site
-           at «string»:1:29:
-              1| builtins.substring 1 1 "${{ __toString = self: throw ''bar''; }}"
-               |                             ^
-
-         … while calling '__toString'
-           at «string»:1:42:
-              1| builtins.substring 1 1 "${{ __toString = self: throw ''bar''; }}"
-               |                                          ^
-
-         … caused by explicit throw
-           at «string»:1:48:
-              1| builtins.substring 1 1 "${{ __toString = self: throw ''bar''; }}"
-               |                                                ^
-
-         error: bar
-  ```
-
-  Many thanks to [eldritch horrors](https://git.lix.systems/pennae) for this.
-
-
-## Fixes
-
-- Avoid unnecessarily killing processes for the build user's UID [nix#9142](https://github.com/NixOS/nix/issues/9142) [fj#667](https://git.lix.systems/lix-project/lix/issues/667)
-
-  We no longer kill all processes under the build user's UID before and after
-  builds on Linux with sandboxes enabled.
-
-  This avoids unrelated processes being killed. This might happen for instance,
-  if the user is running Lix inside a container, wherein the build users use the same UIDs as the daemon's.
-
-  Many thanks to [teofilc](https://git.lix.systems/teofilc) for this.
-
-- Forbid impure path accesses in pure evaluation mode again [cl/2708](https://gerrit.lix.systems/c/lix/+/2708)
-
-  Lix 2.92.0 mistakenly started allowing the access to ancestors of allowed paths in pure evaluation mode.
-  This made it possible to bypass the purity restrictions, for example by copying arbitrary files to the store:
-  ```nix
-  builtins.path {
-    path = "/";
-    filter = …;
-  }
-  ```
-  Restore the previous behaviour of prohibiting such impure accesses.
-
-  Many thanks to [alois31](https://git.lix.systems/alois31) for this.
-
-- Ctrl-C works correctly on macOS again [fj#729](https://git.lix.systems/lix-project/lix/issues/729) [cl/3066](https://gerrit.lix.systems/c/lix/+/3066)
-
-  Due to a kernel bug in macOS's `poll(2)` implementation where it would forget about event subscriptions, our detection of closed connections in the Lix daemon didn't work and left around lingering daemon processes.
-  We have rewritten that thread to use `kqueue(2)`, which is what the `poll(2)` implementation uses internally in the macOS kernel, so now Ctrl-C on clients will reliably terminate daemons once more.
-
-  This FD close monitoring has had the highest Apple bug ID references per line of code anywhere in the project, and hopefully not using poll anymore will stop us hitting bugs in poll.
-
-  Many thanks to [jade](https://git.lix.systems/jade) for this.
-
-- Fetch peer PID for daemon connections on macOS [fj#640](https://git.lix.systems/lix-project/lix/issues/640) [cl/2453](https://gerrit.lix.systems/c/lix/+/2453)
-
-  `nix-daemon` will now fetch the peer PID for connections on macOS, to match behavior with Linux.
-  Besides showing up in the log output line, If `nix-daemon` is given an argument (such as `--daemon`)
-  that argument will be overwritten with the peer PID for the forked process that handles the connection,
-  which can be used for debugging purposes.
-
-  Many thanks to [lilyball](https://git.lix.systems/lilyball) for this.
-
-- Test group membership better on macOS [gh#5885](https://github.com/NixOS/nix/issues/5885) [cl/2566](https://gerrit.lix.systems/c/lix/+/2566)
-
-  `nix-daemon` will now test group membership better on macOS for `trusted-users` and `allowed-users`.
-  It not only fetches the peer gid (which fixes `@staff`) but it also asks opendirectory for group
-  membership checks instead of just using the group database, which means nested groups (like `@_developer`)
-  and groups with synthesized membership (like `@localaccounts`) will work.
-
-  Many thanks to [lilyball](https://git.lix.systems/lilyball) for this.
-
-- `nix store delete` no longer builds paths [cl/2782](https://gerrit.lix.systems/c/lix/+/2782)
-
-  `nix store delete` no longer realises the installables
-  specified. Previously, `nix store delete nixpkgs#hello` would download
-  hello only to immediately delete it again. Now, it exits with an error
-  if given an installable that isn't in the store.
-
-  Many thanks to [lheckemann](https://git.lix.systems/lheckemann) for this.
-
-- Fix nix-store --delete on paths with remaining referrers [cl/2783](https://gerrit.lix.systems/c/lix/+/2783)
-
-  Nix 2.5 introduced a regression whereby `nix-store --delete` and `nix
-  store delete` started to fail when trying to delete a path that was
-  still referenced by other paths, even if the referrers were not
-  reachable from any GC roots. The old behaviour, where attempting to
-  delete a store path would also delete its referrer closure, is now
-  restored.
-
-  Many thanks to [lheckemann](https://git.lix.systems/lheckemann) for this.
-
-- Add a straightforward way to detect if in a Nix3 Shell [nix#6677](https://github.com/NixOS/nix/issues/6677) [nix#3862](https://github.com/NixOS/nix/issues/3862) [cl/2090](https://gerrit.lix.systems/c/lix/+/2090)
-
-  Running `nix shell` or `nix develop` will now set `IN_NIX_SHELL` to
-  either `pure` or `impure`, depending on whether `--ignore-environment`
-  is passed. `nix develop` will always be an impure environment.
-
-  Many thanks to [Ersei Saggi](https://github.com/9p4) for this.
-
-- Fix experimental and deprecated features showing as integers in `nix config show --json` [fj#738](https://git.lix.systems/lix-project/lix/issues/738) [cl/2882](https://gerrit.lix.systems/c/lix/+/2882)
-
-  Internal changes in 2.92 caused `nix config show --json` to show deprecated and experimental features not as the list of named features 2.91 and earlier produced, but as integers. This has been fixed.
-
-  Many thanks to [eldritch horrors](https://git.lix.systems/pennae) for this.
-
-- `builtins.fetchTree` is no longer visible in `builtins` when flakes are disabled [cl/2399](https://gerrit.lix.systems/c/lix/+/2399)
-
-  `builtins.fetchTree` is the foundation of flake inputs and flake lock files, but is not fully specified in behaviour, which leads to regressions, behaviour differences with CppNix, and other unfun times.
-  It's gated behind the `flakes` experimental feature, but prior to now, would throw an uncatchable error at runtime when used without the `flakes` feature enabled.
-  Now it's like other builtins which are experimental feature gated, where it is not visible without the relevant feature enabled.
-
-  This fixes a bug in using Eelco Dolstra's version of flake-compat on Lix (and a divergence with CppNix): https://github.com/edolstra/flake-compat/issues/66
-
-  Many thanks to [jade](https://git.lix.systems/jade) for this.
-
-- fix usage of `builtins.filterSource` and `builtins.path` with the filter argument when using chroot stores [nix#11503](https://github.com/NixOS/nix/issues/11503)
-
-  The semantics of `builtins.filterSource` (and the `filter` argument for
-  `builtins.path`) have been adjusted regarding how paths inside the Nix store
-  are handled.
-
-  Previously, when evaluating whether a path should be included, the filtering
-  function received the **physical path** if the source was inside the chroot store.
-
-  Now, it receives the **logical path** instead.
-
-  This ensures consistency in path handling and avoids potential
-  misinterpretations of paths within the evaluator, which led to various fallouts
-  mentioned in <https://github.com/NixOS/nixpkgs/pull/369694>.
-
-  Many thanks to [lily](https://git.lix.systems/lilyinstarlight), [alois31](https://git.lix.systems/alois31), and [eldritch horrors](https://git.lix.systems/pennae) for this.
-
-- Fix `--help` formatting [fj#622](https://git.lix.systems/lix-project/lix/issues/622) [cl/2776](https://gerrit.lix.systems/c/lix/+/2776)
-
-  The help printed when invoking `nix` or `nix-store` and subcommands with `--help` previously contained garbled terminal escapes. These have been removed.
-
-  Many thanks to [lheckemann](https://git.lix.systems/lheckemann) for this.
-
-- Parsing failures in flake.lock no longer crash Lix [fj#559](https://git.lix.systems/lix-project/lix/issues/559) [cl/2401](https://gerrit.lix.systems/c/lix/+/2401)
-
-  Failure to parse `flake.lock` no longer hard-crashes Lix and instead produces a nice error message.
-
-  ```
-  error:
-         … while updating the lock file of flake 'git+file:///Users/jade/lix/lix2'
-
-         … while parsing the lock file at /nix/store/mm5dqh8a729yazzj82cjffxl97n5c62s-source//flake.lock
-
-         error: [json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - invalid literal;
-   last read: '#'
-  ```
-
-  Many thanks to [gilice](https://git.lix.systems/gilice) for this.
-
-- Flakes follow `--eval-system` where it makes sense [fj#673](https://git.lix.systems/lix-project/lix/issues/673) [fj#692](https://git.lix.systems/lix-project/lix/issues/692) [gh#11359](https://github.com/NixOS/nix/issues/11359) [cl/2657](https://gerrit.lix.systems/c/lix/+/2657)
-
-  Most flake commands now follow `--eval-system` when choosing attributes to build/evaluate/etc.
-
-  The exceptions are commands that actually run something on the local machine:
-  - nix develop
-  - nix run
-  - nix upgrade-nix
-  - nix fmt
-  - nix bundle
-
-  This is not a principled approach to cross compilation or anything, flakes still impede rather than support cross compilation, but this unbreaks many remote build use cases.
-
-  Many thanks to [jade](https://git.lix.systems/jade) for this.
-
-- Remove some gremlins from path garbage collection [fj#621](https://git.lix.systems/lix-project/lix/issues/621) [fj#524](https://git.lix.systems/lix-project/lix/issues/524) [cl/2465](https://gerrit.lix.systems/c/lix/+/2465) [cl/2387](https://gerrit.lix.systems/c/lix/+/2387)
-
-  Path garbage collection had some known unsoundness issues where it would delete things improperly and cause desynchronization between the filesystem state and the database state.
-  Now Lix tolerates better if such a condition exists by not failing the entire GC if a path fails to delete.
-  We also fixed a bug in our file locking implementation that is one possible root cause, but may not be every root cause.
-
-  Many thanks to [eldritch horrors](https://git.lix.systems/pennae) and [Raito Bezarius](https://git.lix.systems/raito) for this.
-
-- Show illegal path references in fixed-outputs derivations [fj#530](https://git.lix.systems/lix-project/lix/issues/530) [cl/2726](https://gerrit.lix.systems/c/lix/+/2726)
-
-  The error created when referencing a store path in a Fixed-Output Derivation is now more verbose, listing the offending paths.
-  This allows for better pinpointing where the issue might be.
-
-  An offender is the following derivation:
-
-  ```nix
-  pkgs.stdenv.mkDerivation {
-    name = "illegal-fod";
-
-    dontUnpack = true;
-    dontBuild = true;
-
-    installPhase = ''
-      cp -R ${pkgs.hello} $out
-    '';
-
-    outputHashMode = "recursive";
-    outputHashAlgo = "sha256";
-    outputHash = pkgs.lib.fakeHash;
-  }
-  ```
-
-  The previous error shown would have been:
-
-  ```
-  error: illegal path references in fixed-output derivation '/nix/store/rpq4m1y79s2nhs1hj7k47yiyykxykiqa-illegal-fod.drv'
-  ```
-
-  and is now:
-
-  ```
-  error: the fixed-output derivation '/nix/store/rpq4m1y79s2nhs1hj7k47yiyykxykiqa-illegal-fod.drv' must not reference store paths but 2 such references were found:
-           /nix/store/1q8w6gl1ll0mwfkqc3c2yx005s6wwfrl-hello-2.12.1
-           /nix/store/wn7v2vhyyyi6clcyn0s9ixvl7d4d87ic-glibc-2.40-36
-  ```
-
-  Many thanks to [Tom Hubrecht](https://git.lix.systems/tom-hubrecht) for this.
-
-- Show error when item from NIX_PATH cannot be downloaded
-
-  For e.g. `nix-instantiate -I https://example.com/404`, you'd only get a warning if the download failed, such as
-
-      warning: Nix search path entry 'https://example.com/404' cannot be downloaded, ignoring
-
-  Now, the full error that caused the download failure is displayed with a note that the search
-  path entry is ignored, e.g.
-
-      warning:
-           … while downloading https://example.com/404 to satisfy NIX_PATH lookup, ignoring search path entry
-
-           warning: unable to download 'https://example.com/404': HTTP error 404 ()
-
-           response body: […]
-
-  Many thanks to [ma27](https://git.lix.systems/ma27) for this.
-
-- Fix Lix crashing on invalid json [fj#642](https://git.lix.systems/lix-project/lix/issues/642) [fj#753](https://git.lix.systems/lix-project/lix/issues/753) [fj#759](https://git.lix.systems/lix-project/lix/issues/759) [fj#769](https://git.lix.systems/lix-project/lix/issues/769) [cl/2907](https://gerrit.lix.systems/c/lix/+/2907)
-
-  Lix no longer crashes when it receives invalid JSON. Instead it'll point to the syntax error and give some context about what happened, for example
-
-  ```
-  ❯ nix derivation add <<<"""
-  error:
-         … while parsing a derivation from stdin
-
-         error: failed to parse JSON: [json.exception.parse_error.101] parse error at line 2, column 1: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal
-  ```
-
-  Many thanks to [eldritch horrors](https://git.lix.systems/pennae) for this.
-
-- Fix handling of `lastModified` in tarball inputs [cl/2792](https://gerrit.lix.systems/c/lix/+/2792)
-
-  Previous versions of Lix would fail with the following error, if a
-  [tarball flake input](@docroot@/protocols/tarball-fetcher.md) redirect
-  to a URL that contains a `lastModified` field:
-
-  ```
-  error: input attribute 'lastModified' is not an integer
-  ```
-
-  This is now fixed.
-
-  Many thanks to [xanderio](https://github.com/xanderio) and [Julian Stecklina](https://github.com/blitz) for this.
-
-- Fix `--debugger --ignore-try` [cl/2440](https://gerrit.lix.systems/c/lix/+/2440)
-
-  When in debug mode (e.g. from using the `--debugger` flag), enabling [`ignore-try`](@docroot@/command-ref/conf-file.md#conf-ignore-try) once again properly disables debug REPLs within [`builtins.tryEval`](@docroot@/language/builtins.md#builtins-tryEval) calls. Previously, a debug REPL would be started as if `ignore-try` was disabled, but that REPL wouldn't actually be in debug mode, and upon exiting the REPL the evaluating process would segfault.
-
-  Many thanks to [Dusk Banks](https://git.lix.systems/bb010g) for this.
-
-- Don't consider a path with a specified rev to be `locked` [cl/2064](https://gerrit.lix.systems/c/lix/+/2064)
-
-  Until now it was allowed to do e.g.
-
-      $ echo 'lalala' > testfile
-      $ nix eval --expr '(builtins.fetchTree { path = "/home/ma27/testfile"; rev = "0000000000000000000000000000000000000000"; type = "path"; })'
-      { lastModified = 1723656303; lastModifiedDate = "20240814172503"; narHash = "sha256-hOMY06A0ohaaCLwnhpZIMoAqi/8kG2vk30NRiqi0dfc="; outPath = "/nix/store/lhfz259iipmv9ky995rml8018jvriynh-source"; rev = "0000000000000000000000000000000000000000"; shortRev = "0000000"; }
-      $ cat /nix/store/lhfz259iipmv9ky995rml8018jvriynh-source
-      lalala
-
-  because any kind of input with a `rev` specified is considered to be locked.
-
-  With this change, inputs of type `path`, `indirect` and `tarball` are no longer
-  considered locked with a rev, but no hash specified.
-
-  This behavior was changed in
-  [CppNix 2.21 as well](https://github.com/nixos/nix/commit/071dd2b3a4e6c0b2106f1b6f14ec26e153d97446) as well.
-
-  Many thanks to [ma27](https://git.lix.systems/ma27) for this.
-
-- Fix macOS sandbox profile size errors [fj#752](https://git.lix.systems/lix-project/lix/issues/752) [fj#718](https://git.lix.systems/lix-project/lix/issues/718) [cl/2861](https://gerrit.lix.systems/c/lix/+/2861)
-
-  Fixed an issue on macOS where the sandbox profile could exceed size limits when building derivations with many dependencies. The profile is now split into multiple allowed sections to stay under the interpreter's limits.
-
-  This resolves errors like
-
-  ```
-  error: (failed with exit code 1, previous messages: sandbox initialization failed: data object length 65730 exceeds maximum (65535)|failed to configure sandbox)
-
-         error: unexpected EOF reading a line
-  ```
-
-  Many thanks to [Pierre-Etienne Meunier](https://github.com/P-E-Meunier) and [Poliorcetics](https://github.com/poliorcetics) for this.
-
-- Fix interference of the multiline progress bar with output [cl/2774](https://gerrit.lix.systems/c/lix/+/2774)
-
-  In some situations, the progress indicator of the multiline progress bar would interfere with persistent output.
-  This would result in progress bar headers being visible in place of the desired text, for example the outputs shown after a `:b` command in the repl.
-  The underlying ordering issue has been fixed, so that the undesired interference does not happen any more.
-
-  Many thanks to [alois31](https://git.lix.systems/alois31) for this.
-
-- Paralellise `nix store sign` using a thread pool [fj#399](https://git.lix.systems/lix-project/lix/issues/399) [cl/2606](https://gerrit.lix.systems/c/lix/+/2606)
-
-  `nix store sign` with a large collection of provided paths (such as when using with `--all`) has historically
-  signed these paths serially. Taking extreme amounts of time when preforming operations such as fixing binary
-  caches. This has been changed. Now these signatures are performed using a thread pool like `nix store copy-sigs`.
-
-  Many thanks to [Lunaphied](https://git.lix.systems/Lunaphied) for this.
-
-- `post-build-hook` only receives settings that are set [fj#739](https://git.lix.systems/lix-project/lix/issues/739) [cl/2800](https://gerrit.lix.systems/c/lix/+/2800)
-
-  If one is using `post-build-hook` to upload paths to a cache, it used to be broken if CppNix was used inside the script, since CppNix would fail about unsupported configuration option values in some of Lix's defaults.
-  This is because `post-build-hook` receives the settings of the nix daemon in the `NIX_CONFIG` environment variable.
-  Now Lix only emits overridden settings to `post-build-hook` invocations, which fixes this issue in the majority of cases: where the configuration is not explicitly incompatible.
-
-  Many thanks to [jade](https://git.lix.systems/jade) for this.
-
-- Remove lix-initiated ssh connection sharing [fj#304](https://git.lix.systems/lix-project/lix/issues/304) [fj#644](https://git.lix.systems/lix-project/lix/issues/644) [cl/3005](https://gerrit.lix.systems/c/lix/+/3005)
-
-  Lix no longer explicitly requests ssh connection sharing (ControlMaster/ControlPath SSH
-  options, see also ssh_config(5) man page) when connecting to remote stores.  This may
-  impact command latency when `NIX_REMOTE` is set to a `ssh://` or `ssh-ng://` url, or if
-  `--store` is specified. Remote build connections did not use ssh connection sharing.
-
-  Connection sharing configuration is now inherited from user configuration at all times. It
-  is now advisable to configure connection sharing for remote builders for improved latency.
-
-  Many thanks to [eldritch horrors](https://git.lix.systems/pennae) for this.
-
-
-## Development
-
-- Add `nix_plugin_entry` entry point for plugins [fj#740](https://git.lix.systems/lix-project/lix/issues/740) [fj#359](https://git.lix.systems/lix-project/lix/issues/359) [gh#8699](https://github.com/NixOS/nix/pull/8699) [cl/2826](https://gerrit.lix.systems/c/lix/+/2826)
-
-  Plugins are an exceptionally rarely used feature in Lix, but they are important as a prototyping tool for code destined for Lix itself, and we want to keep supporting them as a low-maintenance-cost feature.
-  As part of the overall move towards getting rid of static initializers for stability and predictability reasons, we added an explicit `nix_plugin_entry` function like CppNix has, which is called immediately after plugin load, if present.
-  This makes control flow more explicit and allows for easily registering things that have had their static initializer registration classes removed.
-
-  Many thanks to [jade](https://git.lix.systems/jade) and [yorickvp](https://github.com/yorickvp) for this.
-
-
-## Miscellany
-
-- Set default of `connect-timeout` to `5` [cl/2799](https://gerrit.lix.systems/c/lix/+/2799)
-
-  By default, the connection timeout to substituters is now 5s instead of 300s.
-  That way, unavailable substituters are detected quicker.
-
-  Many thanks to [ma27](https://git.lix.systems/ma27) for this.

doc/manual/substitute.py

@@ -1,21 +1,9 @@
 #!/usr/bin/env python3
-"""
-Preprocesses mdbook markdown, primarily for include directives.
-
-The include directive format is as follows:
-    {{#include foo/bar/baz.md}}
-
-The content of includes will be indented as much as the directive itself.
-
-Including a generated file (from building Lix; generally for the 'new' CLI):
-    {{#include @generated@/foo/bar/baz.md}}
-"""
 
 from pathlib import Path
 import json
 import os, os.path
 import sys
-import textwrap
 
 name = 'substitute.py'
 
@@ -23,12 +11,6 @@ def log(*args, **kwargs):
     kwargs['file'] = sys.stderr
     return print(f'{name}:', *args, **kwargs)
 
-def remove_prefix_if_present(s: str, prefix: str) -> str | None:
-    if s.startswith(prefix):
-        return s.removeprefix(prefix)
-    else:
-        return None
-
 def do_include(content: str, relative_md_path: Path, source_root: Path, search_path: Path):
     assert not relative_md_path.is_absolute(), f'{relative_md_path=} from mdbook should be relative'
 
@@ -38,32 +20,16 @@ def do_include(content: str, relative_md_path: Path, source_root: Path, search_p
 
     lines = []
     for l in content.splitlines(keepends=True):
-        if remain := remove_prefix_if_present(l.strip(), "{{#include"):
-            requested = remain[1:-2]
-            # We indent bodies of indent directives by the indent of the
-            # directive itself.
-            num_leading_indent = len(l) - len(l.lstrip())
-
-            if subpath := remove_prefix_if_present(requested, "@generated@/"):
-                included = search_path / Path(subpath)
+        if l.strip().startswith("{{#include "):
+            requested = l.strip()[11:][:-2]
+            if requested.startswith("@generated@/"):
+                included = search_path / Path(requested[12:])
                 requested = included.relative_to(search_path)
             else:
                 included = source_root / relative_md_path.parent / requested
                 requested = included.resolve().relative_to(source_root)
             assert included.exists(), f"{requested} not found at {included}"
-
-            lines.append(
-                textwrap.indent(
-                    do_include(
-                        included.read_text(),
-                        requested,
-                        source_root,
-                        search_path,
-                    ),
-                    " " * num_leading_indent
-                )
-                + "\n"
-            )
+            lines.append(do_include(included.read_text(), requested, source_root, search_path) + "\n")
         else:
             lines.append(l)
     return "".join(lines)

doc/manual/utils.nix

@@ -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));
+}

docker.nix

@@ -156,7 +156,7 @@ let
 
   nixConfContents =
     (lib.concatStringsSep "\n" (
-      lib.mapAttrsToList (
+      lib.mapAttrsFlatten (
         n: v:
         let
           vStr = if builtins.isList v then lib.concatStringsSep " " v else v;

flake.lock

@@ -35,11 +35,11 @@
     "nix2container": {
       "flake": false,
       "locked": {
-        "lastModified": 1724996935,
-        "narHash": "sha256-njRK9vvZ1JJsP8oV2OgkBrpJhgQezI03S7gzskCcHos=",
+        "lastModified": 1749158376,
+        "narHash": "sha256-uirStFNxauh0lxzBowcp28X+Sq7JgsBIDnbwbAfZwf8=",
         "owner": "nlewo",
         "repo": "nix2container",
-        "rev": "fa6bb0a1159f55d071ba99331355955ae30b3401",
+        "rev": "0f8974c58755dba441df03598eefd1e1cd50e341",
         "type": "github"
       },
       "original": {

flake.nix

@@ -48,7 +48,6 @@
       sgr = builtins.fromJSON ''"\u001b["'';
       freezePage = "https://wiki.lix.systems/books/lix-contributors/page/freezes-and-recommended-contributions";
       codebaseOverview = "https://wiki.lix.systems/books/lix-contributors/page/codebase-overview";
-      gerritWiki = "https://wiki.lix.systems/books/lix-contributors/page/gerrit";
       contribNotice = builtins.toFile "lix-contrib-notice" ''
         Hey there!
 
@@ -66,10 +65,6 @@
         and we'd like to work together with all contributors as much as possible.
         Lix is a collaborative project :)
 
-        If you want to submit a patch and you never used gerrit before, please
-        check our gerrit wiki section:
-          ${sgr}32m${gerritWiki}${sgr}0m
-
         You can open an issue at https://git.lix.systems/lix-project/lix/issues
         or chat with us on Matrix: #space:lix.systems.
 
@@ -109,16 +104,16 @@
         "armv7l-linux"
         "riscv64-linux"
         "aarch64-linux"
-        "x86_64-freebsd"
+        # 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
         # "x86_64-netbsd"
       ];
 
       stdenvs = [
-        # see assertion in package.nix why these two are disabled
-        # "stdenv"
-        # "gccStdenv"
+        "gccStdenv"
         "clangStdenv"
+        "stdenv"
         "libcxxStdenv"
         "ccacheStdenv"
       ];
@@ -138,11 +133,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 (
@@ -154,7 +145,14 @@
               localSystem = {
                 inherit system;
               };
-              crossSystem = if crossSystem == null then null else { system = crossSystem; };
+              crossSystem =
+                if crossSystem == null then
+                  null
+                else
+                  {
+                    system = crossSystem;
+                  }
+                  // lib.optionalAttrs (crossSystem == "x86_64-freebsd") { useLLVM = true; };
               overlays = [ (overlayFor (p: p.${stdenv})) ];
             };
           stdenvs = forAllStdenvs (make-pkgs null);
@@ -163,7 +161,7 @@
         {
           inherit stdenvs native;
           static = native.pkgsStatic;
-          cross = forAllCrossSystems (crossSystem: make-pkgs crossSystem "clangStdenv");
+          cross = forAllCrossSystems (crossSystem: make-pkgs crossSystem "stdenv");
         }
       );
 
@@ -219,57 +217,15 @@
             inherit versionSuffix officialRelease;
             stdenv = currentStdenv;
             busybox-sandbox-shell = final.busybox-sandbox-shell or final.default-busybox-sandbox-shell;
-            # See below
-            lowdown = final.lowdown_3_0;
-            lowdown-unsandboxed = final.lowdown_3_0.override { enableDarwinSandbox = false; };
           };
 
           lix-clang-tidy = final.callPackage ./subprojects/lix-clang-tidy { };
 
-          nix-eval-jobs = final.callPackage ./subprojects/nix-eval-jobs {
-            srcDir = ./subprojects/nix-eval-jobs;
-          };
-
-          # HACK: We need nix-prefetch-git for fetchCargoVendor for Rust stuff,
-          # so it can't use Lix, or we infrec:
-          #   lix -> Rust stuff -> fetchCargoVendor -> nix-prefetch-git -> nix (lix)
-          # This will eventually become a problem upstream, but until then,
-          # apply some duct tape and pray.
-          nix-prefetch-git =
-            if (lib.functionArgs prev.nix-prefetch-git.override) ? "nix" then
-              prev.nix-prefetch-git.override { nix = prev.nix; }
-            else
-              prev.nix-prefetch-git;
-
           # Export the patched version of boehmgc that Lix uses into the overlay
           # for consumers of this flake.
           boehmgc-nix = final.nix.passthru.boehmgc-nix;
           # And same thing for our build-release-notes package.
           build-release-notes = final.nix.passthru.build-release-notes;
-
-          # As soon as Nixpkgs updates to >= 3.0.0, change to lowdown_2_0!
-          # We don't change the default version in order to not change the hash
-          # of Nix/Lix from upstream Nixpkgs.
-          lowdown_3_0 =
-            assert lib.versionOlder prev.lowdown.version "3.0.0";
-            prev.lowdown.overrideAttrs (
-              finalAttrs: prevAttrs: {
-                version = "3.0.1";
-                src = final.fetchurl {
-                  url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${finalAttrs.version}.tar.gz";
-                  sha512 = "fe68e1b7ff23f3992398356d7aa9a330dfd7b72e22bea9a91eeef74182b209ecea0c9f3e2b2216e1a07b2358da2b746238ec9cbbdeebdd3551cef14dd2d79f46";
-                };
-
-                # no longer compiles with GNU make
-                nativeBuildInputs = prevAttrs.nativeBuildInputs ++ [ final.bmake ];
-                # dylib fixups on darwin are no longer necessary
-                postInstall = "";
-                # doesn't work on darwin due to disallowed nested sandboxes
-                doInstallCheck = prevAttrs.doInstallCheck && !(final.stdenv.hostPlatform.isDarwin);
-                doCheck = prevAttrs.doCheck && !(final.stdenv.hostPlatform.isDarwin);
-              }
-            );
-
         };
     in
     {
@@ -278,21 +234,12 @@
 
       # 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.
         build = forAllSystems (system: self.packages.${system}.nix);
 
-        # Ensure support for lowdown < 3.0 doesn't regress for NixOS 25.11
-        build-lowdown_2_0.aarch64-linux = lib.genAttrs [ "aarch64-linux" ] (
-          system:
-          self.packages.${system}.nix.override {
-            lowdown = nixpkgsFor.${system}.native.lowdown;
-            lowdown-unsandboxed = nixpkgsFor.${system}.native.lowdown-unsandboxed;
-          }
-        );
-
         devShell = forAllSystems (system: {
           default = self.devShells.${system}.default;
           clang = self.devShells.${system}.native-clangStdenvPackages;
@@ -323,9 +270,6 @@
         # Perl bindings for various platforms.
         perlBindings = forAllSystems (system: nixpkgsFor.${system}.native.nix.passthru.perl-bindings);
 
-        # nix-eval-jobs can be built against this Lix.
-        nix-eval-jobs = forAllSystems (system: nixpkgsFor.${system}.native.nix-eval-jobs);
-
         # Binary tarball for various platforms, containing a Nix store
         # with the closure of 'nix' package.
         binaryTarball = forAllSystems (system: nixpkgsFor.${system}.native.nix.passthru.binaryTarball);
@@ -342,8 +286,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;
             };
@@ -357,101 +299,88 @@
           });
 
         # System tests.
-        tests =
-          import ./tests/nixos {
-            inherit
-              self
-              lib
-              nixpkgs
-              nixpkgsFor
-              ;
-          }
-          // {
-            nix-eval-jobs = forAllSystems (system: self.packages.${system}.nix-eval-jobs.tests.nix-eval-jobs);
+        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;
+          };
 
-            # 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.
+          # 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 {
               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;
+              lintInsteadOfBuild = 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
-              '';
+          # Make sure that nix-env still produces the exact same result
+          # on a particular version of Nixpkgs.
+          evalNixpkgs =
+            with nixpkgsFor.x86_64-linux.native;
+            runCommand "eval-nixos" { buildInputs = [ nix ]; } ''
+              type -p nix-env
+              # Note: we're filtering out nixos-install-tools because https://github.com/NixOS/nixpkgs/pull/153594#issuecomment-1020530593.
+              time nix-env --store dummy:// -f ${nixpkgs-regression} -qaP --drv-path | sort | grep -v nixos-install-tools > packages
+              [[ $(sha1sum < packages | cut -c1-40) = 402242fca90874112b34718b8199d844e8b03d12 ]]
+              mkdir $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.
-            evalNixpkgs =
-              with nixpkgsFor.x86_64-linux.native;
-              runCommand "eval-nixos" { buildInputs = [ nix ]; } ''
-                type -p nix-env
-                # Note: we're filtering out nixos-install-tools because https://github.com/NixOS/nixpkgs/pull/153594#issuecomment-1020530593.
-                time nix-env --store dummy:// -f ${nixpkgs-regression} -qaP --drv-path | sort | grep -v nixos-install-tools > packages
-                [[ $(sha1sum < packages | cut -c1-40) = 402242fca90874112b34718b8199d844e8b03d12 ]]
-                mkdir $out
-              '';
-
-            nixpkgsLibTests = forAllSystems (
-              system:
-              let
-                inherit (self.packages.${system}) nix;
-                pkgs = nixpkgsFor.${system}.native;
-                testWithNix = import (nixpkgs + "/lib/tests/test-with-nix.nix") { inherit pkgs lib nix; };
-              in
-              pkgs.symlinkJoin {
-                name = "nixpkgs-lib-tests";
-                paths = [
-                  testWithNix
-                ]
-                # NOTE: nixpkgs 25.05 is being ... *creative*, and requires this dance to override
-                # the evaluator used for the test. it will break again in the future, don't worry.
-                ++ lib.optionals pkgs.stdenv.isLinux [
-                  ((pkgs.callPackage "${nixpkgs}/ci/eval" { inherit nix; }).attrpathsSuperset {
-                    evalSystem = system;
-                  })
-                ];
-              }
-            );
-          };
+          nixpkgsLibTests = forAllSystems (
+            system:
+            let
+              inherit (self.packages.${system}) nix;
+              pkgs = nixpkgsFor.${system}.native;
+              testWithNix = import (nixpkgs + "/lib/tests/test-with-nix.nix") { inherit pkgs lib nix; };
+            in
+            pkgs.symlinkJoin {
+              name = "nixpkgs-lib-tests";
+              paths = [
+                testWithNix
+              ]
+              # NOTE: nixpkgs 25.05 is being ... *creative*, and requires this dance to override
+              # the evaluator used for the test. it will break again in the future, don't worry.
+              ++ lib.optionals pkgs.stdenv.isLinux [
+                ((pkgs.callPackage "${nixpkgs}/ci/eval" { inherit nix; }).attrpathsSuperset {
+                  evalSystem = system;
+                })
+              ];
+            }
+          );
+        };
 
         pre-commit = forAvailableSystems (
           system:
@@ -499,7 +428,6 @@
 
           binaryTarball = self.hydraJobs.binaryTarball.${system};
           perlBindings = self.hydraJobs.perlBindings.${system};
-          nix-eval-jobs = self.hydraJobs.nix-eval-jobs.${system};
           nixpkgsLibTests = self.hydraJobs.tests.nixpkgsLibTests.${system};
           rl-next = self.hydraJobs.rl-next.${system}.user;
           # Will be empty attr set on i686-linux, and filtered out by forAvailableSystems.
@@ -517,7 +445,7 @@
           inherit (nixpkgsFor.${system}.native) nix;
           default = nix;
 
-          inherit (nixpkgsFor.${system}.native) lix-clang-tidy nix-eval-jobs;
+          inherit (nixpkgsFor.${system}.native) lix-clang-tidy;
         }
         // (
           lib.optionalAttrs (builtins.elem system linux64BitSystems) {
@@ -581,7 +509,7 @@
             let
               pkgs = nixpkgsFor.${system}.cross.${crossSystem};
             in
-            makeShell pkgs pkgs.clangStdenv
+            makeShell pkgs pkgs.stdenv
           ))
           // {
             default = self.devShells.${system}.native-clangStdenvPackages;

justfile

@@ -8,47 +8,30 @@ list:
 clean:
     rm -rf build
 
-# Prepare meson for building with extra options
-setup-custom *OPTIONS:
+# Prepare meson for building
+setup *OPTIONS:
     meson setup build --prefix="$PWD/outputs/out" $mesonFlags {{ OPTIONS }}
 
-# Prepare meson for building
-setup: (setup-custom)
-
-# Build lix with extra options
-build-custom *OPTIONS:
-    meson compile -C build {{ OPTIONS }}
-
 # Build lix
-build: (build-custom)
+build *OPTIONS:
+    meson compile -C build {{ OPTIONS }}
 
 alias compile := build
 
-# Install lix for local development with extra options
-install-custom *OPTIONS: (build-custom OPTIONS)
+# Install lix for local development
+install *OPTIONS: (build OPTIONS)
     meson install -C build
 
-# Install lix for local development
-install: (install-custom)
-
-# Run tests (usually requires `install`) with extra options
+# Run tests
 test *OPTIONS:
     meson test -C build --print-errorlogs {{ OPTIONS }}
 
-# Run unit tests only
-test-unit *OPTIONS: (test "--suite" "check")
-
-# Run integration tests only
-test-integration *OPTIONS: install (test "--suite" "installcheck")
-
 alias clang-tidy := lint
 
-# Lint with `clang-tidy`
 lint:
     ninja -C build clang-tidy
 
 alias clang-tidy-fix := lint-fix
 
-# Fix lints with `clang-tidy-fix`
 lint-fix:
     ninja -C build clang-tidy-fix

lix-doc/Cargo.lock

@@ -2,6 +2,12 @@
 # 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 = "countme"
 version = "3.0.1"
@@ -10,15 +16,15 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"
 
 [[package]]
 name = "dissimilar"
-version = "1.0.9"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59f8e79d1fbf76bdfbde321e902714bf6c49df88a7dda6fc682fc2979226962d"
+checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632"
 
 [[package]]
 name = "expect-test"
-version = "1.5.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e0be0a561335815e06dab7c62e50353134c796e7a6155402a64bcff66b6a5e0"
+checksum = "30d9eafeadd538e68fb28016364c9732d78e420b9ff8853fa5e4058861e9f8d3"
 dependencies = [
  "dissimilar",
  "once_cell",
@@ -39,6 +45,15 @@ dependencies = [
  "rowan",
 ]
 
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.19.0"
@@ -56,12 +71,13 @@ dependencies = [
 
 [[package]]
 name = "rowan"
-version = "0.15.16"
+version = "0.15.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a542b0253fa46e632d27a1dc5cf7b930de4df8659dc6e720b647fc72147ae3d"
+checksum = "32a58fa8a7ccff2aec4f39cc45bf5f985cec7125ab271cf681c279fd00192b49"
 dependencies = [
  "countme",
  "hashbrown",
+ "memoffset",
  "rustc-hash",
  "text-size",
 ]

lix-doc/Cargo.toml

@@ -8,10 +8,13 @@ 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"
+rowan = "0.15.0"
 
 [dev-dependencies]
 expect-test = "1.1.0"

lix/code-generation/build_builtin_constants.py

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

lix/code-generation/build_builtins.py

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

lix/code-generation/build_experimental_features.py

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

lix/code-generation/build_settings.py

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

lix/code-generation/common.py

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

lix/legacy/build-remote.cc

@@ -1,631 +0,0 @@
-#include <algorithm>
-#include <chrono>
-#include <set>
-#include <map>
-#include <memory>
-#include <optional>
-#include <tuple>
-#include <fstream>
-#include <sstream>
-#include <cstring>
-#include <cerrno>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <poll.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <nlohmann/json.hpp>
-#if __APPLE__
-#include <sys/time.h>
-#endif
-
-#include "lix/libstore/machines.hh"
-#include "lix/libmain/shared.hh"
-#include "lix/libstore/pathlocks.hh"
-#include "lix/libstore/globals.hh"
-#include "lix/libutil/serialise.hh"
-#include "lix/libstore/build-result.hh"
-#include "lix/libstore/store-api.hh"
-#include "lix/libstore/derivations.hh"
-#include "lix/libutil/strings.hh"
-#include "lix/libstore/local-store.hh"
-#include "lix/libcmd/legacy.hh"
-#include "lix/libutil/experimental-features.hh"
-#include "lix/libutil/hash.hh"
-#include "build-remote.hh"
-
-namespace nix {
-
-std::string escapeUri(std::string uri)
-{
-    std::replace(uri.begin(), uri.end(), '/', '_');
-    return uri;
-}
-
-static std::string currentLoad;
-
-static std::string makeLockFilename(const std::string & storeUri) {
-    // We include 48 bytes of escaped URI to give an idea of what the lock
-    // is on, then 16 bytes of hash to disambiguate.
-    // This avoids issues with the escaped URI being very long and causing
-    // path too long errors, while also avoiding any possibility of collision
-    // caused by simple truncation.
-    auto hash = hashString(HashType::SHA256, storeUri).to_string(Base::Base32, false);
-    return escapeUri(storeUri).substr(0, 48) + "-" + hash.substr(0, 16);
-}
-
-static AutoCloseFD openSlotLock(const Machine & m, uint64_t slot)
-{
-    return openLockFile(fmt("%s/%s-%d", currentLoad, makeLockFilename(m.storeUri), slot), true);
-}
-
-static bool allSupportedLocally(Store & store, const std::set<std::string>& requiredFeatures) {
-    for (auto & feature : requiredFeatures)
-        if (!store.config().systemFeatures.get().count(feature)) return false;
-    return true;
-}
-
-/* --------------------------------------------------------------------------
- * P1: load- and memory-aware adaptive remote-build selection.
- *
- * All state below is populated ONCE from out-of-band, env-driven config
- * (never from the derivation). Every helper FAILS OPEN: if config is unset,
- * the metrics socket is unreachable/slow/malformed, or the storeUri is
- * unknown, the helpers behave exactly like unpatched Lix
- * (machineHasRoom -> true, liveLoadPenalty -> 0).
- * ------------------------------------------------------------------------ */
-
-// A drv that does not match the heavy-crate table is treated as "light":
-// we have NO confident signal that it is memory-heavy, so adaptiveEstPeakRSS
-// returns nullopt and machineHasRoom never filters on account of it. (There is
-// deliberately no numeric light default - an unmatched drv must always permit,
-// so keying it on a free-RAM threshold would wrongly filter light drvs.)
-
-// name-substring -> estimated peak RSS in MiB (from LIX_ADAPTIVE_RSS_TABLE).
-static std::map<std::string, uint64_t> adaptiveRssTable;
-// machine storeUri -> "host:port" metrics endpoint (from LIX_ADAPTIVE_METRICS_MAP).
-static std::map<std::string, std::string> adaptiveMetricsMap;
-
-struct AdaptiveProbe {
-    bool ok = false;
-    uint64_t memAvailKb = 0;
-    double psiMem = 0, psiIo = 0, psiCpu = 0, load1 = 0, nproc = 0;
-};
-
-// In-process TTL cache keyed by storeUri, so selection probes each machine
-// at most once every ~2s regardless of how many drvs stream through.
-static std::map<std::string, std::pair<std::chrono::steady_clock::time_point, AdaptiveProbe>> adaptiveProbeCache;
-
-/* Parse the two env-driven config sources once. Any error leaves the tables
- * empty, which degrades to unpatched behavior. */
-static void adaptiveLoadConfig()
-{
-    // LIX_ADAPTIVE_RSS_TABLE is a PATH to a JSON object {substring: MiB}.
-    try {
-        if (auto p = getEnv("LIX_ADAPTIVE_RSS_TABLE")) {
-            std::ifstream f(*p);
-            if (f) {
-                nlohmann::json j;
-                f >> j;
-                if (j.is_object())
-                    for (auto & [k, v] : j.items())
-                        // Per-entry guard: one bad value skips only that entry,
-                        // it does not discard the whole (otherwise valid) table.
-                        try {
-                            if (v.is_number_unsigned() || (v.is_number_integer() && v.get<int64_t>() >= 0))
-                                adaptiveRssTable[k] = v.get<uint64_t>();
-                        } catch (...) { continue; }
-            }
-        }
-    } catch (...) { adaptiveRssTable.clear(); }
-
-    // LIX_ADAPTIVE_METRICS_MAP is an inline JSON object {storeUri: "host:port"}.
-    try {
-        if (auto m = getEnv("LIX_ADAPTIVE_METRICS_MAP")) {
-            auto j = nlohmann::json::parse(*m);
-            if (j.is_object())
-                for (auto & [k, v] : j.items())
-                    // Per-entry guard: skip one bad value, keep the rest.
-                    try {
-                        if (v.is_string())
-                            adaptiveMetricsMap[k] = v.get<std::string>();
-                    } catch (...) { continue; }
-        }
-    } catch (...) { adaptiveMetricsMap.clear(); }
-}
-
-/* Estimated peak RSS (MiB) for a drv, or nullopt when the drv does not match
- * the heavy-crate table. nullopt == "no confident heavy signal". Keyed on the
- * store-path NAME, which is available before readDerivation and never mutates
- * the drv. */
-static std::optional<uint64_t> adaptiveEstPeakRSS(const StorePath & drvPath)
-{
-    if (adaptiveRssTable.empty()) return std::nullopt;
-    std::string_view name = drvPath.name();
-    std::optional<uint64_t> best;
-    for (auto & [sub, mib] : adaptiveRssTable)
-        if (!sub.empty() && name.find(sub) != std::string_view::npos)
-            best = std::max(best.value_or(0), mib);
-    return best;
-}
-
-/* TCP-connect the metrics endpoint and read one line:
- *   "MemAvail_kB psi_mem psi_io psi_cpu load1 nproc"
- * A single ~500ms wall-clock deadline bounds the WHOLE probe (resolve +
- * connect + read) so selection NEVER hangs, regardless of a slow or
- * byte-dribbling peer. The endpoint MUST be a numeric IP:port - resolution is
- * pinned to AI_NUMERICHOST|AI_NUMERICSERV so getaddrinfo never does network
- * I/O (a hostname simply fails fast -> fail-open). Any failure returns an
- * AdaptiveProbe with ok=false. */
-static AdaptiveProbe adaptiveProbeEndpoint(const std::string & hostport)
-{
-    AdaptiveProbe r;
-    auto colon = hostport.rfind(':');
-    if (colon == std::string::npos || colon == 0 || colon + 1 >= hostport.size())
-        return r;
-    std::string host = hostport.substr(0, colon);
-    std::string port = hostport.substr(colon + 1);
-
-    // Single wall-clock budget for the entire probe.
-    auto deadline = std::chrono::steady_clock::now() + std::chrono::milliseconds(500);
-    auto remainingMs = [&]() -> int {
-        auto d = std::chrono::duration_cast<std::chrono::milliseconds>(
-            deadline - std::chrono::steady_clock::now()).count();
-        return d <= 0 ? 0 : (int) d;
-    };
-
-    struct addrinfo hints;
-    memset(&hints, 0, sizeof hints);
-    hints.ai_family = AF_UNSPEC;
-    hints.ai_socktype = SOCK_STREAM;
-    // Numeric-only: no DNS, no resolver blocking. Non-IP endpoint -> fail-open.
-    hints.ai_flags = AI_NUMERICHOST | AI_NUMERICSERV;
-    struct addrinfo * res = nullptr;
-    if (getaddrinfo(host.c_str(), port.c_str(), &hints, &res) != 0 || !res)
-        return r;
-
-    int fd = socket(res->ai_family, res->ai_socktype | SOCK_NONBLOCK, res->ai_protocol);
-    if (fd < 0) { freeaddrinfo(res); return r; }
-
-    int cr = connect(fd, res->ai_addr, res->ai_addrlen);
-    if (cr < 0 && errno == EINPROGRESS) {
-        struct pollfd pfd;
-        pfd.fd = fd;
-        pfd.events = POLLOUT;
-        if (poll(&pfd, 1, remainingMs()) <= 0) { close(fd); freeaddrinfo(res); return r; }
-        int soerr = 0;
-        socklen_t sl = sizeof soerr;
-        if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &soerr, &sl) < 0 || soerr != 0) {
-            close(fd); freeaddrinfo(res); return r;
-        }
-    } else if (cr < 0) {
-        close(fd); freeaddrinfo(res); return r;
-    }
-    freeaddrinfo(res);
-
-    /* Read one short line. Keep the socket non-blocking and gate every recv on
-       poll(POLLIN) against the shared deadline, so the total read time is
-       bounded even if the peer drips one byte at a time. A valid reply is tiny,
-       so also cap the number of reads. */
-    std::string line;
-    char buf[512];
-    for (int iter = 0; iter < 16 && line.size() < 4096; ++iter) {
-        int rem = remainingMs();
-        if (rem == 0) break;
-        struct pollfd pfd;
-        pfd.fd = fd;
-        pfd.events = POLLIN;
-        int pr = poll(&pfd, 1, rem);
-        if (pr <= 0) break;                 // timeout or error -> fail-open
-        if (!(pfd.revents & POLLIN)) break; // POLLHUP/POLLERR with no data
-        ssize_t n = recv(fd, buf, sizeof buf, 0);
-        if (n < 0) {
-            if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) continue;
-            break;
-        }
-        if (n == 0) break;                  // peer closed
-        line.append(buf, n);
-        if (line.find('\n') != std::string::npos) break;
-    }
-    close(fd);
-
-    std::istringstream ss(line);
-    AdaptiveProbe tmp;
-    if (ss >> tmp.memAvailKb >> tmp.psiMem >> tmp.psiIo >> tmp.psiCpu >> tmp.load1 >> tmp.nproc) {
-        tmp.ok = true;
-        return tmp;
-    }
-    return r;
-}
-
-/* Cached probe for a machine. Unknown storeUri -> ok=false (fail-open). */
-static AdaptiveProbe adaptiveProbe(const Machine & m)
-{
-    auto now = std::chrono::steady_clock::now();
-    auto it = adaptiveProbeCache.find(m.storeUri);
-    if (it != adaptiveProbeCache.end() && now - it->second.first < std::chrono::seconds(2))
-        return it->second.second;
-
-    AdaptiveProbe r;
-    auto mit = adaptiveMetricsMap.find(m.storeUri);
-    if (mit != adaptiveMetricsMap.end())
-        r = adaptiveProbeEndpoint(mit->second);
-
-    adaptiveProbeCache[m.storeUri] = { now, r };
-    return r;
-}
-
-/* OOM guard. Returns TRUE (permit as a candidate) UNLESS we have a confident
- * signal that the drv is heavy AND the machine's free RAM is below the drv's
- * estimated peak RSS. No env, dead socket, or unknown machine -> permit. */
-static bool machineHasRoom(const Machine & m, const StorePath & drvPath)
-{
-    auto est = adaptiveEstPeakRSS(drvPath);
-    if (!est) return true;              // no confident heavy signal
-    auto p = adaptiveProbe(m);
-    if (!p.ok) return true;             // no live signal -> fail open
-    uint64_t freeMib = p.memAvailKb / 1024;
-    return freeMib >= *est;
-}
-
-/* Extra ranking cost from live pressure on a machine; 0 when no signal. */
-static double liveLoadPenalty(const Machine & m)
-{
-    auto p = adaptiveProbe(m);
-    if (!p.ok) return 0.0;
-    double penalty = 0.0;
-    penalty += p.psiIo / 10.0;                       // io-PSI (0..100) -> up to 10
-    if (p.nproc > 0) penalty += p.load1 / p.nproc;   // load normalized by cores
-    return penalty;
-}
-
-static int main_build_remote(AsyncIoRoot & aio, std::string programName, Strings argv)
-{
-    {
-        logger = makeJSONLogger(*logger);
-
-        /* Ensure we don't get any SSH passphrase or host key popups. */
-        unsetenv("DISPLAY");
-        unsetenv("SSH_ASKPASS");
-
-        /* If we ever use the common args framework, make sure to
-           remove initPlugins below and initialize settings first.
-        */
-        if (argv.size() != 1)
-            throw UsageError("called without required arguments");
-
-        verbosity = (Verbosity) std::stoll(argv.front());
-
-        FdSource source(STDIN_FILENO);
-
-        /* Read the parent's settings. */
-        while (readInt(source)) {
-            auto name = readString(source);
-            auto value = readString(source);
-            settings.set(name, value);
-        }
-
-        auto maxBuildJobs = settings.maxBuildJobs;
-        settings.maxBuildJobs.set("1"); // hack to make tests with local?root= work
-
-        initPlugins();
-
-        auto store = aio.blockOn(openStore());
-
-        /* It would be more appropriate to use $XDG_RUNTIME_DIR, since
-           that gets cleared on reboot, but it wouldn't work on macOS. */
-        auto currentLoadName = "/current-load";
-        if (auto localStore = store.try_cast_shared<LocalFSStore>())
-            currentLoad = std::string { localStore->config().stateDir } + currentLoadName;
-        else
-            currentLoad = settings.nixStateDir + currentLoadName;
-
-        std::shared_ptr<Store> sshStore;
-        AutoCloseFD bestSlotLock;
-
-        auto machines = getMachines();
-        debug("got %d remote builders", machines.size());
-
-        if (machines.empty()) {
-            std::cerr << "# decline-permanently\n";
-            return 0;
-        }
-
-        std::optional<StorePath> drvPath;
-        std::string storeUri;
-
-        /* P1: parse out-of-band adaptive config once (fail-open on any error). */
-        adaptiveLoadConfig();
-
-        while (true) {
-
-            try {
-                auto s = readString(source);
-                if (s != "try") return 0;
-            } catch (EndOfFile &) { return 0; }
-
-            auto amWilling = readInt(source);
-            auto neededSystem = readString(source);
-            drvPath = store->parseStorePath(readString(source));
-            auto requiredFeatures = readStrings<std::set<std::string>>(source);
-
-            /* It would be possible to build locally after some builds clear out,
-               so don't show the warning now: */
-            bool couldBuildLocally = maxBuildJobs > 0
-                 &&  (  neededSystem == settings.thisSystem
-                     || settings.extraPlatforms.get().count(neededSystem) > 0)
-                 &&  allSupportedLocally(*store, requiredFeatures);
-            /* It's possible to build this locally right now: */
-            bool canBuildLocally = amWilling && couldBuildLocally;
-
-            /* Error ignored here, will be caught later */
-            mkdir(currentLoad.c_str(), 0777);
-
-            while (true) {
-                bestSlotLock.reset();
-                AutoCloseFD lock = openLockFile(currentLoad + "/main-lock", true);
-                lockFile(lock.get(), ltWrite);
-
-                bool rightType = false;
-
-                Machine * bestMachine = nullptr;
-                double bestCost = 0;
-                for (auto & m : machines) {
-                    debug("considering building on remote machine '%s'", m.storeUri);
-
-                    if (m.enabled &&
-                        m.systemSupported(neededSystem) &&
-                        m.allSupported(requiredFeatures) &&
-                        m.mandatoryMet(requiredFeatures) &&
-                        machineHasRoom(m, *drvPath))
-                    {
-                        rightType = true;
-                        AutoCloseFD free;
-                        uint64_t load = 0;
-                        for (uint64_t slot = 0; slot < m.maxJobs; ++slot) {
-                            auto slotLock = openSlotLock(m, slot);
-                            if (tryLockFile(slotLock.get(), ltWrite)) {
-                                if (!free) {
-                                    free = std::move(slotLock);
-                                }
-                            } else {
-                                ++load;
-                            }
-                        }
-                        if (!free) {
-                            continue;
-                        }
-                        /* P1: ranking cost folds in live pressure (0 when no
-                           signal, so this reduces to load / speedFactor). */
-                        double cost = (double(load) + liveLoadPenalty(m)) / m.speedFactor;
-                        bool best = false;
-                        if (!bestSlotLock) {
-                            best = true;
-                        } else if (cost < bestCost) {
-                            best = true;
-                        } else if (cost == bestCost) {
-                            if (m.speedFactor > bestMachine->speedFactor) {
-                                best = true;
-                            }
-                        }
-                        if (best) {
-                            bestCost = cost;
-                            bestSlotLock = std::move(free);
-                            bestMachine = &m;
-                        }
-                    }
-                }
-
-                if (!bestSlotLock) {
-                    if (rightType && !canBuildLocally)
-                        std::cerr << "# postpone\n";
-                    else
-                    {
-                        // add the template values.
-                        std::string drvstr;
-                        if (drvPath.has_value())
-                            drvstr = drvPath->to_string();
-                        else
-                            drvstr = "<unknown>";
-
-                        std::string machinesFormatted;
-
-                        for (auto & m : machines) {
-                            machinesFormatted += HintFmt(
-                                "\n([%s], %s, [%s], [%s])",
-                                concatStringsSep<StringSet>(", ", m.systemTypes),
-                                m.maxJobs,
-                                concatStringsSep<StringSet>(", ", m.supportedFeatures),
-                                concatStringsSep<StringSet>(", ", m.mandatoryFeatures)
-                            ).str();
-                        }
-
-                        auto error = HintFmt(
-                            "Failed to find a machine for remote build!\n"
-                            "derivation: %s\n"
-                            "required (system, features): (%s, [%s])\n"
-                            "%s available machines:\n"
-                            "(systems, maxjobs, supportedFeatures, mandatoryFeatures)%s",
-                            drvstr,
-                            neededSystem,
-                            concatStringsSep<StringSet>(", ", requiredFeatures),
-                            machines.size(),
-                            Uncolored(machinesFormatted)
-                       );
-
-                        printMsg(couldBuildLocally ? lvlChatty : lvlWarn, error.str());
-
-                        std::cerr << "# decline\n";
-                    }
-                    break;
-                }
-
-#if __APPLE__
-                futimes(bestSlotLock.get(), nullptr);
-#else
-                futimens(bestSlotLock.get(), nullptr);
-#endif
-
-                lock.reset();
-
-                try {
-
-                    Activity act(*logger, lvlTalkative, actUnknown, fmt("connecting to '%s'", bestMachine->storeUri));
-
-                    sshStore = aio.blockOn(bestMachine->openStore());
-                    aio.blockOn(sshStore->connect());
-                    storeUri = bestMachine->storeUri;
-
-                } catch (std::exception & e) { // NOLINT(lix-foreign-exceptions)
-                    auto msg = chomp(drainFD(5, false));
-                    printError("cannot build on '%s': %s%s",
-                        bestMachine->storeUri, e.what(),
-                        msg.empty() ? "" : ": " + msg);
-                    bestMachine->enabled = false;
-                    continue;
-                }
-
-                goto connected;
-            }
-        }
-
-connected:
-        close(5);
-
-        assert(sshStore);
-
-        std::cerr << "# accept\n" << storeUri << "\n";
-
-        auto inputs = readStrings<PathSet>(source);
-        auto wantedOutputs = readStrings<StringSet>(source);
-
-        auto lockFileName = currentLoad + "/" + makeLockFilename(storeUri) + ".upload-lock";
-
-        AutoCloseFD uploadLock = openLockFile(lockFileName, true);
-
-        {
-            Activity act(*logger, lvlTalkative, actUnknown, fmt("waiting for the upload lock to '%s'", storeUri));
-
-            if (!unsafeLockFileSingleThreaded(uploadLock.get(), ltWrite, std::chrono::minutes(15)))
-                printError("somebody is hogging the upload lock for '%s', continuing...");
-        }
-
-        auto substitute = settings.buildersUseSubstitutes ? Substitute : NoSubstitute;
-
-        {
-            Activity act(*logger, lvlTalkative, actUnknown, fmt("copying dependencies to '%s'", storeUri));
-            aio.blockOn(copyPaths(
-                *store,
-                *sshStore,
-                store->parseStorePathSet(inputs),
-                NoRepair,
-                NoCheckSigs,
-                substitute
-            ));
-        }
-
-        uploadLock.reset();
-
-        auto drv = aio.blockOn(store->readDerivation(*drvPath));
-
-        std::optional<BuildResult> optResult;
-
-        // If we don't know whether we are trusted (e.g. `ssh://`
-        // stores), we assume we are. This is necessary for backwards
-        // compat.
-        bool trustedOrLegacy = ({
-            std::optional trusted = aio.blockOn(sshStore->isTrustedClient());
-            !trusted || *trusted;
-        });
-
-        // See the very large comment in `case WorkerProto::Op::BuildDerivation:` in
-        // `lix/libstore/daemon.cc` that explains the trust model here.
-        //
-        // This condition mirrors that: that code enforces the "rules" outlined there;
-        // we do the best we can given those "rules".
-        if (trustedOrLegacy || drv.type().isCA())  {
-            // Hijack the inputs paths of the derivation to include all
-            // the paths that come from the `inputDrvs` set. We don’t do
-            // that for the derivations whose `inputDrvs` is empty
-            // because:
-            //
-            // 1. It’s not needed
-            //
-            // 2. Changing the `inputSrcs` set changes the associated
-            //    output ids, which break CA derivations
-            if (!drv.inputDrvs.map.empty())
-                drv.inputSrcs = store->parseStorePathSet(inputs);
-            optResult = aio.blockOn(sshStore->buildDerivation(*drvPath, (const BasicDerivation &) drv));
-            auto & result = *optResult;
-            if (!result.success())
-                throw Error("build of '%s' on '%s' failed: %s", store->printStorePath(*drvPath), storeUri, result.errorMsg);
-        } else {
-            aio.blockOn(copyClosure(
-                *store, *sshStore, StorePathSet{*drvPath}, NoRepair, NoCheckSigs, substitute
-            ));
-            auto res = aio.blockOn(sshStore->buildPathsWithResults({
-                DerivedPath::Built {
-                    .drvPath = makeConstantStorePathRef(*drvPath),
-                    .outputs = OutputsSpec::All {},
-                }
-            }));
-            // One path to build should produce exactly one build result
-            assert(res.size() == 1);
-            optResult = std::move(res[0]);
-        }
-
-
-        auto outputHashes = aio.blockOn(staticOutputHashes(*store, drv));
-        std::set<Realisation> missingRealisations;
-        StorePathSet missingPaths;
-        if (experimentalFeatureSettings.isEnabled(Xp::CaDerivations) && !drv.type().hasKnownOutputPaths()) {
-            for (auto & outputName : wantedOutputs) {
-                auto thisOutputHash = outputHashes.at(outputName);
-                auto thisOutputId = DrvOutput{ thisOutputHash, outputName };
-                if (!aio.blockOn(store->queryRealisation(thisOutputId))) {
-                    debug("missing output %s", outputName);
-                    assert(optResult);
-                    auto & result = *optResult;
-                    auto i = result.builtOutputs.find(outputName);
-                    assert(i != result.builtOutputs.end());
-                    auto & newRealisation = i->second;
-                    missingRealisations.insert(newRealisation);
-                    missingPaths.insert(newRealisation.outPath);
-                }
-            }
-        } else {
-            auto outputPaths = drv.outputsAndOptPaths(*store);
-            for (auto & [outputName, hopefullyOutputPath] : outputPaths) {
-                assert(hopefullyOutputPath.second);
-                if (!aio.blockOn(store->isValidPath(*hopefullyOutputPath.second)))
-                    missingPaths.insert(*hopefullyOutputPath.second);
-            }
-        }
-
-        if (!missingPaths.empty()) {
-            Activity act(*logger, lvlTalkative, actUnknown, fmt("copying outputs from '%s'", storeUri));
-            if (auto localStore = store.try_cast_shared<LocalStore>())
-                for (auto & path : missingPaths)
-                    localStore->locksHeld.insert(store->printStorePath(path)); /* FIXME: ugly */
-            aio.blockOn(
-                copyPaths(*sshStore, *store, missingPaths, NoRepair, NoCheckSigs, NoSubstitute)
-            );
-        }
-        // XXX: Should be done as part of `copyPaths`
-        for (auto & realisation : missingRealisations) {
-            // Should hold, because if the feature isn't enabled the set
-            // of missing realisations should be empty
-            experimentalFeatureSettings.require(Xp::CaDerivations);
-            aio.blockOn(store->registerDrvOutput(realisation));
-        }
-
-        return 0;
-    }
-}
-
-void registerLegacyBuildRemote() {
-    LegacyCommandRegistry::add("build-remote", main_build_remote);
-}
-
-}

lix/legacy/build-remote.hh

@@ -1,8 +0,0 @@
-#pragma once
-/// @file
-
-namespace nix {
-
-void registerLegacyBuildRemote();
-
-}

lix/legacy/dotgraph.hh

@@ -1,10 +0,0 @@
-#pragma once
-///@file
-
-#include "lix/libstore/store-api.hh"
-
-namespace nix {
-
-kj::Promise<Result<void>> printDotGraph(ref<Store> store, StorePathSet && roots);
-
-}

lix/legacy/graphml.hh

@@ -1,10 +0,0 @@
-#pragma once
-///@file
-
-#include "lix/libstore/store-api.hh"
-
-namespace nix {
-
-kj::Promise<Result<void>> printGraphML(ref<Store> store, StorePathSet && roots);
-
-}

lix/legacy/meson.build

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

lix/legacy/nix-build.hh

@@ -1,8 +0,0 @@
-#pragma once
-/// @file
-
-namespace nix {
-
-void registerLegacyNixBuildAndNixShell();
-
-}

lix/legacy/nix-channel.hh

@@ -1,8 +0,0 @@
-#pragma once
-/// @file
-
-namespace nix {
-
-void registerLegacyNixChannel();
-
-}

lix/legacy/nix-collect-garbage.hh

@@ -1,8 +0,0 @@
-#pragma once
-/// @file
-
-namespace nix {
-
-void registerLegacyNixCollectGarbage();
-
-}

lix/legacy/nix-copy-closure.hh

@@ -1,8 +0,0 @@
-#pragma once
-/// @file
-
-namespace nix {
-
-void registerLegacyNixCopyClosure();
-
-}

lix/legacy/nix-env.hh

@@ -1,8 +0,0 @@
-#pragma once
-/// @file
-
-namespace nix {
-
-void registerLegacyNixEnv();
-
-}

lix/legacy/nix-instantiate.hh

@@ -1,8 +0,0 @@
-#pragma once
-/// @file
-
-namespace nix {
-
-void registerLegacyNixInstantiate();
-
-}

lix/legacy/nix-store.hh

@@ -1,8 +0,0 @@
-#pragma once
-/// @file
-
-namespace nix {
-
-void registerLegacyNixStore();
-
-}

lix/legacy/user-env.cc

@@ -1,151 +0,0 @@
-#include "user-env.hh"
-#include "lix/libstore/derivations.hh"
-#include "lix/libstore/store-api.hh"
-#include "lix/libstore/path-with-outputs.hh"
-#include "lix/libstore/local-fs-store.hh"
-#include "lix/libmain/shared.hh"
-#include "lix/libexpr/eval.hh"
-#include "lix/libstore/profiles.hh"
-#include "lix/libexpr/print-ambiguous.hh"
-
-#include <limits>
-#include <sstream>
-
-namespace nix {
-
-
-bool createUserEnv(EvalState & state, DrvInfos & elems,
-    const Path & profile, bool keepDerivations,
-    const std::string & lockToken)
-{
-    /* Build the components in the user environment, if they don't
-       exist already. */
-    std::vector<StorePathWithOutputs> drvsToBuild;
-    for (auto & i : elems)
-        if (auto drvPath = i.queryDrvPath(state))
-            drvsToBuild.push_back({*drvPath});
-
-    debug("building user environment dependencies");
-    state.aio.blockOn(state.ctx.store->buildPaths(
-        toDerivedPaths(drvsToBuild),
-        state.ctx.repair ? bmRepair : bmNormal));
-
-    /* Construct the whole top level derivation. */
-    StorePathSet references;
-    Value manifest = state.ctx.mem.newList(elems.size());
-    size_t n = 0;
-    for (auto & i : elems) {
-        /* Create a pseudo-derivation containing the name, system,
-           output paths, and optionally the derivation path, as well
-           as the meta attributes. */
-        std::optional<StorePath> drvPath = keepDerivations ? i.queryDrvPath(state) : std::nullopt;
-        DrvInfo::Outputs outputs = i.queryOutputs(state, true, true);
-        StringSet metaNames = i.queryMetaNames(state);
-
-        auto attrs = state.ctx.buildBindings(7 + outputs.size());
-
-        attrs.alloc(state.ctx.s.type).mkString("derivation");
-        attrs.alloc(state.ctx.s.name).mkString(i.queryName(state));
-        auto system = i.querySystem(state);
-        if (!system.empty())
-            attrs.alloc(state.ctx.s.system).mkString(system);
-        attrs.alloc(state.ctx.s.outPath).mkString(state.ctx.store->printStorePath(i.queryOutPath(state)));
-        if (drvPath)
-            attrs.alloc(state.ctx.s.drvPath).mkString(state.ctx.store->printStorePath(*drvPath));
-
-        // Copy each output meant for installation.
-        auto & vOutputs = attrs.alloc(state.ctx.s.outputs);
-        vOutputs = state.ctx.mem.newList(outputs.size());
-        for (const auto & [m, j] : enumerate(outputs)) {
-            (vOutputs.listElems()[m] = state.ctx.mem.allocValue())->mkString(j.first);
-            auto outputAttrs = state.ctx.buildBindings(2);
-            outputAttrs.alloc(state.ctx.s.outPath).mkString(state.ctx.store->printStorePath(*j.second));
-            attrs.alloc(j.first).mkAttrs(outputAttrs);
-
-            /* This is only necessary when installing store paths, e.g.,
-               `nix-env -i /nix/store/abcd...-foo'. */
-            state.aio.blockOn(state.ctx.store->addTempRoot(*j.second));
-            state.aio.blockOn(state.ctx.store->ensurePath(*j.second));
-
-            references.insert(*j.second);
-        }
-
-        // Copy the meta attributes.
-        auto meta = state.ctx.buildBindings(metaNames.size());
-        for (auto & j : metaNames) {
-            Value * v = i.queryMeta(state, j);
-            if (!v) continue;
-            meta.insert(state.ctx.symbols.create(j), v);
-        }
-
-        attrs.alloc(state.ctx.s.meta).mkAttrs(meta);
-
-        (manifest.listElems()[n++] = state.ctx.mem.allocValue())->mkAttrs(attrs);
-
-        if (drvPath) references.insert(*drvPath);
-    }
-
-    /* Also write a copy of the list of user environment elements to
-       the store; we need it for future modifications of the
-       environment. */
-    std::ostringstream str;
-    printAmbiguous(manifest, state.ctx.symbols, str, nullptr, std::numeric_limits<int>::max());
-    auto manifestFile = state.aio.blockOn(state.ctx.store->addTextToStore("env-manifest.nix",
-        str.str(), references));
-
-    /* Get the environment builder expression. */
-    Value envBuilder;
-    state.eval(state.ctx.parseExprFromString(
-        #include "buildenv.nix.gen.hh"
-            , CanonPath::root), envBuilder);
-
-    /* Construct a Nix expression that calls the user environment
-       builder with the manifest as argument. */
-    auto attrs = state.ctx.buildBindings(3);
-    state.ctx.paths.mkStorePathString(manifestFile, attrs.alloc("manifest"));
-    attrs.insert(state.ctx.symbols.create("derivations"), &manifest);
-    Value args;
-    args.mkAttrs(attrs);
-
-    Value topLevel;
-    topLevel.mkApp(&envBuilder, &args);
-
-    /* Evaluate it. */
-    debug("evaluating user environment builder");
-    state.forceValue(topLevel, noPos);
-    NixStringContext context;
-    Attr & aDrvPath(*topLevel.attrs->find(state.ctx.s.drvPath));
-    auto topLevelDrv = state.coerceToStorePath(aDrvPath.pos, *aDrvPath.value, context, "");
-    Attr & aOutPath(*topLevel.attrs->find(state.ctx.s.outPath));
-    auto topLevelOut = state.coerceToStorePath(aOutPath.pos, *aOutPath.value, context, "");
-
-    /* Realise the resulting store expression. */
-    debug("building user environment");
-    std::vector<StorePathWithOutputs> topLevelDrvs;
-    topLevelDrvs.push_back({topLevelDrv});
-    state.aio.blockOn(state.ctx.store->buildPaths(
-        toDerivedPaths(topLevelDrvs),
-        state.ctx.repair ? bmRepair : bmNormal));
-
-    /* Switch the current user environment to the output path. */
-    auto store2 = state.ctx.store.try_cast_shared<LocalFSStore>();
-
-    if (store2) {
-        PathLock lock = lockProfile(profile);
-
-        Path lockTokenCur = optimisticLockProfile(profile);
-        if (lockToken != lockTokenCur) {
-            printInfo("profile '%1%' changed while we were busy; restarting", profile);
-            return false;
-        }
-
-        debug("switching to new user environment");
-        Path generation = state.aio.blockOn(createGeneration(*store2, profile, topLevelOut));
-        switchLink(profile, generation);
-    }
-
-    return true;
-}
-
-
-}

lix/libcmd/legacy.cc

@@ -1,7 +0,0 @@
-#include "lix/libcmd/legacy.hh"
-
-namespace nix {
-
-LegacyCommandRegistry::LegacyCommandMap * LegacyCommandRegistry::commands = 0;
-
-}

lix/libcmd/legacy.hh

@@ -1,26 +0,0 @@
-#pragma once
-///@file
-
-#include "lix/libutil/async.hh"
-#include <functional>
-#include <list>
-#include <map>
-#include <string>
-
-namespace nix {
-
-typedef std::function<void(AsyncIoRoot &, std::string, std::list<std::string>)> MainFunction;
-
-struct LegacyCommandRegistry
-{
-    using LegacyCommandMap = std::map<std::string, MainFunction>;
-    static LegacyCommandMap * commands;
-
-    static void add(const std::string & name, MainFunction fun)
-    {
-        if (!commands) commands = new LegacyCommandMap;
-        (*commands)[name] = fun;
-    }
-};
-
-}

lix/libcmd/repl.hh

@@ -1,41 +0,0 @@
-#pragma once
-///@file
-
-#include "lix/libexpr/eval.hh"
-#include "lix/libutil/types.hh"
-
-namespace nix {
-
-struct AbstractNixRepl : NeverAsync
-{
-    typedef std::vector<std::pair<Value*,std::string>> AnnotatedValues;
-
-    static ReplExitStatus
-    run(const SearchPath & searchPath,
-        nix::ref<Store> store,
-        EvalState & state,
-        std::function<AnnotatedValues()> getValues,
-        const ValMap & extraEnv,
-        Bindings * autoArgs);
-
-    static ReplExitStatus runSimple(
-        EvalState & evalState,
-        const ValMap & extraEnv);
-
-protected:
-    EvalState & state;
-    Bindings * autoArgs;
-
-    AbstractNixRepl(EvalState & state)
-        : state(state)
-    { }
-
-    virtual ~AbstractNixRepl()
-    { }
-
-    virtual void initEnv() = 0;
-
-    virtual ReplExitStatus mainLoop() = 0;
-};
-
-}

lix/libexpr/attr-path.cc

@@ -1,198 +0,0 @@
-#include "lix/libexpr/attr-path.hh"
-#include "lix/libutil/strings.hh"
-#include "print-options.hh"
-#include <algorithm>
-#include <sstream>
-
-
-namespace nix {
-
-
-std::vector<std::string> parseAttrPath(std::string_view const s)
-{
-    std::vector<std::string> res;
-    std::string cur;
-    bool haveData = false;
-    auto i = s.begin();
-    while (i != s.end()) {
-        if (*i == '.') {
-            res.push_back(cur);
-            haveData = false;
-            cur.clear();
-        } else if (*i == '"') {
-            // If there is a quote there *will* be a named term even if it is empty.
-            ++i;
-            haveData = true;
-
-            while (1) {
-                if (i == s.end())
-                    throw ParseError("missing closing quote in selection path '%1%'", s);
-                if (*i == '"') break;
-                cur.push_back(*i++);
-            }
-        } else {
-            cur.push_back(*i);
-            haveData = true;
-        }
-        ++i;
-    }
-    if (haveData) res.push_back(cur);
-    return res;
-}
-
-
-std::string unparseAttrPath(std::vector<std::string> const & attrPath)
-{
-    // FIXME(jade): can probably be rewritten with ranges once libc++ has a
-    // fully featured implementation
-    // https://github.com/llvm/llvm-project/pull/65536
-    auto ret = std::ostringstream{};
-    bool first = true;
-
-    for (auto const & part : attrPath) {
-        if (!first) {
-            ret << ".";
-        }
-        first = false;
-
-        bool mustQuote = std::ranges::any_of(part, [](char c) -> bool {
-            return c == '"' || c == '.' || c == ' ';
-        });
-
-        if (mustQuote || part.empty()) {
-            ret << '"' << part << '"';
-        } else {
-            ret << part;
-        }
-    }
-
-    return ret.str();
-}
-
-
-std::pair<Value *, PosIdx> findAlongAttrPath(EvalState & state, const std::string & attrPath,
-    Bindings & autoArgs, Value & vIn)
-{
-    auto tokens = parseAttrPath(attrPath);
-
-    Value * v = &vIn;
-    PosIdx pos = noPos;
-
-    for (auto [attrPathIdx, attr] : enumerate(tokens)) {
-
-        /* Is i an index (integer) or a normal attribute name? */
-        auto attrIndex = string2Int<unsigned int>(attr);
-
-        /* Evaluate the expression. */
-        Value * vNew = state.ctx.mem.allocValue();
-        state.autoCallFunction(autoArgs, *v, *vNew, pos);
-        v = vNew;
-        state.forceValue(*v, noPos);
-
-        /* It should evaluate to either a set or an expression,
-           according to what is specified in the attrPath. */
-
-        if (!attrIndex) {
-            if (attr.empty())
-                throw Error("empty attribute name in selection path '%1%'", attrPath);
-
-            if (v->type() != nAttrs) {
-                auto pathPart =
-                    std::vector<std::string>(tokens.begin(), tokens.begin() + attrPathIdx);
-                state.ctx.errors
-                    .make<TypeError>(
-                        "the value being indexed in the selection path '%1%' at '%2%' should be a "
-                        "set but is %3%: %4%",
-                        attrPath,
-                        unparseAttrPath(pathPart),
-                        showType(*v),
-                        ValuePrinter(state, *v, errorPrintOptions)
-                    )
-                    .debugThrow();
-            }
-
-            Bindings::iterator a = v->attrs->find(state.ctx.symbols.create(attr));
-            if (a == v->attrs->end()) {
-                std::set<std::string> attrNames;
-                for (auto & attr : *v->attrs)
-                    attrNames.insert(state.ctx.symbols[attr.name]);
-
-                auto suggestions = Suggestions::bestMatches(attrNames, attr);
-                auto pathPart =
-                    std::vector<std::string>(tokens.begin(), tokens.begin() + attrPathIdx);
-                throw AttrPathNotFound(
-                    suggestions,
-                    "attribute '%1%' in selection path '%2%' not found inside path '%3%', whose "
-                    "contents are: %4%",
-                    attr,
-                    attrPath,
-                    unparseAttrPath(pathPart),
-                    ValuePrinter(state, *v, errorPrintOptions)
-                );
-            }
-            v = &*a->value;
-            pos = a->pos;
-        } else {
-            if (!v->isList()) {
-                state.ctx.errors
-                    .make<TypeError>(
-                        "the expression selected by the selection path '%1%' should be a list but "
-                        "is %2%: %3%",
-                        attrPath,
-                        showType(*v),
-                        ValuePrinter(state, *v, errorPrintOptions)
-                    )
-                    .debugThrow();
-            }
-            if (*attrIndex >= v->listSize()) {
-                throw AttrPathNotFound(
-                    "list index %1% in selection path '%2%' is out of range for list %3%",
-                    *attrIndex,
-                    attrPath,
-                    ValuePrinter(state, *v, errorPrintOptions)
-                );
-            }
-
-            v = v->listElems()[*attrIndex];
-            pos = noPos;
-        }
-
-    }
-
-    return {v, pos};
-}
-
-
-std::pair<SourcePath, uint32_t> findPackageFilename(EvalState & state, Value & v, std::string what)
-{
-    Value * v2;
-    try {
-        auto dummyArgs = state.ctx.mem.allocBindings(0);
-        v2 = findAlongAttrPath(state, "meta.position", *dummyArgs, v).first;
-    } catch (Error &) {
-        throw NoPositionInfo("package '%s' has no source location information", what);
-    }
-
-    // FIXME: is it possible to extract the Pos object instead of doing this
-    //        toString + parsing?
-    NixStringContext context;
-    auto path = state.coerceToPath(noPos, *v2, context, "while evaluating the 'meta.position' attribute of a derivation");
-
-    auto fn = path.canonical().abs();
-
-    auto fail = [fn]() {
-        throw ParseError("cannot parse 'meta.position' attribute '%s'", fn);
-    };
-
-    auto colon = fn.rfind(':');
-    if (colon == std::string::npos) fail();
-    // parsing as int32 instead of the uint32 we return for historical reasons.
-    // previously this was a stoi(), and we don't know what editors would do if
-    // we gave them line numbers that wouldn't fit into the int32 number space.
-    auto lineno = string2Int<int32_t>(std::string(fn, colon + 1, std::string::npos));
-    if (!lineno) fail();
-    return {CanonPath(fn.substr(0, colon)), *lineno};
-}
-
-
-}

lix/libexpr/attr-path.hh

@@ -1,38 +0,0 @@
-#pragma once
-///@file
-
-#include "lix/libexpr/eval.hh"
-
-#include <string>
-
-namespace nix {
-
-MakeError(AttrPathNotFound, Error);
-MakeError(NoPositionInfo, Error);
-
-std::pair<Value *, PosIdx> findAlongAttrPath(
-    EvalState & state,
-    const std::string & attrPath,
-    Bindings & autoArgs,
-    Value & vIn);
-
-/**
- * Heuristic to find the filename and lineno or a nix value.
- */
-std::pair<SourcePath, uint32_t> findPackageFilename(EvalState & state, Value & v, std::string what);
-
-/**
- * Parses an attr path (as used in nix-build -A foo.bar.baz) into a list of tokens.
- *
- * Such an attr path is a dot-separated sequence of attribute names, which are possibly quoted.
- * No escaping is performed; attribute names containing double quotes are unrepresentable.
- */
-std::vector<std::string> parseAttrPath(std::string_view const s);
-
-/**
- * Converts an attr path from a list of strings into a string once more.
- * The result returned is an attr path and is *not necessarily valid nix syntax*.
- */
-std::string unparseAttrPath(std::vector<std::string> const & attrPath);
-
-}

lix/libexpr/attr-set.cc

@@ -1,55 +0,0 @@
-#include "lix/libexpr/attr-set.hh"
-#include "lix/libexpr/eval.hh"
-#include "lix/libexpr/gc-alloc.hh"
-
-#include <algorithm>
-
-
-namespace nix {
-
-Bindings Bindings::EMPTY{0};
-
-
-/* Allocate a new array of attributes for an attribute set with a specific
-   capacity. The space is implicitly reserved after the Bindings
-   structure. */
-Bindings * EvalMemory::allocBindings(size_t capacity)
-{
-    if (capacity == 0)
-        return &Bindings::EMPTY;
-    if (capacity > std::numeric_limits<Bindings::Size>::max())
-        throw Error("attribute set of size %d is too big", capacity);
-    stats.nrAttrsets++;
-    stats.nrAttrsInAttrsets += capacity;
-    return new (gcAllocBytes(sizeof(Bindings) + sizeof(Attr) * capacity)) Bindings((Bindings::Size) capacity);
-}
-
-
-Value & BindingsBuilder::alloc(Symbol name, PosIdx pos)
-{
-    auto value = mem.allocValue();
-    bindings->push_back(Attr(name, value, pos));
-    return *value;
-}
-
-
-Value & BindingsBuilder::alloc(std::string_view name, PosIdx pos)
-{
-    return alloc(symbols.create(name), pos);
-}
-
-
-void Bindings::sort()
-{
-    if (size_) std::sort(begin(), end());
-}
-
-
-Value & Value::mkAttrs(BindingsBuilder & bindings)
-{
-    mkAttrs(bindings.finish());
-    return *this;
-}
-
-
-}

lix/libexpr/builtin-constants/builtins.md

@@ -1,14 +0,0 @@
----
-name: builtins
-type: attrs
-constructorArgs: [mem.buildBindings(symbols, 128).finish()]
-renameInGlobalScope: false
----
-Contains all the [built-in functions](@docroot@/language/builtins.md) and values.
-
-Since built-in functions were added over time, [testing for attributes](./operators.md#has-attribute) in `builtins` can be used for graceful fallback on older Nix installations:
-
-```nix
-# if hasContext is not available, we assume `s` has a context
-if builtins ? hasContext then builtins.hasContext s else true
-```

lix/libexpr/builtin-constants/currentSystem.md

@@ -1,27 +0,0 @@
----
-name: currentSystem
-type: string
-constructorArgs: [evalSettings.getCurrentSystem()]
-impure: true
----
-The value of the
-[`eval-system`](@docroot@/command-ref/conf-file.md#conf-eval-system)
-or else
-[`system`](@docroot@/command-ref/conf-file.md#conf-system)
-configuration option.
-
-It can be used to set the `system` attribute for [`builtins.derivation`](@docroot@/language/derivations.md) such that the resulting derivation can be built on the same system that evaluates the Nix expression:
-
-```nix
- builtins.derivation {
-   # ...
-   system = builtins.currentSystem;
-}
-```
-
-It can be overridden in order to create derivations for different system than the current one:
-
-```console
-$ nix-instantiate --system "mips64-linux" --eval --expr 'builtins.currentSystem'
-"mips64-linux"
-```