Bump cachix/install-nix-action from 23 to 25

Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 23 to 25. - [Release notes](https://github.com/cachix/install-nix-action/releases) - [Commits](https://github.com/cachix/install-nix-action/compare/v23...v25) --- updated-dependencies: - dependency-name: cachix/install-nix-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
2024-02-26 01:31:25 +00:00
728 changed files with 22320 additions and 19188 deletions
@@ -1,50 +0,0 @@
---
-BasedOnStyle: LLVM
-AccessModifierOffset: -4
-AlignAfterOpenBracket: BlockIndent
-AlignEscapedNewlines: Left
-AlignOperands: DontAlign
-AllowShortBlocksOnASingleLine: Always
-AllowShortFunctionsOnASingleLine: Empty
-AllowShortIfStatementsOnASingleLine: WithoutElse
-AlwaysBreakBeforeMultilineStrings: true
-AlwaysBreakTemplateDeclarations: Yes
-BinPackArguments: false
-BinPackParameters: false
-BitFieldColonSpacing: None
-BraceWrapping:
-  AfterCaseLabel: false
-  AfterClass: true
-  AfterControlStatement: MultiLine
-  AfterEnum: false
-  AfterFunction: true
-  AfterNamespace: false
-  AfterObjCDeclaration: false
-  AfterStruct: true
-  AfterUnion: true
-  AfterExternBlock: false
-  BeforeCatch: false
-  BeforeElse: false
-  BeforeLambdaBody: false
-  BeforeWhile: false
-  IndentBraces: false
-  SplitEmptyFunction: true
-  SplitEmptyRecord: false
-  SplitEmptyNamespace: true
-BreakAfterAttributes: Always
-BreakBeforeBinaryOperators: NonAssignment
-BreakBeforeBraces: Custom
-BreakConstructorInitializers: BeforeComma
-ColumnLimit: 100
-EmptyLineAfterAccessModifier: Leave
-EmptyLineBeforeAccessModifier: Leave
-FixNamespaceComments: false
-IndentWidth: 4
-InsertBraces: true
-InsertTrailingCommas: Wrapped
-LambdaBodyIndentation: Signature
-PackConstructorInitializers: CurrentLine
-PointerAlignment: Middle
-SortIncludes: Never
-SpaceAfterCStyleCast: true
-SpaceAfterTemplateKeyword: false
@@ -1,18 +0,0 @@
-UseColor: true
-Checks:
-  - -*
-  - bugprone-*
-    # too many warnings
-  - -bugprone-assignment-in-if-condition
-    # too many warnings
-  - -bugprone-narrowing-conversions
-    # kind of nonsense
-  - -bugprone-easily-swappable-parameters
-    # too many warnings for now
-  - -bugprone-implicit-widening-of-multiplication-result
-    # Lix's exception handling is Questionable
-  - -bugprone-empty-catch
-    # many warnings
-  - -bugprone-unchecked-optional-access
-    # many warnings, seems like a questionable lint
-  - -bugprone-branch-clone
@@ -1,9 +0,0 @@
-# shellcheck shell=bash
-source_env_if_exists .envrc.local
-# TODO: `use flake .#native-clangStdenvPackages` on macOS?
-use flake ".#${LIX_SHELL_VARIANT:-default}" "${LIX_SHELL_EXTRA_ARGS[@]}"
-export MAKEFLAGS="$MAKEFLAGS -e"
-if [[ -n "$NIX_BUILD_CORES" ]]; then
-    export MAKEFLAGS="$MAKEFLAGS -j $NIX_BUILD_CORES"
-fi
-export GTEST_BRIEF=1
@@ -7,26 +7,30 @@ assignees: ''

 ---

-## Describe the bug
+**Describe the bug**

 A clear and concise description of what the bug is.

 If you have a problem with a specific package or NixOS,
-you probably want to file an issue at https://github.com/NixOS/nixpkgs/issues.
+you probably want to file an issue at https://github.com/NixOS/nixpkgs/issues. 

-## Steps To Reproduce
+**Steps To Reproduce**

 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error

-## Expected behavior
+**Expected behavior**

 A clear and concise description of what you expected to happen.

-## `nix --version` output
+**`nix-env --version` output**

-## Additional context
+**Additional context**

 Add any other context about the problem here.
+
+**Priorities**
+
+Add :+1: to [issues you find important](https://github.com/NixOS/nix/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc).
@@ -7,18 +7,18 @@ assignees: ''

 ---

-## Is your feature request related to a problem? Please describe.
-
+**Is your feature request related to a problem? Please describe.**
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

-## Describe the solution you'd like
-
+**Describe the solution you'd like**
 A clear and concise description of what you want to happen.

-## Describe alternatives you've considered
-
+**Describe alternatives you've considered**
 A clear and concise description of any alternative solutions or features you've considered.

-## Additional context
-
+**Additional context**
 Add any other context or screenshots about the feature request here.
+
+**Priorities**
+
+Add :+1: to [issues you find important](https://github.com/NixOS/nix/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc).
@@ -30,3 +30,7 @@ assignees: ''
 ```

 </details>
+
+## Priorities
+
+Add :+1: to [issues you find important](https://github.com/NixOS/nix/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc).
@@ -25,3 +25,7 @@ assignees: ''
 [latest Nix manual]: https://nixos.org/manual/nix/unstable/
 [source]: https://github.com/NixOS/nix/tree/master/doc/manual/src
 [open documentation issues and pull requests]: https://github.com/NixOS/nix/labels/documentation
+
+## Priorities
+
+Add :+1: to [issues you find important](https://github.com/NixOS/nix/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc).
@@ -9,3 +9,7 @@
 <!-- Invasive change: Discuss alternative designs or approaches you considered. -->

 <!-- Large change: Provide instructions to reviewers how to read the diff. -->
+
+# Priorities
+
+Add :+1: to [pull requests you find important](https://github.com/NixOS/nix/pulls?q=is%3Aopen+sort%3Areactions-%2B1-desc).
@@ -20,7 +20,7 @@ jobs:
    - uses: actions/checkout@v4
      with:
        fetch-depth: 0
-    - uses: cachix/install-nix-action@v23
+    - uses: cachix/install-nix-action@v25
      with:
        # The sandbox would otherwise be disabled by default on Darwin
        extra_nix_config: "sandbox = true"
@@ -62,7 +62,7 @@ jobs:
      with:
        fetch-depth: 0
    - run: echo CACHIX_NAME="$(echo $GITHUB_REPOSITORY-install-tests | tr "[A-Z]/" "[a-z]-")" >> $GITHUB_ENV
-    - uses: cachix/install-nix-action@v23
+    - uses: cachix/install-nix-action@v25
      with:
        install_url: https://releases.nixos.org/nix/nix-2.13.3/install
    - uses: cachix/cachix-action@v12
@@ -84,7 +84,7 @@ jobs:
    steps:
    - uses: actions/checkout@v4
    - run: echo CACHIX_NAME="$(echo $GITHUB_REPOSITORY-install-tests | tr "[A-Z]/" "[a-z]-")" >> $GITHUB_ENV
-    - uses: cachix/install-nix-action@v23
+    - uses: cachix/install-nix-action@v25
      with:
        install_url: '${{needs.installer.outputs.installerURL}}'
        install_options: "--tarball-url-prefix https://${{ env.CACHIX_NAME }}.cachix.org/serve"
@@ -111,7 +111,7 @@ jobs:
    - uses: actions/checkout@v4
      with:
        fetch-depth: 0
-    - uses: cachix/install-nix-action@v23
+    - uses: cachix/install-nix-action@v25
      with:
        install_url: https://releases.nixos.org/nix/nix-2.13.3/install
    - run: echo CACHIX_NAME="$(echo $GITHUB_REPOSITORY-install-tests | tr "[A-Z]/" "[a-z]-")" >> $GITHUB_ENV
@@ -17,3 +17,4 @@ jobs:
      with:
        fetch-depth: 0
    - run: bash scripts/check-hydra-status.sh
+
@@ -21,14 +21,12 @@ perl/Makefile.config
 /doc/manual/language.json
 /doc/manual/xp-features.json
 /doc/manual/src/SUMMARY.md
-/doc/manual/src/SUMMARY-rl-next.md
 /doc/manual/src/command-ref/new-cli
 /doc/manual/src/command-ref/conf-file.md
 /doc/manual/src/command-ref/experimental-features-shortlist.md
 /doc/manual/src/contributing/experimental-feature-descriptions.md
 /doc/manual/src/language/builtins.md
 /doc/manual/src/language/builtin-constants.md
-/doc/manual/src/release-notes/rl-next.md

 # /scripts/
 /scripts/nix-profile.sh
@@ -43,16 +41,13 @@ perl/Makefile.config
 /src/libexpr/parser-tab.hh
 /src/libexpr/parser-tab.output
 /src/libexpr/nix.tbl
-/src/libexpr/tests
 /tests/unit/libexpr/libnixexpr-tests

 # /src/libstore/
 *.gen.*
-/src/libstore/tests
 /tests/unit/libstore/libnixstore-tests

 # /src/libutil/
-/src/libutil/tests
 /tests/unit/libutil/libnixutil-tests

 /src/nix/nix
@@ -95,7 +90,6 @@ perl/Makefile.config
 /tests/functional/ca/config.nix
 /tests/functional/dyn-drv/config.nix
 /tests/functional/repl-result-out
-/tests/functional/debugger-test-out
 /tests/functional/test-libstoreconsumer/test-libstoreconsumer

 # /tests/functional/lang/
@@ -143,21 +137,8 @@ compile_commands.json
 nix-rust/target

 result
-result-*

 .vscode/
-.direnv/
-.envrc.local

 # clangd and possibly more
 .cache/
-
-# Mac OS
-.DS_Store
-
-# ClangBuildAnalyzer output, see maintainers/buildtime_report.sh
-buildtime.bin
-
-.envrc.local
-# We generate this with a Nix shell hook
-/.pre-commit-config.yaml
@@ -1 +1 @@
-2.90.0
+2.18.1
@@ -55,7 +55,7 @@ modified by someone else and passed on, the recipients should know
 that what they have is not the original version, so that the original
 author's reputation will not be affected by problems that might be
 introduced by others.
-
+
  Finally, software patents pose a constant threat to the existence of
 any free program.  We wish to make sure that a company cannot
 effectively restrict the users of a free program by obtaining a
@@ -111,7 +111,7 @@ modification follow.  Pay close attention to the difference between a
 "work based on the library" and a "work that uses the library".  The
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
-
+
 		  GNU LESSER GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

@@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
-
+  
  1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an
@@ -158,7 +158,7 @@ Library.
  You may charge a fee for the physical act of transferring a copy,
 and you may at your option offer warranty protection in exchange for a
 fee.
-
+
  2. You may modify your copy or copies of the Library or any portion
 of it, thus forming a work based on the Library, and copy and
 distribute such modifications or work under the terms of Section 1
@@ -216,7 +216,7 @@ instead of to this License.  (If a newer version than version 2 of the
 ordinary GNU General Public License has appeared, then you can specify
 that version instead if you wish.)  Do not make any other change in
 these notices.
-
+
  Once this change is made in a given copy, it is irreversible for
 that copy, so the ordinary GNU General Public License applies to all
 subsequent copies and derivative works made from that copy.
@@ -267,7 +267,7 @@ Library will still fall under Section 6.)
 distribute the object code for the work under the terms of Section 6.
 Any executables containing that work also fall under Section 6,
 whether or not they are linked directly with the Library itself.
-
+
  6. As an exception to the Sections above, you may also combine or
 link a "work that uses the Library" with the Library to produce a
 work containing portions of the Library, and distribute that work
@@ -329,7 +329,7 @@ restrictions of other proprietary libraries that do not normally
 accompany the operating system.  Such a contradiction means you cannot
 use both them and the Library together in an executable that you
 distribute.
-
+
  7. You may place library facilities that are a work based on the
 Library side-by-side in a single library together with other library
 facilities not covered by this License, and distribute such a combined
@@ -370,7 +370,7 @@ subject to these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties with
 this License.
-
+
  11. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
@@ -422,7 +422,7 @@ conditions either of that version or of any later version published by
 the Free Software Foundation.  If the Library does not specify a
 license version number, you may choose any version ever published by
 the Free Software Foundation.
-
+
  14. If you wish to incorporate parts of the Library into other free
 programs whose distribution conditions are incompatible with these,
 write to the author to ask for permission.  For software which is
@@ -456,7 +456,7 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.

 		     END OF TERMS AND CONDITIONS
-
+
           How to Apply These Terms to Your New Libraries

  If you develop a new library, and you want it to be of the greatest
@@ -500,3 +500,5 @@ necessary.  Here is a sample; alter the names:
  Ty Coon, President of Vice

 That's all there is to it!
+
+
@@ -1,9 +1,3 @@
-include mk/build-dir.mk
-
-include $(buildprefix)Makefile.config
-clean-files += $(buildprefix)Makefile.config
-
-ifeq ($(ENABLE_BUILD), yes)
 makefiles = \
  mk/precompiled-headers.mk \
  local.mk \
@@ -20,19 +14,18 @@ makefiles = \
  misc/fish/local.mk \
  misc/zsh/local.mk \
  misc/systemd/local.mk \
-  misc/launchd/local.mk
-endif
+  misc/launchd/local.mk \
+  misc/upstart/local.mk \
+  doc/manual/local.mk \
+  doc/internal-api/local.mk

-ifeq ($(ENABLE_BUILD)_$(ENABLE_TESTS), yes_yes)
-UNIT_TEST_ENV = _NIX_TEST_UNIT_DATA=unit-test-data
+-include Makefile.config
+
+ifeq ($(tests), yes)
 makefiles += \
  tests/unit/libutil/local.mk \
  tests/unit/libutil-support/local.mk \
-  tests/unit/libstore/local.mk
-endif
-
-ifeq ($(ENABLE_TESTS), yes)
-makefiles += \
+  tests/unit/libstore/local.mk \
  tests/unit/libstore-support/local.mk \
  tests/unit/libexpr/local.mk \
  tests/unit/libexpr-support/local.mk \
@@ -40,27 +33,16 @@ makefiles += \
  tests/functional/ca/local.mk \
  tests/functional/dyn-drv/local.mk \
  tests/functional/test-libstoreconsumer/local.mk \
-  tests/functional/repl_characterization/local.mk \
  tests/functional/plugins/local.mk
 else
 makefiles += \
  mk/disable-tests.mk
 endif

-# Some makefiles require access to built programs and must be included late.
-makefiles-late =
-
-ifeq ($(ENABLE_BUILD), yes)
-makefiles-late += doc/manual/local.mk
-makefiles-late += doc/internal-api/local.mk
-endif
-
-# Miscellaneous global Flags
-
 OPTIMIZE = 1

 ifeq ($(OPTIMIZE), 1)
-  GLOBAL_CXXFLAGS += -O2 $(CXXLTO)
+  GLOBAL_CXXFLAGS += -O3 $(CXXLTO)
  GLOBAL_LDFLAGS += $(CXXLTO)
 else
  GLOBAL_CXXFLAGS += -O0 -U_FORTIFY_SOURCE
@@ -68,4 +50,4 @@ endif

 include mk/lib.mk

-GLOBAL_CXXFLAGS += -g -Wall -Wimplicit-fallthrough -include $(buildprefix)config.h -std=c++2a -I src
+GLOBAL_CXXFLAGS += -g -Wall -include config.h -std=c++2a -I src
@@ -46,6 +46,5 @@ sandbox_shell = @sandbox_shell@
 storedir = @storedir@
 sysconfdir = @sysconfdir@
 system = @system@
-ENABLE_BUILD = @ENABLE_BUILD@
-ENABLE_TESTS = @ENABLE_TESTS@
+tests = @tests@
 internal_api_docs = @internal_api_docs@
@@ -9,7 +9,7 @@ index 0468aaec..b348d869 100644
 +  size_t stack_limit;
   if (!EXPECT(GC_thr_initialized, TRUE))
     GC_thr_init();
-
+ 
@@ -411,6 +412,19 @@ GC_INNER void GC_push_all_stacks(void)
             GC_push_all_stack_sections(lo, hi, p->traced_stack_sect);
           }
@@ -37,7 +37,7 @@ index edab6c22..f2c61282 100644
@@ -2172,6 +2172,11 @@ GC_API void GC_CALL GC_win32_free_heap(void);
         (*GC_amiga_allocwrapper_do)(a,GC_malloc_atomic_ignore_off_page)
 #endif /* _AMIGA && !GC_AMIGA_MAKINGLIB */
-
+ 
 +#if !__APPLE__
 +/* Patch doesn't work on apple */
 +#define NIX_BOEHM_PATCH_VERSION 1
@@ -59,18 +59,12 @@ index b5d71e62..aed7b0bf 100644
     GC_bool found_me = FALSE;
     size_t nthreads = 0;
     int i;
-@@ -851,6 +853,37 @@ GC_INNER void GC_push_all_stacks(void)
+@@ -851,6 +853,31 @@ GC_INNER void GC_push_all_stacks(void)
           hi = p->altstack + p->altstack_size;
           /* FIXME: Need to scan the normal stack too, but how ? */
           /* FIXME: Assume stack grows down */
 +        } else {
-+#ifdef HAVE_PTHREAD_ATTR_GET_NP
-+          if (!pthread_attr_init(&pattr)
-+              || !pthread_attr_get_np(p->id, &pattr))
-+#else /* HAVE_PTHREAD_GETATTR_NP */
-+          if (pthread_getattr_np(p->id, &pattr))
-+#endif
-+          {
+          if (pthread_getattr_np(p->id, &pattr)) {
 +            ABORT("GC_push_all_stacks: pthread_getattr_np failed!");
 +          }
 +          if (pthread_attr_getstacksize(&pattr, &stack_limit)) {
@@ -1,12 +0,0 @@
-diff --git a/include/gc_allocator.h b/include/gc_allocator.h
-index 597c7f13..587286be 100644
--- a/include/gc_allocator.h
-+++ b/include/gc_allocator.h
-@@ -312,6 +312,7 @@ public:
-
- template<>
- class traceable_allocator<void> {
-+public:
-   typedef size_t      size_type;
-   typedef ptrdiff_t   difference_type;
-   typedef void*       pointer;
@@ -0,0 +1,4 @@
+#! /bin/sh -e
+rm -f aclocal.m4
+mkdir -p config
+exec autoreconf -vfi
@@ -1 +0,0 @@
-BasedOnStyle: llvm
@@ -1,80 +0,0 @@
-#include "HasPrefixSuffix.hh"
-#include <clang/AST/ASTTypeTraits.h>
-#include <clang/AST/Expr.h>
-#include <clang/AST/PrettyPrinter.h>
-#include <clang/AST/Type.h>
-#include <clang/ASTMatchers/ASTMatchers.h>
-#include <clang/Basic/Diagnostic.h>
-#include <clang/Frontend/FrontendAction.h>
-#include <clang/Frontend/FrontendPluginRegistry.h>
-#include <clang/Tooling/Transformer/SourceCode.h>
-#include <clang/Tooling/Transformer/SourceCodeBuilders.h>
-#include <iostream>
-
-namespace nix::clang_tidy {
-using namespace clang::ast_matchers;
-using namespace clang;
-
-void HasPrefixSuffixCheck::registerMatchers(ast_matchers::MatchFinder *Finder) {
-  Finder->addMatcher(
-      traverse(clang::TK_AsIs,
-               callExpr(callee(functionDecl(anyOf(hasName("hasPrefix"),
-                                                  hasName("hasSuffix")))
-                                   .bind("callee-decl")),
-                        optionally(hasArgument(
-                            0, cxxConstructExpr(
-                                   hasDeclaration(functionDecl(hasParameter(
-                                       0, parmVarDecl(hasType(
-                                              asString("const char *")))))))
-                                   .bind("implicit-cast"))))
-                   .bind("call")),
-      this);
-}
-
-void HasPrefixSuffixCheck::check(
-    const ast_matchers::MatchFinder::MatchResult &Result) {
-
-  const auto *CalleeDecl = Result.Nodes.getNodeAs<FunctionDecl>("callee-decl");
-  auto FuncName = std::string(CalleeDecl->getName());
-  std::string NewName;
-  if (FuncName == "hasPrefix") {
-    NewName = "starts_with";
-  } else if (FuncName == "hasSuffix") {
-    NewName = "ends_with";
-  } else {
-    llvm_unreachable("nix-has-prefix: invalid callee");
-  }
-
-  const auto *MatchedDecl = Result.Nodes.getNodeAs<CallExpr>("call");
-  const auto *ImplicitConvertArg =
-      Result.Nodes.getNodeAs<CXXConstructExpr>("implicit-cast");
-
-  const auto *Lhs = MatchedDecl->getArg(0);
-  const auto *Rhs = MatchedDecl->getArg(1);
-  auto Diag = diag(MatchedDecl->getExprLoc(), FuncName + " is deprecated");
-
-  std::string Text = "";
-
-  // Form possible cast to string_view, or nothing.
-  if (ImplicitConvertArg) {
-    Text = "std::string_view(";
-    Text.append(tooling::getText(*Lhs, *Result.Context));
-    Text.append(").");
-  } else {
-    Text.append(*tooling::buildAccess(*Lhs, *Result.Context));
-  }
-
-  // Call .starts_with.
-  Text.append(NewName);
-  Text.push_back('(');
-  Text.append(tooling::getText(*Rhs, *Result.Context));
-  Text.push_back(')');
-
-  Diag << FixItHint::CreateReplacement(MatchedDecl->getSourceRange(), Text);
-
-  // for (const auto *arg : MatchedDecl->arguments()) {
-  //   arg->dumpColor();
-  //   arg->getType().dump();
-  // }
-}
-}; // namespace nix::clang_tidy
@@ -1,25 +0,0 @@
-#pragma once
-///@file
-/// This is an example of a clang-tidy automated refactoring against the Nix
-/// codebase. The refactoring has been completed in
-/// https://gerrit.lix.systems/c/lix/+/565 so this code is around as
-/// an example.
-
-#include <clang-tidy/ClangTidyCheck.h>
-#include <clang/ASTMatchers/ASTMatchFinder.h>
-#include <llvm/ADT/StringRef.h>
-
-namespace nix::clang_tidy {
-
-using namespace clang;
-using namespace clang::tidy;
-using namespace llvm;
-
-class HasPrefixSuffixCheck : public ClangTidyCheck {
-public:
-  HasPrefixSuffixCheck(StringRef Name, ClangTidyContext *Context)
-      : ClangTidyCheck(Name, Context) {}
-  void registerMatchers(ast_matchers::MatchFinder *Finder) override;
-  void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
-};
-}; // namespace nix::clang_tidy
@@ -1,17 +0,0 @@
-#include <clang-tidy/ClangTidyModule.h>
-#include <clang-tidy/ClangTidyModuleRegistry.h>
-#include "HasPrefixSuffix.hh"
-
-namespace nix::clang_tidy {
-using namespace clang;
-using namespace clang::tidy;
-
-class NixClangTidyChecks : public ClangTidyModule {
-    public:
-        void addCheckFactories(ClangTidyCheckFactories &CheckFactories) override {
-            CheckFactories.registerCheck<HasPrefixSuffixCheck>("nix-hasprefixsuffix");
-        }
-};
-
-static ClangTidyModuleRegistry::Add<NixClangTidyChecks> X("nix-module", "Adds nix specific checks");
-};
@@ -1,56 +0,0 @@
-# Clang tidy lints for Nix
-
-This is a skeleton of a clang-tidy lints library for Nix.
-
-Currently there is one check (which is already obsolete as it has served its
-goal and is there as an example), `HasPrefixSuffixCheck`.
-
-## Running fixes/checks
-
-One file:
-
-```
-ninja -C build && clang-tidy --checks='-*,nix-*' --load=build/libnix-clang-tidy.so -p ../compile_commands.json --fix ../src/libcmd/installables.cc
-```
-
-Several files, in parallel:
-
-```
-ninja -C build && run-clang-tidy -checks='-*,nix-*' -load=build/libnix-clang-tidy.so -p .. -fix ../src | tee -a clang-tidy-result
-```
-
-## Resources
-
-* https://firefox-source-docs.mozilla.org/code-quality/static-analysis/writing-new/clang-query.html
-* https://clang.llvm.org/docs/LibASTMatchersReference.html
-* https://devblogs.microsoft.com/cppblog/exploring-clang-tooling-part-3-rewriting-code-with-clang-tidy/
-
-## Developing new checks
-
-Put something like so in `myquery.txt`:
-
-```
-set traversal     IgnoreUnlessSpelledInSource
-# ^ Ignore implicit AST nodes. May need to use AsIs depending on how you are
-# working.
-set bind-root     true
-# ^ true unless you use any .bind("foo") commands
-set print-matcher true
-enable output     dump
-match callExpr(callee(functionDecl(hasName("hasPrefix"))), optionally(hasArgument( 0, cxxConstructExpr(hasDeclaration(functionDecl(hasParameter(0, parmVarDecl(hasType(asString("const char *"))).bind("meow2"))))))))
-```
-
-Then run, e.g. `clang-query --preload hasprefix.query -p compile_commands.json src/libcmd/installables.cc`.
-
-With this you can iterate a query before writing it in C++ and suffering from
-C++.
-
-### Tips and tricks for the C++
-
-There is a function `dump()` on many things that will dump to stderr. Also
-`llvm::errs()` lets you print to stderr.
-
-When I wrote `HasPrefixSuffixCheck`, I was not really able to figure out how
-the structured replacement system was supposed to work. In principle you can
-describe the replacement with a nice DSL. Look up the Stencil system in Clang
-for details.
@@ -1,8 +0,0 @@
-project('nix-clang-tidy', ['cpp', 'c'],
-  version : '0.1',
-  default_options : ['warning_level=3', 'cpp_std=c++20'])
-
-llvm = dependency('Clang', version: '>= 14', modules: ['libclang'])
-sources = ['HasPrefixSuffix.cc', 'NixClangTidyChecks.cc']
-shared_module('nix-clang-tidy', sources,
-  dependencies: llvm)
@@ -47,10 +47,6 @@ AC_DEFINE_UNQUOTED(SYSTEM, ["$system"], [platform identifier ('cpu-os')])
 # State should be stored in /nix/var, unless the user overrides it explicitly.
 test "$localstatedir" = '${prefix}/var' && localstatedir=/nix/var

-# Assign a default value to C{,XX}FLAGS as the default configure script sets them
-# to -O2 otherwise, which we don't want to have hardcoded
-CFLAGS=${CFLAGS-""}
-CXXFLAGS=${CXXFLAGS-""}

 AC_PROG_CC
 AC_PROG_CXX
@@ -72,9 +68,6 @@ case "$host_os" in
 esac


-ENSURE_NO_GCC_BUG_80431
-
-
 # Check for pubsetbuf.
 AC_MSG_CHECKING([for pubsetbuf])
 AC_LANG_PUSH(C++)
@@ -159,17 +152,12 @@ if test "x$GCC_ATOMIC_BUILTINS_NEED_LIBATOMIC" = xyes; then
    LDFLAGS="-latomic $LDFLAGS"
 fi

-# Running the functional tests without building Nix is useful for testing
-# different pre-built versions of Nix against each other.
-AC_ARG_ENABLE(build, AS_HELP_STRING([--disable-build],[Do not build nix]),
-  ENABLE_BUILD=$enableval, ENABLE_BUILD=yes)
-AC_SUBST(ENABLE_BUILD)
 # Building without tests is useful for bootstrapping with a smaller footprint
 # or running the tests in a separate derivation. Otherwise, we do compile and
 # run them.
 AC_ARG_ENABLE(tests, AS_HELP_STRING([--disable-tests],[Do not build the tests]),
-  ENABLE_TESTS=$enableval, ENABLE_TESTS=yes)
-AC_SUBST(ENABLE_TESTS)
+  tests=$enableval, tests=yes)
+AC_SUBST(tests)

 # Building without API docs is the default as Nix' C++ interfaces are internal and unstable.
 AC_ARG_ENABLE(internal_api_docs, AS_HELP_STRING([--enable-internal-api-docs],[Build API docs for Nix's internal unstable C++ interfaces]),
@@ -301,10 +289,10 @@ if test "$gc" = yes; then
 fi


-if test "$ENABLE_TESTS" = yes; then
+if test "$tests" = yes; then

 # Look for gtest.
-PKG_CHECK_MODULES([GTEST], [gtest_main gmock_main])
+PKG_CHECK_MODULES([GTEST], [gtest_main])


 # Look for rapidcheck.
@@ -342,13 +330,6 @@ AC_SUBST(doc_generate)
 # Look for lowdown library.
 PKG_CHECK_MODULES([LOWDOWN], [lowdown >= 0.9.0], [CXXFLAGS="$LOWDOWN_CFLAGS $CXXFLAGS"])

-# Look for toml11, a required dependency.
-AC_ARG_VAR([TOML11_HEADERS], [include path of toml11 headers])
-AC_LANG_PUSH(C++)
-[CXXFLAGS="-I $TOML11_HEADERS $CXXFLAGS"]
-AC_CHECK_HEADER([toml.hpp], [], [AC_MSG_ERROR([toml11 is not found.])])
-AC_LANG_POP(C++)
-
 # Setuid installations.
 AC_CHECK_FUNCS([setresuid setreuid lchown])

@@ -58,23 +58,6 @@ INPUT                  = \
  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
-# performed. Macro expansion can be done in a controlled way by setting
-# EXPAND_ONLY_PREDEF to YES.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-MACRO_EXPANSION        = YES
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
-# the macro expansion is limited to the macros specified with the PREDEFINED and
-# EXPAND_AS_DEFINED tags.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_ONLY_PREDEF     = YES
-
 # The INCLUDE_PATH tag can be used to specify one or more directories that
 # contain include files that are not input files but should be processed by the
 # preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of
@@ -82,16 +65,3 @@ EXPAND_ONLY_PREDEF     = YES
 # This tag requires that the tag SEARCH_INCLUDES is set to YES.

 INCLUDE_PATH           = @RAPIDCHECK_HEADERS@
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
-# tag can be used to specify a list of macro names that should be expanded. The
-# macro definition that is found in the sources will be used. Use the PREDEFINED
-# tag if you want to use a different macro definition that overrules the
-# definition found in the source code.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_AS_DEFINED      = \
-  DECLARE_COMMON_SERIALISER \
-  DECLARE_WORKER_SERIALISER \
-  DECLARE_SERVE_SERIALISER \
-  LENGTH_PREFIXED_PROTO_HELPER
@@ -70,7 +70,6 @@ let
        * [`${command} ${name}`](./${appendName filename name}.md) - ${subcmd.description}
      '';

-      # TODO: move this confusing special case out of here when implementing #8496
      maybeStoreDocs = optionalString
        (details ? doc)
        (replaceStrings ["@stores@"] [storeDocs] details.doc);
@@ -79,10 +78,6 @@ let
        # Options

        ${showOptions details.flags toplevel.flags}
-
-        > **Note**
-        >
-        > See [`man nix.conf`](@docroot@/command-ref/conf-file.md#command-line-flags) for overriding configuration settings with command line flags.
      '';

      showOptions = options: commonOptions:
@@ -155,7 +150,7 @@ let
            To use this store, 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`](@docroot@/command-ref/conf-file.md):
+            For example, include the following in [`nix.conf`](#):

            ```
            extra-experimental-features = ${experimentalFeature}
@@ -1,10 +1,5 @@
 ifeq ($(doc_generate),yes)

-# The version of Nix used to generate the doc. Can also be
-# `$(nix_INSTALL_PATH)` or just `nix` (to grap ambient from the `PATH`),
-# if one prefers.
-doc_nix = $(nix_PATH)
-
 MANUAL_SRCS := \
 	$(call rwildcard, $(d)/src, *.md) \
 	$(call rwildcard, $(d)/src, */*.md)
@@ -37,99 +32,118 @@ dummy-env = env -i \
 	NIX_STATE_DIR=/dummy \
 	NIX_CONFIG='cores = 0'

-nix-eval = $(dummy-env) $(doc_nix) eval --experimental-features nix-command -I nix/corepkgs=corepkgs --store dummy:// --impure --raw
+nix-eval = $(dummy-env) $(bindir)/nix eval --experimental-features nix-command -I nix/corepkgs=corepkgs --store dummy:// --impure --raw
+
+# re-implement mdBook's include directive to make it usable for terminal output and for proper @docroot@ substitution
+define process-includes
+	while read -r line; do \
+		set -euo pipefail; \
+		filename="$$(dirname $(1))/$$(sed 's/{{#include \(.*\)}}/\1/'<<< $$line)"; \
+		test -f "$$filename" || ( echo "#include-d file '$$filename' does not exist." >&2; exit 1; ); \
+		matchline="$$(sed 's|/|\\/|g' <<< $$line)"; \
+		sed -i "/$$matchline/r $$filename" $(2); \
+		sed -i "s/$$matchline//" $(2); \
+	done < <(grep '{{#include' $(1))
+endef

 $(d)/nix-env-%.1: $(d)/src/command-ref/nix-env/%.md
-	$(trace-gen) doc/manual/render-manpage.sh \
-		--unescape-dashes "$(subst nix-env-,nix-env --,$$(basename "$@" .1))" 1 $^ $^.tmp $@
+	@printf "Title: %s\n\n" "$(subst nix-env-,nix-env --,$$(basename "$@" .1))" > $^.tmp
+	$(render-subcommand)

 $(d)/nix-store-%.1: $(d)/src/command-ref/nix-store/%.md
-	$(trace-gen) doc/manual/render-manpage.sh \
-		--unescape-dashes "$(subst nix-store-,nix-store --,$$(basename "$@" .1))" 1 $^ $^.tmp $@
+	@printf -- 'Title: %s\n\n' "$(subst nix-store-,nix-store --,$$(basename "$@" .1))" > $^.tmp
+	$(render-subcommand)
+
+# FIXME: there surely is some more deduplication to be achieved here with even darker Make magic
+define render-subcommand
+  @cat $^ >> $^.tmp
+	@$(call process-includes,$^,$^.tmp)
+	$(trace-gen) lowdown -sT man --nroff-nolinks -M section=1 $^.tmp -o $@
+	@# fix up `lowdown`'s automatic escaping of `--`
+	@# https://github.com/kristapsdz/lowdown/blob/edca6ce6d5336efb147321a43c47a698de41bb7c/entity.c#L202
+	@sed -i 's/\e\[u2013\]/--/' $@
+	@rm $^.tmp
+endef


 $(d)/%.1: $(d)/src/command-ref/%.md
-	$(trace-gen) doc/manual/render-manpage.sh "$$(basename $@ .1)" 1 $^ $^.tmp $@
+	@printf "Title: %s\n\n" "$$(basename $@ .1)" > $^.tmp
+	@cat $^ >> $^.tmp
+	@$(call process-includes,$^,$^.tmp)
+	$(trace-gen) lowdown -sT man --nroff-nolinks -M section=1 $^.tmp -o $@
+	@rm $^.tmp

 $(d)/%.8: $(d)/src/command-ref/%.md
-	$(trace-gen) doc/manual/render-manpage.sh "$$(basename $@ .8)" 8 $^ $^.tmp $@
+	@printf "Title: %s\n\n" "$$(basename $@ .8)" > $^.tmp
+	@cat $^ >> $^.tmp
+	$(trace-gen) lowdown -sT man --nroff-nolinks -M section=8 $^.tmp -o $@
+	@rm $^.tmp

 $(d)/nix.conf.5: $(d)/src/command-ref/conf-file.md
-	$(trace-gen) doc/manual/render-manpage.sh "$$(basename $@ .5)" 5 $^ $^.tmp $@
+	@printf "Title: %s\n\n" "$$(basename $@ .5)" > $^.tmp
+	@cat $^ >> $^.tmp
+	@$(call process-includes,$^,$^.tmp)
+	$(trace-gen) lowdown -sT man --nroff-nolinks -M section=5 $^.tmp -o $@
+	@rm $^.tmp

 $(d)/nix-profiles.5: $(d)/src/command-ref/files/profiles.md
-	$(trace-gen) doc/manual/render-manpage.sh "$$(basename $@ .5)" 5 $^ $^.tmp $@
+	@printf "Title: %s\n\n" "$$(basename $@ .5)" > $^.tmp
+	@cat $^ >> $^.tmp
+	$(trace-gen) lowdown -sT man --nroff-nolinks -M section=5 $^.tmp -o $@
+	@rm $^.tmp

-$(d)/src/SUMMARY.md: $(d)/src/SUMMARY.md.in $(d)/src/SUMMARY-rl-next.md $(d)/src/command-ref/new-cli $(d)/src/contributing/experimental-feature-descriptions.md
+$(d)/src/SUMMARY.md: $(d)/src/SUMMARY.md.in $(d)/src/command-ref/new-cli $(d)/src/contributing/experimental-feature-descriptions.md
 	@cp $< $@
-	@doc/manual/process-includes.sh $@ $@
+	@$(call process-includes,$@,$@)

-$(d)/src/command-ref/new-cli: $(d)/nix.json $(d)/utils.nix $(d)/generate-manpage.nix $(doc_nix)
+$(d)/src/command-ref/new-cli: $(d)/nix.json $(d)/utils.nix $(d)/generate-manpage.nix $(bindir)/nix
 	@rm -rf $@ $@.tmp
 	$(trace-gen) $(nix-eval) --write-to $@.tmp --expr 'import doc/manual/generate-manpage.nix true (builtins.readFile $<)'
 	@mv $@.tmp $@

-$(d)/src/command-ref/conf-file.md: $(d)/conf-file.json $(d)/utils.nix $(d)/src/command-ref/conf-file-prefix.md $(d)/src/command-ref/experimental-features-shortlist.md $(doc_nix)
+$(d)/src/command-ref/conf-file.md: $(d)/conf-file.json $(d)/utils.nix $(d)/src/command-ref/conf-file-prefix.md $(d)/src/command-ref/experimental-features-shortlist.md $(bindir)/nix
 	@cat doc/manual/src/command-ref/conf-file-prefix.md > $@.tmp
 	$(trace-gen) $(nix-eval) --expr '(import doc/manual/utils.nix).showSettings { inlineHTML = true; } (builtins.fromJSON (builtins.readFile $<))' >> $@.tmp;
 	@mv $@.tmp $@

-$(d)/nix.json: $(doc_nix)
-	$(trace-gen) $(dummy-env) $(doc_nix) __dump-cli > $@.tmp
+$(d)/nix.json: $(bindir)/nix
+	$(trace-gen) $(dummy-env) $(bindir)/nix __dump-cli > $@.tmp
 	@mv $@.tmp $@

-$(d)/conf-file.json: $(doc_nix)
-	$(trace-gen) $(dummy-env) $(doc_nix) show-config --json --experimental-features nix-command > $@.tmp
+$(d)/conf-file.json: $(bindir)/nix
+	$(trace-gen) $(dummy-env) $(bindir)/nix show-config --json --experimental-features nix-command > $@.tmp
 	@mv $@.tmp $@

-$(d)/src/contributing/experimental-feature-descriptions.md: $(d)/xp-features.json $(d)/utils.nix $(d)/generate-xp-features.nix $(doc_nix)
+$(d)/src/contributing/experimental-feature-descriptions.md: $(d)/xp-features.json $(d)/utils.nix $(d)/generate-xp-features.nix $(bindir)/nix
 	@rm -rf $@ $@.tmp
 	$(trace-gen) $(nix-eval) --write-to $@.tmp --expr 'import doc/manual/generate-xp-features.nix (builtins.fromJSON (builtins.readFile $<))'
 	@mv $@.tmp $@

-$(d)/src/command-ref/experimental-features-shortlist.md: $(d)/xp-features.json $(d)/utils.nix $(d)/generate-xp-features-shortlist.nix $(doc_nix)
+$(d)/src/command-ref/experimental-features-shortlist.md: $(d)/xp-features.json $(d)/utils.nix $(d)/generate-xp-features-shortlist.nix $(bindir)/nix
 	@rm -rf $@ $@.tmp
 	$(trace-gen) $(nix-eval) --write-to $@.tmp --expr 'import doc/manual/generate-xp-features-shortlist.nix (builtins.fromJSON (builtins.readFile $<))'
 	@mv $@.tmp $@

-$(d)/xp-features.json: $(doc_nix)
-	$(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs $(doc_nix) __dump-xp-features > $@.tmp
+$(d)/xp-features.json: $(bindir)/nix
+	$(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs $(bindir)/nix __dump-xp-features > $@.tmp
 	@mv $@.tmp $@

-$(d)/src/language/builtins.md: $(d)/language.json $(d)/generate-builtins.nix $(d)/src/language/builtins-prefix.md $(doc_nix)
+$(d)/src/language/builtins.md: $(d)/language.json $(d)/generate-builtins.nix $(d)/src/language/builtins-prefix.md $(bindir)/nix
 	@cat doc/manual/src/language/builtins-prefix.md > $@.tmp
 	$(trace-gen) $(nix-eval) --expr 'import doc/manual/generate-builtins.nix (builtins.fromJSON (builtins.readFile $<)).builtins' >> $@.tmp;
 	@cat doc/manual/src/language/builtins-suffix.md >> $@.tmp
 	@mv $@.tmp $@

-$(d)/src/language/builtin-constants.md: $(d)/language.json $(d)/generate-builtin-constants.nix $(d)/src/language/builtin-constants-prefix.md $(doc_nix)
+$(d)/src/language/builtin-constants.md: $(d)/language.json $(d)/generate-builtin-constants.nix $(d)/src/language/builtin-constants-prefix.md $(bindir)/nix
 	@cat doc/manual/src/language/builtin-constants-prefix.md > $@.tmp
 	$(trace-gen) $(nix-eval) --expr 'import doc/manual/generate-builtin-constants.nix (builtins.fromJSON (builtins.readFile $<)).constants' >> $@.tmp;
 	@cat doc/manual/src/language/builtin-constants-suffix.md >> $@.tmp
 	@mv $@.tmp $@

-$(d)/language.json: $(doc_nix)
-	$(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs $(doc_nix) __dump-language > $@.tmp
+$(d)/language.json: $(bindir)/nix
+	$(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs $(bindir)/nix __dump-language > $@.tmp
 	@mv $@.tmp $@

-# Generate "Upcoming release" notes (or clear it and remove from menu)
-$(d)/src/release-notes/rl-next.md: $(d)/rl-next $(d)/rl-next/*
-	@if type -p build-release-notes > /dev/null; then \
-		echo "  GEN   " $@; \
-		build-release-notes doc/manual/rl-next > $@; \
-	else \
-		echo "  NULL  " $@; \
-		true > $@; \
-	fi
-
-$(d)/src/SUMMARY-rl-next.md: $(d)/src/release-notes/rl-next.md
-	$(trace-gen) true
-	@if [ -s $< ]; then \
-		echo '  - [Upcoming release](release-notes/rl-next.md)' > $@; \
-	else \
-	  true > $@; \
-	fi
-
 # Generate the HTML manual.
 .PHONY: manual-html
 manual-html: $(docdir)/manual/index.html
@@ -159,12 +173,12 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli
 	done
 	@touch $@

-$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/anchors.jq $(d)/custom.css $(d)/src/SUMMARY.md $(d)/src/command-ref/new-cli $(d)/src/contributing/experimental-feature-descriptions.md $(d)/src/command-ref/conf-file.md $(d)/src/language/builtins.md $(d)/src/language/builtin-constants.md $(d)/src/release-notes/rl-next.md
+$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/anchors.jq $(d)/custom.css $(d)/src/SUMMARY.md $(d)/src/command-ref/new-cli $(d)/src/contributing/experimental-feature-descriptions.md $(d)/src/command-ref/conf-file.md $(d)/src/language/builtins.md $(d)/src/language/builtin-constants.md
 	$(trace-gen) \
 		tmp="$$(mktemp -d)"; \
 		cp -r doc/manual "$$tmp"; \
 		find "$$tmp" -name '*.md' | while read -r file; do \
-			doc/manual/process-includes.sh $$file $$file; \
+			$(call process-includes,$$file,$$file); \
 		done; \
 		find "$$tmp" -name '*.md' | while read -r file; do \
 			docroot="$$(realpath --relative-to="$$(dirname "$$file")" $$tmp/manual/src)"; \
@@ -1,290 +0,0 @@
-nix_env_for_docs = {
-  'HOME': '/dummy',
-  'NIX_CONF_DIR': '/dummy',
-  'NIX_SSL_CERT_FILE': '/dummy/no-ca-bundle.crt',
-  'NIX_STATE_DIR': '/dummy',
-  'NIX_CONFIG': 'cores = 0',
-}
-
-nix_for_docs = [ nix, '--experimental-features', 'nix-command' ]
-nix_eval_for_docs = nix_for_docs + [
-  'eval',
-  '-I', 'nix/corepkgs=corepkgs',
-  '--store', 'dummy://',
-  '--impure',
-  '--raw',
-]
-
-nix_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',
-    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-prefix.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',
-)
-nix_exp_feature_shortlist = custom_target(
-  command : nix_eval_for_docs + [
-    '--expr',
-    'import @INPUT0@ (builtins.fromJSON (builtins.readFile @INPUT1@))',
-  ],
-  input : [
-    'generate-xp-features-shortlist.nix',
-    nix_exp_features_json,
-  ],
-  output : 'experimental-features-shortlist.md',
-  capture : true,
-  env : nix_env_for_docs,
-)
-
-nix_nested_manpages = [
-  [ 'nix-env',
-    [
-      'delete-generations',
-      'install',
-      'list-generations',
-      'query',
-      'rollback',
-      'set-flag',
-      'set',
-      'switch-generation',
-      'switch-profile',
-      'uninstall',
-      'upgrade',
-    ],
-  ],
-  [ 'nix-store',
-    [
-      'add-fixed',
-      'add',
-      'delete',
-      'dump-db',
-      'dump',
-      'export',
-      'gc',
-      'generate-binary-cache-key',
-      'import',
-      'load-db',
-      'optimise',
-      'print-env',
-      'query',
-      'read-log',
-      'realise',
-      'repair-path',
-      'restore',
-      'serve',
-      'verify',
-      'verify-path',
-    ],
-  ],
-]
-
-foreach command : nix_nested_manpages
-  foreach page : command[1]
-    custom_target(
-      command : [
-        './render-manpage.sh',
-        '--unescape-dashes',
-        command[0] + ' --' + page,
-        '1',
-        '@INPUT@',
-        '@OUTPUT@.tmp',
-        '@OUTPUT@',
-      ],
-      input : 'src/command-ref' / command[0] / (page + '.md'),
-      output : command[0] + '-' + page + '.1',
-      install : true,
-      install_dir : mandir / 'man1',
-    )
-  endforeach
-endforeach
-
-nix3_cli_json = custom_target(
-  command : [ nix, '__dump-cli' ],
-  capture : true,
-  output : 'nix.json',
-)
-nix3_cli_files = custom_target(
-  command : nix_eval_for_docs + [
-    '--write-to', '@OUTPUT@',
-    '--expr',
-    'import @INPUT1@ true (builtins.readFile @INPUT0@)',
-  ],
-  input : [
-    nix3_cli_json,
-    'generate-manpage.nix',
-    'utils.nix',
-  ],
-  output : 'new-cli',
-)
-
-nix3_manpages = [
-  'nix3-build',
-  'nix3-bundle',
-  'nix3-copy',
-  'nix3-daemon',
-  'nix3-derivation-add',
-  'nix3-derivation',
-  'nix3-derivation-show',
-  'nix3-develop',
-  'nix3-doctor',
-  'nix3-edit',
-  'nix3-eval',
-  'nix3-flake-archive',
-  'nix3-flake-check',
-  'nix3-flake-clone',
-  'nix3-flake-info',
-  'nix3-flake-init',
-  'nix3-flake-lock',
-  'nix3-flake',
-  'nix3-flake-metadata',
-  'nix3-flake-new',
-  'nix3-flake-prefetch',
-  'nix3-flake-show',
-  'nix3-flake-update',
-  'nix3-fmt',
-  'nix3-hash-file',
-  'nix3-hash',
-  'nix3-hash-path',
-  'nix3-hash-to-base16',
-  'nix3-hash-to-base32',
-  'nix3-hash-to-base64',
-  'nix3-hash-to-sri',
-  'nix3-help',
-  'nix3-help-stores',
-  'nix3-key-convert-secret-to-public',
-  'nix3-key-generate-secret',
-  'nix3-key',
-  'nix3-log',
-  'nix3-nar-cat',
-  'nix3-nar-dump-path',
-  'nix3-nar-ls',
-  'nix3-nar',
-  'nix3-path-info',
-  'nix3-print-dev-env',
-  'nix3-profile-diff-closures',
-  'nix3-profile-history',
-  'nix3-profile-install',
-  'nix3-profile-list',
-  'nix3-profile',
-  'nix3-profile-remove',
-  'nix3-profile-rollback',
-  'nix3-profile-upgrade',
-  'nix3-profile-wipe-history',
-  'nix3-realisation-info',
-  'nix3-realisation',
-  'nix3-registry-add',
-  'nix3-registry-list',
-  'nix3-registry',
-  'nix3-registry-pin',
-  'nix3-registry-remove',
-  'nix3-repl',
-  'nix3-run',
-  'nix3-search',
-  'nix3-shell',
-  'nix3-show-config',
-  'nix3-store-add-file',
-  'nix3-store-add-path',
-  'nix3-store-cat',
-  'nix3-store-copy-log',
-  'nix3-store-copy-sigs',
-  'nix3-store-delete',
-  'nix3-store-diff-closures',
-  'nix3-store-dump-path',
-  'nix3-store-gc',
-  'nix3-store-ls',
-  'nix3-store-make-content-addressed',
-  'nix3-store',
-  'nix3-store-optimise',
-  'nix3-store-path-from-hash-part',
-  'nix3-store-ping',
-  'nix3-store-prefetch-file',
-  'nix3-store-repair',
-  'nix3-store-sign',
-  'nix3-store-verify',
-  'nix3-upgrade-nix',
-  'nix3-why-depends',
-  'nix',
-]
-
-foreach page : nix3_manpages
-  custom_target(
-    command : [
-      './render-manpage.sh',
-      page,
-      '1',
-      '@INPUT0@/' + page + '.md',
-      '@OUTPUT@.tmp',
-      '@OUTPUT@',
-    ],
-    input : nix3_cli_files,
-    output : page + '.1',
-    install : true,
-    install_dir : mandir / 'man1',
-  )
-endforeach
-
-nix_manpages = [
-  [ 'nix-env', 1 ],
-  [ 'nix-store', 1 ],
-  [ 'nix-build', 1 ],
-  [ 'nix-shell', 1 ],
-  [ 'nix-instantiate', 1 ],
-  [ 'nix-collect-garbage', 1 ],
-  [ 'nix-prefetch-url', 1 ],
-  [ 'nix-channel', 1 ],
-  [ 'nix-hash', 1 ],
-  [ 'nix-copy-closure', 1 ],
-  [ 'nix.conf', 5, nix_conf_file_md, nix_exp_feature_shortlist ],
-  [ 'nix-daemon', 8 ],
-  [ 'nix-profiles', 5, 'src/command-ref/files/profiles.md', nix_exp_feature_shortlist ],
-]
-
-foreach entry : nix_manpages
-  custom_target(
-    command : [
-      './render-manpage.sh',
-      entry[0],
-      entry[1].to_string(),
-      '@INPUT0@',
-      '@OUTPUT@.tmp',
-      '@OUTPUT@',
-      meson.current_build_dir(),
-    ],
-    input : [
-      entry.get(2, 'src/command-ref' / (entry[0] + '.md')),
-      entry.get(3, []),
-    ],
-    output : '@0@.@1@'.format(entry[0], entry[1]),
-    install : true,
-    install_dir : mandir / 'man@0@'.format(entry[1]),
-  )
-endforeach
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-set -euo pipefail
-
-infile="$1"
-outfile="$2"
-shift 2
-
-# set a search path for includes. the old makefile-based system splorked
-# everything into the source tree and was thus able to not have a search
-# path, but the meson system generates intermediate files into dedicated
-# directories separate from the source. we still retain the implicit old
-# behavior for now as the base search path, once meson is the default we
-# can revisit this and remove the implicit search path entry. it's fine.
-set -- "$(dirname "$infile")" "$@"
-
-# re-implement mdBook's include directive to make it usable for terminal output and for proper @docroot@ substitution
-(grep '{{#include' "$infile" || true) | while read -r line; do
-    found=false
-    include="$(printf "$line" | sed 's/{{#include \(.*\)}}/\1/')"
-    for path in "$@"; do
-        filename="$path/$include"
-        if [ -e "$filename" ]; then
-            found=true
-            matchline="$(printf "$line" | sed 's|/|\\/|g')"
-            sed -i "/$matchline/r $filename" "$outfile"
-            sed -i "s/$matchline//" "$outfile"
-            break
-        fi
-    done
-    $found || ( echo "#include-d file '$filename' does not exist." >&2; exit 1; )
-done
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-set -euo pipefail
-
-unescape_dashes=
-
-if [ "$1" = --unescape-dashes ]; then
-    unescape_dashes=yes
-    shift
-fi
-
-title="$1"
-section="$2"
-infile="$3"
-tmpfile="$4"
-outfile="$5"
-
-printf "Title: %s\n\n" "$title" > "$tmpfile"
-cat "$infile" >> "$tmpfile"
-"$(dirname "$0")"/process-includes.sh "$infile" "$tmpfile"
-lowdown -sT man --nroff-nolinks -M section="$section" "$tmpfile" -o "$outfile"
-if [ -n "$unescape_dashes" ]; then
-    # fix up `lowdown`'s automatic escaping of `--`
-    # https://github.com/kristapsdz/lowdown/blob/edca6ce6d5336efb147321a43c47a698de41bb7c/entity.c#L202
-    sed -i 's/\e\[u2013\]/--/' "$outfile"
-fi
-rm "$tmpfile"
@@ -1,15 +0,0 @@
---
-synopsis: Clang build timing analysis
-cls: 587
---
-
-We now have Clang build profiling available, which generates Chrome
-tracing files for each compilation unit. To enable it, run `meson configure
-build -Dprofile-build=enabled` then rerun the compilation.
-
-If you want to make the build go faster, do a clang build with meson, then run
-`maintainers/buildtime_report.sh build`, then contemplate how to improve the
-build time.
-
-You can also look at individual object files' traces in
-<https://ui.perfetto.dev>.
@@ -1,39 +0,0 @@
---
-synopsis: Concise error printing in `nix repl`
-prs: 9928
---
-
-Previously, if an element of a list or attribute set threw an error while
-evaluating, `nix repl` would print the entire error (including source location
-information) inline. This output was clumsy and difficult to parse:
-
-```
-nix-repl> { err = builtins.throw "uh oh!"; }
-{ err = «error:
-       … while calling the 'throw' builtin
-         at «string»:1:9:
-            1| { err = builtins.throw "uh oh!"; }
-             |         ^
-
-       error: uh oh!»; }
-```
-
-Now, only the error message is displayed, making the output much more readable.
-```
-nix-repl> { err = builtins.throw "uh oh!"; }
-{ err = «error: uh oh!»; }
-```
-
-However, if the whole expression being evaluated throws an error, source
-locations and (if applicable) a stack trace are printed, just like you'd expect:
-
-```
-nix-repl> builtins.throw "uh oh!"
-error:
-       … while calling the 'throw' builtin
-         at «string»:1:1:
-            1| builtins.throw "uh oh!"
-             | ^
-
-       error: uh oh!
-```
@@ -1,9 +0,0 @@
---
-synopsis: "`--debugger` can now access bindings from `let` expressions"
-prs: 9918
-issues: 8827
---
-
-Breakpoints and errors in the bindings of a `let` expression can now access
-those bindings in the debugger. Previously, only the body of `let` expressions
-could access those bindings.
@@ -1,9 +0,0 @@
---
-synopsis: Enter the `--debugger` when `builtins.trace` is called if `debugger-on-trace` is set
-prs: 9914
---
-
-If the `debugger-on-trace` option is set and `--debugger` is given,
-`builtins.trace` calls will behave similarly to `builtins.break` and will enter
-the debug REPL. This is useful for determining where warnings are being emitted
-from.
@@ -1,7 +0,0 @@
---
-synopsis: Stop vendoring toml11
-cls: 675
---
-
-We don't apply any patches to it, and vendoring it locks users into
-bugs (it hasn't been updated since its introduction in late 2021).
@@ -1,6 +0,0 @@
---
-synopsis: Fix handling of truncated `.drv` files.
-prs: 9673
---
-
-Previously a `.drv` that was truncated in the middle of a string would case nix to enter an infinite loop, eventually exhausting all memory and crashing.
@@ -1,22 +0,0 @@
---
-synopsis: Duplicate attribute reports are more accurate
-cls: 557
---
-
-Duplicate attribute errors are now more accurate, showing the path at which an error was detected rather than the full, possibly longer, path that caused the error.
-Error reports are now
-```ShellSession
-$ nix eval --expr '{ a.b = 1; a.b.c.d = 1; }'
-error: attribute 'a.b' already defined at «string»:1:3
-       at «string»:1:12:
-            1| { a.b = 1; a.b.c.d = 1;
-             |            ^
-```
-instead of
-```ShellSession
-$ nix eval --expr '{ a.b = 1; a.b.c.d = 1; }'
-error: attribute 'a.b.c.d' already defined at «string»:1:3
-       at «string»:1:12:
-            1| { a.b = 1; a.b.c.d = 1;
-             |            ^
-```
@@ -1,6 +0,0 @@
---
-synopsis: Disallow empty search regex in `nix search`
-prs: 9481
---
-
-[`nix search`](@docroot@/command-ref/new-cli/nix3-search.md) now requires a search regex to be passed. To show all packages, use `^`.
@@ -1,25 +0,0 @@
---
-synopsis: The `--debugger` will start more reliably in `let` expressions and function calls
-prs: 9917
-issues: 6649
---
-
-Previously, if you attempted to evaluate this file with the debugger:
-
-```nix
-let
-  a = builtins.trace "before inner break" (
-    builtins.break "hello"
-  );
-  b = builtins.trace "before outer break" (
-    builtins.break a
-  );
-in
-  b
-```
-
-Nix would correctly enter the debugger at `builtins.break a`, but if you asked
-it to `:continue`, it would skip over the `builtins.break "hello"` expression
-entirely.
-
-Now, Nix will correctly enter the debugger at both breakpoints.
@@ -1,7 +0,0 @@
---
-synopsis: Reduce eval memory usage and wall time
-prs: 9658
---
-
-Reduce the size of the `Env` struct used in the evaluator by a pointer, or 8 bytes on most modern machines.
-This reduces memory usage during eval by around 2% and wall time by around 3%.
@@ -1,12 +0,0 @@
---
-synopsis: Add new `eval-system` setting
-prs: 4093
---
-
-Add a new `eval-system` option.
-Unlike `system`, it just overrides the value of `builtins.currentSystem`.
-This is more useful than overriding `system`, because you can build these derivations on remote builders which can work on the given system.
-In contrast, `system` also effects scheduling which will cause Nix to build those derivations locally even if that doesn't make sense.
-
-`eval-system` only takes effect if it is non-empty.
-If empty (the default) `system` is used as before, so there is no breakage.
@@ -1,7 +0,0 @@
---
-synopsis: consistent order of lambda formals in printed expressions
-prs: 9874
---
-
-Always print lambda formals in lexicographic order rather than the internal, creation-time based symbol order.
-This makes printed formals independent of the context they appear in.
@@ -1,6 +0,0 @@
---
-synopsis: fix duplicate attribute error positions for `inherit`
-prs: 9874
---
-
-When an inherit caused a duplicate attribute error the position of the error was not reported correctly, placing the error with the inherit itself or at the start of the bindings block instead of the offending attribute name.
@@ -1,7 +0,0 @@
---
-synopsis: "`inherit (x) ...` evaluates `x` only once"
-prs: 9847
---
-
-`inherit (x) a b ...` now evaluates the expression `x` only once for all inherited attributes rather than once for each inherited attribute.
-This does not usually have a measurable impact, but side-effects (such as `builtins.trace`) would be duplicated and expensive expressions (such as derivations) could cause a measurable slowdown.
@@ -1,6 +0,0 @@
---
-synopsis: Fix `nix-env --query --drv-path --json`
-prs: 9257
---
-
-Fixed a bug where `nix-env --query` ignored `--drv-path` when `--json` was set.
@@ -1,33 +0,0 @@
---
-synopsis: "`nix flake check` logs the checks"
-issues: 8882
-prs: 8893
---
-
-`nix flake check` now logs the checks it runs and the derivations it evaluates:
-
-```
-$ nix flake check -v
-evaluating flake...
-checking flake output 'checks'...
-checking derivation 'checks.aarch64-darwin.ghciwatch-tests'...
-derivation evaluated to /nix/store/nh7dlvsrhds4cxl91mvgj4h5cbq6skmq-ghciwatch-test-0.3.0.drv
-checking derivation 'checks.aarch64-darwin.ghciwatch-clippy'...
-derivation evaluated to /nix/store/9cb5a6wmp6kf6hidqw9wphidvb8bshym-ghciwatch-clippy-0.3.0.drv
-checking derivation 'checks.aarch64-darwin.ghciwatch-doc'...
-derivation evaluated to /nix/store/8brdd3jbawfszpbs7vdpsrhy80as1il8-ghciwatch-doc-0.3.0.drv
-checking derivation 'checks.aarch64-darwin.ghciwatch-fmt'...
-derivation evaluated to /nix/store/wjhs0l1njl5pyji53xlmfjrlya0wmz8p-ghciwatch-fmt-0.3.0.drv
-checking derivation 'checks.aarch64-darwin.ghciwatch-audit'...
-derivation evaluated to /nix/store/z0mps8dyj2ds7c0fn0819y5h5611033z-ghciwatch-audit-0.3.0.drv
-checking flake output 'packages'...
-checking derivation 'packages.aarch64-darwin.default'...
-derivation evaluated to /nix/store/41abbdyglw5x9vcsvd89xan3ydjf8d7r-ghciwatch-0.3.0.drv
-checking flake output 'apps'...
-checking flake output 'devShells'...
-checking derivation 'devShells.aarch64-darwin.default'...
-derivation evaluated to /nix/store/bc935gz7dylzmcpdb5cczr8gngv8pmdb-nix-shell.drv
-running 5 flake checks...
-warning: The check omitted these incompatible systems: aarch64-linux, x86_64-darwin, x86_64-linux
-Use '--all-systems' to check all.
-```
@@ -1,17 +0,0 @@
---
-synopsis: "`Overhaul `nix flake update` and `nix flake lock` UX"
-prs: 8817
---
-
-The interface for creating and updating lock files has been overhauled:
-
- [`nix flake lock`](@docroot@/command-ref/new-cli/nix3-flake-lock.md) only creates lock files and adds missing inputs now.
-It will *never* update existing inputs.
-
- [`nix flake update`](@docroot@/command-ref/new-cli/nix3-flake-update.md) does the same, but *will* update inputs.
- Passing no arguments will update all inputs of the current flake, just like it already did.
- Passing input names as arguments will ensure only those are updated. This replaces the functionality of `nix flake lock --update-input`
- To operate on a flake outside the current directory, you must now pass `--flake path/to/flake`.
-
- The flake-specific flags `--recreate-lock-file` and `--update-input` have been removed from all commands operating on installables.
-They are superceded by `nix flake update`.
@@ -1,11 +0,0 @@
---
-synopsis: "`builtins.nixVersion` now returns a fixed value \"2.18.3-lix\""
-cls: 558
---
-
-`builtins.nixVersion` now returns a fixed value `"2.18.3-lix"`. This prevents
-feature detection assuming that features that exist in Nix post-Lix-branch-off
-might exist, even though the Lix version is greater than the Nix version.
-
-In the future, check for builtins for feature detection. If a feature cannot be
-detected by *those* means, please file a Lix bug.
@@ -1,24 +0,0 @@
---
-synopsis: Coercion errors include the failing value
-issues: 561
-prs: 9754
---
-
-The `error: cannot coerce a <TYPE> to a string` message now includes the value
-which caused the error.
-
-Before:
-
-```
-       error: cannot coerce a set to a string
-```
-
-After:
-
-```
-       error: cannot coerce a set to a string: { aesSupport = «thunk»;
-       avx2Support = «thunk»; avx512Support = «thunk»; avxSupport = «thunk»;
-       canExecute = «thunk»; config = «thunk»; darwinArch = «thunk»; darwinMinVersion
-       = «thunk»; darwinMinVersionVariable = «thunk»; darwinPlatform = «thunk»; «84
-       attributes elided»}
-```
@@ -1,23 +0,0 @@
---
-synopsis: Type errors include the failing value
-issues: 561
-prs: 9753
---
-
-In errors like `value is an integer while a list was expected`, the message now
-includes the failing value.
-
-Before:
-
-```
-       error: value is a set while a string was expected
-```
-
-After:
-
-```
-       error: expected a string but found a set: { ghc810 = «thunk»;
-       ghc8102Binary = «thunk»; ghc8107 = «thunk»; ghc8107Binary = «thunk»;
-       ghc865Binary = «thunk»; ghc90 = «thunk»; ghc902 = «thunk»; ghc92 = «thunk»;
-       ghc924Binary = «thunk»; ghc925 = «thunk»;  «17 attributes elided»}
-```
@@ -1,37 +0,0 @@
---
-synopsis: "Visual clutter in `--debugger` is reduced"
-prs: 9919
---
-
-Before:
-```
-info: breakpoint reached
-
-
-Starting REPL to allow you to inspect the current state of the evaluator.
-
-Welcome to Nix 2.20.0pre20231222_dirty. Type :? for help.
-
-nix-repl> :continue
-error: uh oh
-
-
-Starting REPL to allow you to inspect the current state of the evaluator.
-
-Welcome to Nix 2.20.0pre20231222_dirty. Type :? for help.
-
-nix-repl>
-```
-
-After:
-
-```
-info: breakpoint reached
-
-Nix 2.20.0pre20231222_dirty debugger
-Type :? for help.
-nix-repl> :continue
-error: uh oh
-
-nix-repl>
-```
@@ -1,14 +0,0 @@
---
-synopsis: reintroduce shortened `-E` form for `--expr` to new CLI
-cls: 605
---
-
-In the past, it was possible to supply a shorter `-E` flag instead of fully
-specifying `--expr` every time you wished to provide an expression that would
-be evaluated to produce the given command's input. This was retained for the
-`--file` flag when the new CLI utilities were written with `-f`, but `-E` was
-dropped.
-
-We now restore the `-E` short form for better UX. This is most useful for
-`nix eval` but most any command that takes an Installable argument should benefit
-from it as well.
@@ -1,23 +0,0 @@
---
-synopsis: "In the debugger, `while evaluating the attribute` errors now include position information"
-prs: 9915
---
-
-Before:
-
-```
-0: while evaluating the attribute 'python311.pythonForBuild.pkgs'
-0x600001522598
-```
-
-After:
-
-```
-0: while evaluating the attribute 'python311.pythonForBuild.pkgs'
-/nix/store/hg65h51xnp74ikahns9hyf3py5mlbbqq-source/overrides/default.nix:132:27
-
-   131|
-   132|       bootstrappingBase = pkgs.${self.python.pythonAttr}.pythonForBuild.pkgs;
-      |                           ^
-   133|     in
-```
@@ -1,42 +0,0 @@
---
-synopsis: Source locations are printed more consistently in errors
-issues: 561
-prs: 9555
---
-
-Source location information is now included in error messages more
-consistently. Given this code:
-
-```nix
-let
-  attr = {foo = "bar";};
-  key = {};
-in
-  attr.${key}
-```
-
-Previously, Nix would show this unhelpful message when attempting to evaluate
-it:
-
-```
-error:
-       … while evaluating an attribute name
-
-       error: value is a set while a string was expected
-```
-
-Now, the error message displays where the problematic value was found:
-
-```
-error:
-       … while evaluating an attribute name
-
-         at bad.nix:4:11:
-
-            3|   key = {};
-            4| in attr.${key}
-             |           ^
-            5|
-
-       error: expected a string but found a set: { }
-```
@@ -1,32 +0,0 @@
---
-synopsis: Some stack overflow segfaults are fixed
-issues: 9616
-prs: 9617
---
-
-The number of nested function calls has been restricted, to detect and report
-infinite function call recursions. The default maximum call depth is 10,000 and
-can be set with [the `max-call-depth`
-option](@docroot@/command-ref/conf-file.md#conf-max-call-depth).
-
-This fixes segfaults or the following unhelpful error message in many cases:
-
-    error: stack overflow (possible infinite recursion)
-
-Before:
-
-```
-$ nix-instantiate --eval --expr '(x: x x) (x: x x)'
-Segmentation fault: 11
-```
-
-After:
-
-```
-$ nix-instantiate --eval --expr '(x: x x) (x: x x)'
-error: stack overflow
-
-       at «string»:1:14:
-            1| (x: x x) (x: x x)
-             |              ^
-```
@@ -1,8 +0,0 @@
---
-synopsis: Upstart scripts removed
-cls: 574
---
-
-Upstart scripts have been removed from Lix, since Upstart is obsolete and has
-not been shipped by any major distributions for many years. If these are
-necessary to your use case, please back port them to your packaging.
@@ -1,31 +0,0 @@
---
-synopsis: Better error reporting for `with` expressions
-prs: 9658
---
-
-`with` expressions using non-attrset values to resolve variables are now reported with proper positions.
-
-Previously an incorrect `with` expression would report no position at all, making it hard to determine where the error originated:
-
-```
-nix-repl> with 1; a
-error:
-       … <borked>
-
-         at «none»:0: (source not available)
-
-       error: value is an integer while a set was expected
-```
-
-Now position information is preserved and reported as with most other errors:
-
-```
-nix-repl> with 1; a
-error:
-       … while evaluating the first subexpression of a with expression
-         at «string»:1:1:
-            1| with 1; a
-             | ^
-
-       error: expected a set but found an integer: 1
-```
@@ -109,7 +109,6 @@
  - [CLI guideline](contributing/cli-guideline.md)
  - [C++ style guide](contributing/cxx.md)
 - [Release Notes](release-notes/release-notes.md)
-{{#include ./SUMMARY-rl-next.md}}
  - [Release 2.18 (2023-09-20)](release-notes/rl-2.18.md)
  - [Release 2.17 (2023-07-24)](release-notes/rl-2.17.md)
  - [Release 2.16 (2023-05-31)](release-notes/rl-2.16.md)
@@ -27,3 +27,4 @@
 /package-management/channels* /command-ref/nix-channel 301!

 /package-management/s3-substituter* /command-ref/new-cli/nix3-help-stores#s3-binary-cache-store 301!
+
@@ -102,13 +102,13 @@ In particular, notice the
 has copied the build results to that directory where you can examine it.

 > []{#check-dirs-are-unregistered} **Note**
->
+> 
 > Check paths are not protected against garbage collection, and this
 > path will be deleted on the next garbage collection.
->
+> 
 > The path is guaranteed to be alive for the duration of
 > the `diff-hook`'s execution, but may be deleted any time after.
->
+> 
 > If the comparison is performed as part of automated tooling, please
 > use the diff-hook or author your tooling to handle the case where the
 > build was not deterministic and also a check path does not exist.
@@ -117,7 +117,7 @@ has copied the build results to that directory where you can examine it.
 already. If the derivation has not been built Nix will fail with the
 error:

-    error: some outputs of '/nix/store/hzi1h60z2qf0nb85iwnpvrai3j2w7rr6-unstable.drv'
+    error: some outputs of '/nix/store/hzi1h60z2qf0nb85iwnpvrai3j2w7rr6-unstable.drv' 
    are not valid, so checking is not possible

 Run the build without `--check`, and then try with `--check` again.
@@ -112,3 +112,4 @@ Build inputs used as instructions to a build task are marked accordingly:
 |                                                                    |
 +--------------------------------------------------------------------+
 ```
+
@@ -67,3 +67,4 @@ Configuration options can be set on the command line, overriding the values set
 The `extra-` prefix is supported for settings that take a list of items (e.g. `--extra-trusted users alice` or `--option extra-trusted-users alice`).

 # Available settings
+
@@ -184,3 +184,4 @@ channel:
 ```console
 $ nix-env --file https://github.com/NixOS/nixpkgs/archive/nixos-14.12.tar.gz --install --attr firefox
 ```
+
@@ -30,3 +30,4 @@ $ nix-env --list-generations
  97   2004-02-06 16:22:45
  98   2004-02-06 16:24:33   (current)
 ```
+
@@ -212,3 +212,4 @@ To show all packages in the latest revision of the Nixpkgs repository:
 ```console
 $ nix-env --file https://github.com/NixOS/nixpkgs/archive/master.tar.gz --query --available
 ```
+
@@ -79,3 +79,4 @@ To make files from `binutils` take precedence over files from `gcc`:
 $ nix-env --set-flag priority 5 binutils
 $ nix-env --set-flag priority 10 gcc
 ```
+
@@ -27,3 +27,4 @@ contain just Firefox:
 ```console
 $ nix-env --profile /nix/var/nix/profiles/browser --set firefox
 ```
+
@@ -30,3 +30,4 @@ Switching will fail if the specified generation does not exist.
 $ nix-env --switch-generation 42
 switching from generation 50 to 42
 ```
+
@@ -138,3 +138,4 @@ This is illustrated by the following examples:
    2.3a < 2.3c
    2.3pre1 < 2.3c
    2.3pre1 < 2.3q
+
@@ -35,51 +35,13 @@ standard input.

  - `--parse`\
    Just parse the input files, and print their abstract syntax trees on
-    standard output as a Nix expression.
+    standard output in ATerm format.

  - `--eval`\
    Just parse and evaluate the input files, and print the resulting
    values on standard output. No instantiation of store derivations
    takes place.

-    > **Warning**
-    >
-    > This option produces output which can be parsed as a Nix expression which
-    > will produce a different result than the input expression when evaluated.
-    > For example, these two Nix expressions print the same result despite
-    > having different meaning:
-    >
-    > ```console
-    > $ nix-instantiate --eval --expr '{ a = {}; }'
-    > { a = <CODE>; }
-    > $ nix-instantiate --eval --expr '{ a = <CODE>; }'
-    > { a = <CODE>; }
-    > ```
-    >
-    > For human-readable output, `nix eval` (experimental) is more informative:
-    >
-    > ```console
-    > $ nix-instantiate --eval --expr 'a: a'
-    > <LAMBDA>
-    > $ nix eval --expr 'a: a'
-    > «lambda @ «string»:1:1»
-    > ```
-    >
-    > For machine-readable output, the `--xml` option produces unambiguous
-    > output:
-    >
-    > ```console
-    > $ nix-instantiate --eval --xml --expr '{ foo = <CODE>; }'
-    > <?xml version='1.0' encoding='utf-8'?>
-    > <expr>
-    >   <attrs>
-    >     <attr column="3" line="1" name="foo">
-    >       <unevaluated />
-    >     </attr>
-    >   </attrs>
-    > </expr>
-    > ```
-
  - `--find-file`\
    Look up the given files in Nix’s search path (as specified by the
    `NIX_PATH` environment variable). If found, print the corresponding
@@ -99,11 +61,11 @@ standard input.

  - `--json`\
    When used with `--eval`, print the resulting value as an JSON
-    representation of the abstract syntax tree rather than as a Nix expression.
+    representation of the abstract syntax tree rather than as an ATerm.

  - `--xml`\
    When used with `--eval`, print the resulting value as an XML
-    representation of the abstract syntax tree rather than as a Nix expression.
+    representation of the abstract syntax tree rather than as an ATerm.
    The schema is the same as that used by the [`toXML`
    built-in](../language/builtins.md).

@@ -171,24 +133,28 @@ $ nix-instantiate --eval --xml --expr '1 + 2'
 The difference between non-strict and strict evaluation:

 ```console
-$ nix-instantiate --eval --xml --expr '{ x = {}; }'
-<?xml version='1.0' encoding='utf-8'?>
-<expr>
-  <attrs>
-    <attr column="3" line="1" name="x">
-      <unevaluated />
-    </attr>
-  </attrs>
-</expr>
+$ nix-instantiate --eval --xml --expr 'rec { x = "foo"; y = x; }'
+...
+  <attr name="x">
+    <string value="foo" />
+  </attr>
+  <attr name="y">
+    <unevaluated />
+  </attr>
+...
+```

-$ nix-instantiate --eval --xml --strict --expr '{ x = {}; }'
-<?xml version='1.0' encoding='utf-8'?>
-<expr>
-  <attrs>
-    <attr column="3" line="1" name="x">
-      <attrs>
-      </attrs>
-    </attr>
-  </attrs>
-</expr>
+Note that `y` is left unevaluated (the XML representation doesn’t
+attempt to show non-normal forms).
+
+```console
+$ nix-instantiate --eval --xml --strict --expr 'rec { x = "foo"; y = x; }'
+...
+  <attr name="x">
+    <string value="foo" />
+  </attr>
+  <attr name="y">
+    <string value="foo" />
+  </attr>
+...
 ```
@@ -235,14 +235,14 @@ package like Terraform:

 ```bash
 #! /usr/bin/env nix-shell
-#! nix-shell -i bash --packages 'terraform.withPlugins (plugins: [ plugins.openstack ])'
+#! nix-shell -i bash --packages "terraform.withPlugins (plugins: [ plugins.openstack ])"

 terraform apply
 ```

 > **Note**
 >
-> You must use single or double quotes (`'`, `"`) when passing a simple Nix expression
+> You must use double quotes (`"`) when passing a simple Nix expression
 > in a nix-shell shebang.

 Finally, using the merging of multiple nix-shell shebangs the following
@@ -251,7 +251,7 @@ branch):

 ```haskell
 #! /usr/bin/env nix-shell
-#! nix-shell -i runghc --packages 'haskellPackages.ghcWithPackages (ps: [ps.download-curl ps.tagsoup])'
+#! nix-shell -i runghc --packages "haskellPackages.ghcWithPackages (ps: [ps.download-curl ps.tagsoup])"
 #! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-20.03.tar.gz

 import Network.Curl.Download
@@ -32,3 +32,4 @@ This operation has the following options:
 $ nix-store --add-fixed sha256 ./hello-2.10.tar.gz
 /nix/store/3x7dwzq014bblazs7kq20p9hyzz0qh8g-hello-2.10.tar.gz
 ```
+
@@ -69,3 +69,4 @@ To delete at least 100 MiBs of unreachable paths:
 ```console
 $ nix-store --gc --max-freed $((100 * 1024 * 1024))
 ```
+
@@ -33,3 +33,4 @@ The following options are allowed for all `nix-store` operations, but may not al
  If there are multiple results, then multiple symlinks will be
  created by sequentially numbering symlinks beyond the first one
  (e.g., `foo`, `foo-2`, `foo-3`, and so on).
+
@@ -37,3 +37,4 @@ hashing files in `/nix/store/qhqx7l2f1kmwihc9bnxs7rc159hsxnf3-gcc-4.1.1'
 541838819 bytes (516.74 MiB) freed by hard-linking 54143 files;
 there are 114486 files with equal contents out of 215894 files in total
 ```
+
@@ -28,3 +28,4 @@ export stdenv; stdenv='/nix/store/7c8asx3yfrg5dg1gzhzyq2236zfgibnn-stdenv'
 export system; system='x86_64-linux'
 export _args; _args='-e /nix/store/9krlzvny65gdc8s7kpb6lkx8cd02c25c-default-builder.sh'
 ```
+
@@ -225,3 +225,4 @@ $ nix-store --query --roots $(which svn)
 /nix/var/nix/profiles/default-82-link
 /home/eelco/.local/state/nix/profiles/profile-97-link
 ```
+
@@ -35,3 +35,4 @@ ktorrent-2.2.1/
 ktorrent-2.2.1/NEWS
 ...
 ```
+
@@ -32,3 +32,4 @@ $ nix-store --repair-path /nix/store/dj7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13
 fetching path `/nix/store/d7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13'...
 …
 ```
+
@@ -35,3 +35,4 @@ $ cat <<EOF >>/root/.ssh/authorized_keys
 command="nice -n20 nix-store --serve --write" ssh-rsa AAAAB3NzaC1yc2EAAAA...
 EOF
 ```
+
@@ -26,3 +26,4 @@ To verify the integrity of the `svn` command and all its dependencies:
 ```console
 $ nix-store --verify-path $(nix-store --query --requisites $(which svn))
 ```
+
@@ -37,7 +37,7 @@ Most Nix commands accept the following command-line options:
    Print even more informational messages.

  - `4` “Debug”
-
+   
    Print debug information.

  - `5` “Vomit”
@@ -203,7 +203,3 @@ Most Nix commands accept the following command-line options:
  Fix corrupted or missing store paths by redownloading or rebuilding them.
  Note that this is slow because it requires computing a cryptographic hash of the contents of every path in the closure of the build.
  Also note the warning under `nix-store --repair-path`.
-
-> **Note**
->
-> See [`man nix.conf`](@docroot@/command-ref/conf-file.md#command-line-flags) for overriding configuration settings with command line flags.
@@ -31,7 +31,7 @@ This shell also adds `./outputs/bin/nix` to your `$PATH` so you can run `nix` im
 To get a shell with one of the other [supported compilation environments](#compilation-environments):

 ```console
-$ nix develop .#native-clangStdenvPackages
+$ nix develop .#native-clang11StdenvPackages
 ```

 > **Note**
@@ -42,8 +42,8 @@ $ nix develop .#native-clangStdenvPackages
 To build Nix itself in this shell:

 ```console
-[nix-shell]$ autoreconfPhase
-[nix-shell]$ configurePhase
+[nix-shell]$ ./bootstrap.sh
+[nix-shell]$ ./configure $configureFlags --prefix=$(pwd)/outputs/out
 [nix-shell]$ make -j $NIX_BUILD_CORES
 ```

@@ -75,7 +75,7 @@ $ nix-shell
 To get a shell with one of the other [supported compilation environments](#compilation-environments):

 ```console
-$ nix-shell --attr devShells.x86_64-linux.native-clangStdenvPackages
+$ nix-shell --attr devShells.x86_64-linux.native-clang11StdenvPackages
 ```

 > **Note**
@@ -86,7 +86,7 @@ $ nix-shell --attr devShells.x86_64-linux.native-clangStdenvPackages
 To build Nix itself in this shell:

 ```console
-[nix-shell]$ autoreconfPhase
+[nix-shell]$ ./bootstrap.sh
 [nix-shell]$ ./configure $configureFlags --prefix=$(pwd)/outputs/out
 [nix-shell]$ make -j $NIX_BUILD_CORES
 ```
@@ -146,31 +146,6 @@ $ nix build .#packages.aarch64-linux.default
 Cross-compiled builds are available for ARMv6 (`armv6l-linux`) and ARMv7 (`armv7l-linux`).
 Add more [system types](#system-type) to `crossSystems` in `flake.nix` to bootstrap Nix on unsupported platforms.

-### Building for multiple platforms at once
-
-It is useful to perform multiple cross and native builds on the same source tree,
-for example to ensure that better support for one platform doesn't break the build for another.
-In order to facilitate this, Nix has some support for being built out of tree – that is, placing build artefacts in a different directory than the source code:
-
-1. Create a directory for the build, e.g.
-
-   ```bash
-   mkdir build
-   ```
-
-2. Run the configure script from that directory, e.g.
-
-   ```bash
-   cd build
-   ../configure <configure flags>
-   ```
-
-3. Run make from the source directory, but with the build directory specified, e.g.
-
-   ```bash
-   make builddir=build <make flags>
-   ```
-
 ## System type

 Nix uses a string with he following format to identify the *system type* or *platform* it runs on:
@@ -310,37 +285,3 @@ can build it yourself:

 Metrics about the change in line/function coverage over time are also
 [available](https://hydra.nixos.org/job/nix/master/coverage#tabs-charts).
-
-## Add a release note
-
-`doc/manual/rl-next` contains release notes entries for all unreleased changes.
-
-User-visible changes should come with a release note.
-
-### Add an entry
-
-Here's what a complete entry looks like. The file name is not incorporated in the document.
-
-```
---
-synopsis: Basically a title
-issues: 1234
-prs: 1238
---
-
-Here's one or more paragraphs that describe the change.
-
- It's markdown
- Add references to the manual using @docroot@
-```
-
-Significant changes should add the following header, which moves them to the top.
-
-```
-significance: significant
-```
-
-### Build process
-
-Releases have a precomputed `rl-MAJOR.MINOR.md`, and no `rl-next.md`.
-Set `buildUnreleasedNotes = true;` in `flake.nix` to build the release notes on the fly.
@@ -2,48 +2,10 @@

 ## Unit-tests

-The unit tests are defined using the [googletest] and [rapidcheck] frameworks.
-
-[googletest]: https://google.github.io/googletest/
-[rapidcheck]: https://github.com/emil-e/rapidcheck
-
-### Source and header layout
-
-> An example of some files, demonstrating much of what is described below
->
-> ```
-> src
-> ├── libexpr
-> │   ├── value/context.hh
-> │   ├── value/context.cc
-> │   │
-> │   …
->     └── tests
-> │       ├── value/context.hh
-> │       ├── value/context.cc
-> │       │
-> │       …
-> │
-> ├── unit-test-data
-> │   ├── libstore
-> │   │   ├── worker-protocol/content-address.bin
-> │   │   …
-> │   …
-> …
-> ```
-
-The unit tests for each Nix library (`libnixexpr`, `libnixstore`, etc..) live inside a directory `src/${library_shortname}/tests` within the directory for the library (`src/${library_shortname}`).
-
-The data is in `unit-test-data`, with one subdir per library, with the same name as where the code goes.
-For example, `libnixstore` code is in `src/libstore`, and its test data is in `unit-test-data/libstore`.
-The path to the `unit-test-data` directory is passed to the unit test executable with the environment variable `_NIX_TEST_UNIT_DATA`.
-
-> **Note**
-> Due to the way googletest works, downstream unit test executables will actually include and re-run upstream library tests.
-> Therefore it is important that the same value for `_NIX_TEST_UNIT_DATA` be used with the tests for each library.
-> That is why we have the test data nested within a single `unit-test-data` directory.
-
-### Running tests
+The unit-tests for each Nix library (`libexpr`, `libstore`, etc..) are defined
+under `tests/unit/{library_name}/tests` using the
+[googletest](https://google.github.io/googletest/) and
+[rapidcheck](https://github.com/emil-e/rapidcheck) frameworks.

 You can run the whole testsuite with `make check`, or the tests for a specific component with `make libfoo-tests_RUN`.
 Finer-grained filtering is also possible using the [--gtest_filter](https://google.github.io/googletest/advanced.html#running-a-subset-of-the-tests) command-line option, or the `GTEST_FILTER` environment variable.
@@ -60,24 +22,6 @@ It is important that these testing libraries don't contain any actual tests them
 On some platforms they would be run as part of every test executable that uses them, which is redundant.
 On other platforms they wouldn't be run at all.

-### Characterization testing
-
-See [below](#characterization-testing-1) for a broader discussion of characterization testing.
-
-Like with the functional characterization, `_NIX_TEST_ACCEPT=1` is also used.
-For example:
-```shell-session
-$ _NIX_TEST_ACCEPT=1 make libstore-tests-exe_RUN
-...
-[  SKIPPED ] WorkerProtoTest.string_read
-[  SKIPPED ] WorkerProtoTest.string_write
-[  SKIPPED ] WorkerProtoTest.storePath_read
-[  SKIPPED ] WorkerProtoTest.storePath_write
-...
-```
-will regenerate the "golden master" expected result for the `libnixstore` characterization tests.
-The characterization tests will mark themselves "skipped" since they regenerated the expected result instead of actually testing anything.
-
 ## Functional tests

 The functional tests reside under the `tests/functional` directory and are listed in `tests/functional/local.mk`.
@@ -289,3 +233,4 @@ search/replaced in it for each new build.
 The installer now supports a `--tarball-url-prefix` flag which _may_ have
 solved this need?
 -->
+
@@ -3,7 +3,7 @@
 After cloning Nix's Git repository, issue the following commands:

 ```console
-$ autoreconf -vfi
+$ ./bootstrap.sh
 $ ./configure options...
 $ make
 $ make install
@@ -21,7 +21,7 @@ Nix keeps its *store* (the place where packages are stored) in
 `--with-store-dir=path`.

 > **Warning**
->
+> 
 > It is best *not* to change the Nix store from its default, since doing
 > so makes it impossible to use pre-built binaries from the standard
 > Nixpkgs channels — that is, all packages will need to be built from
@@ -14,7 +14,7 @@ builds) are forwarded to a *Nix daemon* running under the owner of the
 Nix store/database that performs the operation.

 > **Note**
->
+> 
 > Multi-user mode has one important limitation: only root and a set of
 > trusted users specified in `nix.conf` can specify arbitrary binary
 > caches. So while unprivileged users may install packages from
@@ -145,3 +145,4 @@ which you may remove.
 > complete. macOS (Catalina+) directly controls root directories and its
 > read-only root will prevent you from manually deleting the empty `/nix`
 > mountpoint.
+
@@ -261,9 +261,6 @@ 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 attibute by enabling the
-    `always-allow-substitutes` configuration option in Nix.
-
    > **Note**
    >
    > You need to have a builder configured which satisfies the
@@ -274,21 +271,18 @@ Derivations can declare some infrequently used optional attributes.

  - [`__structuredAttrs`]{#adv-attr-structuredAttrs}\
    If the special attribute `__structuredAttrs` is set to `true`, the other derivation
-    attributes are serialised into a file in JSON format. The environment variable
-    `NIX_ATTRS_JSON_FILE` points to the exact location of that file both in a build
-    and a [`nix-shell`](../command-ref/nix-shell.md). This obviates the need for
-    [`passAsFile`](#adv-attr-passAsFile) since JSON files have no size restrictions,
-    unlike process environments.
+    attributes are serialised in JSON format and made available to the
+    builder via the file `.attrs.json` in the builder’s temporary
+    directory. This obviates the need for [`passAsFile`](#adv-attr-passAsFile) since JSON files
+    have no size restrictions, unlike process environments.

    It also makes it possible to tweak derivation settings in a structured way; see
    [`outputChecks`](#adv-attr-outputChecks) for example.

    As a convenience to Bash builders,
-    Nix writes a script that initialises shell variables
-    corresponding to all attributes that are representable in Bash. The
-    environment variable `NIX_ATTRS_SH_FILE` points to the exact
-    location of the script, both in a build and a
-    [`nix-shell`](../command-ref/nix-shell.md). This includes non-nested
+    Nix writes a script named `.attrs.sh` to the builder’s directory
+    that initialises shell variables corresponding to all attributes
+    that are representable in Bash. This includes non-nested
    (associative) arrays. For example, the attribute `hardening.format = true`
    ends up as the Bash associative array element `${hardening[format]}`.

@@ -146,65 +146,65 @@ three kinds of patterns:

  - If a pattern is a single identifier, then the function matches any
    argument. Example:
-
+    
    ```nix
    let negate = x: !x;
        concat = x: y: x + y;
    in if negate true then concat "foo" "bar" else ""
    ```
-
+    
    Note that `concat` is a function that takes one argument and returns
    a function that takes another argument. This allows partial
    parameterisation (i.e., only filling some of the arguments of a
    function); e.g.,
-
+    
    ```nix
    map (concat "foo") [ "bar" "bla" "abc" ]
    ```
-
+    
    evaluates to `[ "foobar" "foobla" "fooabc" ]`.

  - A *set pattern* of the form `{ name1, name2, …, nameN }` matches a
    set containing the listed attributes, and binds the values of those
    attributes to variables in the function body. For example, the
    function
-
+    
    ```nix
    { x, y, z }: z + y + x
    ```
-
+    
    can only be called with a set containing exactly the attributes `x`,
    `y` and `z`. No other attributes are allowed. If you want to allow
    additional arguments, you can use an ellipsis (`...`):
-
+    
    ```nix
    { x, y, z, ... }: z + y + x
    ```
-
+    
    This works on any set that contains at least the three named
    attributes.
-
+    
    It is possible to provide *default values* for attributes, in
    which case they are allowed to be missing. A default value is
    specified by writing `name ?  e`, where *e* is an arbitrary
    expression. For example,
-
+    
    ```nix
    { x, y ? "foo", z ? "bar" }: z + y + x
    ```
-
+    
    specifies a function that only requires an attribute named `x`, but
    optionally accepts `y` and `z`.

  - An `@`-pattern provides a means of referring to the whole value
    being matched:
-
+    
    ```nix
    args@{ x, y, z, ... }: z + y + x + args.a
    ```
-
+    
    but can also be written as:
-
+    
    ```nix
    { x, y, z, ... } @ args: z + y + x + args.a
    ```
@@ -24,22 +24,22 @@ the attributes of which specify the inputs of the build.

  - Every attribute is passed as an environment variable to the builder.
    Attribute values are translated to environment variables as follows:
-
+    
      - Strings and numbers are just passed verbatim.
-
+    
      - A *path* (e.g., `../foo/sources.tar`) causes the referenced file
        to be copied to the store; its location in the store is put in
        the environment variable. The idea is that all sources should
        reside in the Nix store, since all inputs to a derivation should
        reside in the Nix store.
-
+    
      - A *derivation* causes that derivation to be built prior to the
        present derivation; its default output path is put in the
        environment variable.
-
+    
      - Lists of the previous types are also allowed. They are simply
        concatenated, separated by spaces.
-
+    
      - `true` is passed as the string `1`, `false` and `null` are
        passed as an empty string.

@@ -56,36 +56,36 @@ the attributes of which specify the inputs of the build.
    library doesn’t need the header files and documentation at runtime,
    and it doesn’t need the documentation at build time. Thus, the
    library package could specify:
-
+    
    ```nix
    outputs = [ "lib" "headers" "doc" ];
    ```
-
+    
    This will cause Nix to pass environment variables `lib`, `headers`
    and `doc` to the builder containing the intended store paths of each
    output. The builder would typically do something like
-
+    
    ```bash
    ./configure \
      --libdir=$lib/lib \
      --includedir=$headers/include \
      --docdir=$doc/share/doc
    ```
-
+    
    for an Autoconf-style package. You can refer to each output of a
    derivation by selecting it as an attribute, e.g.
-
+    
    ```nix
    buildInputs = [ pkg.lib pkg.headers ];
    ```
-
+    
    The first element of `outputs` determines the *default output*.
    Thus, you could also write
-
+    
    ```nix
    buildInputs = [ pkg pkg.headers ];
    ```
-
+    
    since `pkg` is equivalent to `pkg.lib`.

 The function `mkDerivation` in the Nixpkgs standard environment is a
@@ -103,32 +103,27 @@ The builder is executed as follows:
    specified above.

  - In addition, the following variables are set:
-
+    
      - `NIX_BUILD_TOP` contains the path of the temporary directory for
        this build.
-
+    
      - Also, `TMPDIR`, `TEMPDIR`, `TMP`, `TEMP` are set to point to the
        temporary directory. This is to prevent the builder from
        accidentally writing temporary files anywhere else. Doing so
        might cause interference by other processes.
-
+    
      - `PATH` is set to `/path-not-set` to prevent shells from
        initialising it to their built-in default value.
-
+    
      - `HOME` is set to `/homeless-shelter` to prevent programs from
        using `/etc/passwd` or the like to find the user's home
        directory, which could cause impurity. Usually, when `HOME` is
        set, it is used as the location of the home directory, even if
        it points to a non-existent path.
-
+    
      - `NIX_STORE` is set to the path of the top-level Nix store
        directory (typically, `/nix/store`).
-
-      - `NIX_ATTRS_JSON_FILE` & `NIX_ATTRS_SH_FILE` if `__structuredAttrs`
-        is set to `true` for the dervation. A detailed explanation of this
-        behavior can be found in the
-        [section about structured attrs](./advanced-attributes.md#adv-attr-structuredAttrs).
-
+    
      - For each output declared in `outputs`, the corresponding
        environment variable is set to point to the intended path in the
        Nix store for that output. Each output path is a concatenation
@@ -161,3 +161,4 @@ All comparison operators are implemented in terms of `<`, and the following equi
 Equivalent to `!`*b1* `||` *b2*.

 [Logical implication]: #logical-implication
+
@@ -37,7 +37,7 @@ $ nix-channel --update
 ```

 > **Note**
->
+> 
 > On NixOS, you’re automatically subscribed to a NixOS channel
 > corresponding to your NixOS major release (e.g.
 > <http://nixos.org/channels/nixos-21.11>). A NixOS channel is identical
@@ -120,7 +120,7 @@ will install the package called `subversion` from `nixpkgs` channel (which is, o
 [Subversion version management system](http://subversion.tigris.org/)).

 > **Note**
->
+> 
 > When you ask Nix to install a package, it will first try to get it in
 > pre-compiled form from a *binary cache*. By default, Nix will use the
 > binary cache <https://cache.nixos.org>; it contains binaries for most
@@ -16,7 +16,7 @@ it will fall back to using the binary cache substituter, and then to
 building from source.

 > **Note**
->
+> 
 > The SSH substituter currently does not allow you to enter an SSH
 > passphrase interactively. Therefore, you should use `ssh-add` to load
 > the decrypted private key into `ssh-agent`.
@@ -1,67 +1,67 @@
 # Release 0.10 (2006-10-06)

 > **Note**
->
+> 
 > This version of Nix uses Berkeley DB 4.4 instead of 4.3. The database
 > is upgraded automatically, but you should be careful not to use old
 > versions of Nix that still use Berkeley DB 4.3. In particular, if you
 > use a Nix installed through Nix, you should run
->
+> 
 >     $ nix-store --clear-substitutes
->
+> 
 > first.

 > **Warning**
->
+> 
 > Also, the database schema has changed slighted to fix a performance
 > issue (see below). When you run any Nix 0.10 command for the first
 > time, the database will be upgraded automatically. This is
 > irreversible.

  - `nix-env` usability improvements:
-
+    
      - An option `--compare-versions` (or `-c`) has been added to
        `nix-env
                                                        --query` to allow you to compare installed versions of packages
        to available versions, or vice versa. An easy way to see if you
        are up to date with what’s in your subscribed channels is
        `nix-env -qc \*`.
-
+    
      - `nix-env --query` now takes as arguments a list of package names
        about which to show information, just like `--install`, etc.:
        for example, `nix-env -q gcc`. Note that to show all
        derivations, you need to specify `\*`.
-
+    
      - `nix-env -i
                                                        pkgname` will now install the highest available version of
        *pkgname*, rather than installing all available versions (which
        would probably give collisions) (`NIX-31`).
-
+    
      - `nix-env (-i|-u) --dry-run` now shows exactly which missing
        paths will be built or substituted.
-
+    
      - `nix-env -qa --description` shows human-readable descriptions of
        packages, provided that they have a `meta.description` attribute
        (which most packages in Nixpkgs don’t have yet).

  - New language features:
-
+    
      - Reference scanning (which happens after each build) is much
        faster and takes a constant amount of memory.
-
+    
      - String interpolation. Expressions like
-
+        
            "--with-freetype2-library=" + freetype + "/lib"
-
+        
        can now be written as
-
+        
            "--with-freetype2-library=${freetype}/lib"
-
+        
        You can write arbitrary expressions within `${...}`, not just
        identifiers.
-
+    
      - Multi-line string literals.
-
+    
      - String concatenations can now involve derivations, as in the
        example `"--with-freetype2-library="
                                                        + freetype + "/lib"`. This was not previously possible because
@@ -69,17 +69,17 @@
        dependent on `freetype`. The evaluator now properly propagates
        this information. Consequently, the subpath operator (`~`) has
        been deprecated.
-
+    
      - Default values of function arguments can now refer to other
        function arguments; that is, all arguments are in scope in the
        default values (`NIX-45`).
-
+    
      - Lots of new built-in primitives, such as functions for list
        manipulation and integer arithmetic. See the manual for a
        complete list. All primops are now available in the set
        `builtins`, allowing one to test for the availability of primop
        in a backwards-compatible way.
-
+    
      - Real let-expressions: `let x = ...;
                                                        ... z = ...; in ...`.

@@ -89,15 +89,15 @@
    your machine and you want to copy it somewhere else.

  - XML support:
-
+    
      - `nix-env -q --xml` prints the installed or available packages in
        an XML representation for easy processing by other tools.
-
+    
      - `nix-instantiate --eval-only
                                                        --xml` prints an XML representation of the resulting term. (The
        new flag `--strict` forces ‘deep’ evaluation of the result,
        i.e., list elements and attributes are evaluated recursively.)
-
+    
      - In Nix expressions, the primop `builtins.toXML` converts a term
        to an XML representation. This is primarily useful for passing
        structured information to builders.
@@ -133,21 +133,21 @@
    something other than `result`.

  - Platform support:
-
+    
      - Support for 64-bit platforms, provided a [suitably patched ATerm
        library](http://bugzilla.sen.cwi.nl:8080/show_bug.cgi?id=606) is
        used. Also, files larger than 2 GiB are now supported.
-
+    
      - Added support for Cygwin (Windows, `i686-cygwin`), Mac OS X on
        Intel (`i686-darwin`) and Linux on PowerPC (`powerpc-linux`).
-
+    
      - Users of SMP and multicore machines will appreciate that the
        number of builds to be performed in parallel can now be
        specified in the configuration file in the `build-max-jobs`
        setting.

  - Garbage collector improvements:
-
+    
      - Open files (such as running programs) are now used as roots of
        the garbage collector. This prevents programs that have been
        uninstalled from being garbage collected while they are still
@@ -155,17 +155,17 @@
        (`find-runtime-roots.pl`) is inherently system-specific, but it
        should work on Linux and on all platforms that have the `lsof`
        utility.
-
+    
      - `nix-store --gc` (a.k.a. `nix-collect-garbage`) prints out the
        number of bytes freed on standard output. `nix-store
                                                        --gc --print-dead` shows how many bytes would be freed by an
        actual garbage collection.
-
+    
      - `nix-collect-garbage -d` removes all old generations of *all*
        profiles before calling the actual garbage collector (`nix-store
                                                        --gc`). This is an easy way to get rid of all old packages in
        the Nix store.
-
+    
      - `nix-store` now has an operation `--delete` to delete specific
        paths from the Nix store. It won’t delete reachable
        (non-garbage) paths unless `--ignore-liveness` is specified.
@@ -192,13 +192,13 @@
    memoisation of path hashing.

  - Lots of bug fixes, notably:
-
+    
      - Make sure that the garbage collector can run successfully when
        the disk is full (`NIX-18`).
-
+    
      - `nix-env` now locks the profile to prevent races between
        concurrent `nix-env` operations on the same profile (`NIX-7`).
-
+    
      - Removed misleading messages from `nix-env -i` (e.g.,
        ``installing
                                                        `foo'`` followed by ``uninstalling
@@ -50,7 +50,7 @@ on Nix. Here is an (incomplete) list:
    multiple packages with the same name, then pick the package with the
    highest priority, and only use the version if there are multiple
    packages with the same priority.
-
+    
    This makes it possible to mark specific versions/variant in Nixpkgs
    more or less desirable than others. A typical example would be a
    beta version of some package (e.g., `gcc-4.2.0rc1`) which should not
@@ -62,14 +62,14 @@ on Nix. Here is an (incomplete) list:
    be modified. There are several attributes that can be usefully
    modified, because they affect the behaviour of `nix-env` or the user
    environment build script:
-
+    
      - `meta.priority` can be changed to resolve filename clashes (see
        above).
-
+    
      - `meta.keep` can be set to `true` to prevent the package from
        being upgraded or replaced. Useful if you want to hang on to an
        older version of a package.
-
+    
      - `meta.active` can be set to `false` to “disable” the package.
        That is, no symlinks will be generated to the files of the
        package, but it remains part of the profile (so it won’t be
@@ -7,23 +7,23 @@
    Nix process crashes; no write access is needed for read-only
    operations; no more running out of Berkeley DB locks on certain
    operations.
-
+    
    You still need to compile Nix with Berkeley DB support if you want
    Nix to automatically convert your old Nix store to the new schema.
    If you don’t need this, you can build Nix with the `configure`
    option `--disable-old-db-compat`.
-
+    
    After the automatic conversion to the new schema, you can delete the
    old Berkeley DB files:
-
+    
        $ cd /nix/var/nix/db
        $ rm __db* log.* derivers references referrers reserved validpaths DB_CONFIG
-
+    
    The new metadata is stored in the directories `/nix/var/nix/db/info`
    and `/nix/var/nix/db/referrer`. Though the metadata is stored in
    human-readable plain-text files, they are not intended to be
    human-editable, as Nix is rather strict about the format.
-
+    
    The new storage schema may or may not require less disk space than
    the Berkeley DB environment, mostly depending on the cluster size of
    your file system. With 1 KiB clusters (which seems to be the `ext3`
@@ -50,11 +50,11 @@
    last access time. This allows non-recently used stuff to be deleted.
    The option `--max-atime time` specifies an upper limit to the last
    accessed time of paths that may be deleted. For instance,
-
-    ```
+    
+    ``` 
        $ nix-store --gc -v --max-atime $(date +%s -d "2 months ago")
    ```
-
+    
    deletes everything that hasn’t been accessed in two months.

  - `nix-env` now uses optimistic profile locking when performing an
@@ -73,7 +73,7 @@
    now always shown by `nix-env`, `nix-store -r` and `nix-build`. The
    total download size of substitutable paths is now also shown. For
    instance, a build will show something like
-
+    
        the following derivations will be built:
          /nix/store/129sbxnk5n466zg6r1qmq1xjv9zymyy7-activate-configuration.sh.drv
          /nix/store/7mzy971rdm8l566ch8hgxaf89x7lr7ik-upstart-jobs.drv
@@ -84,24 +84,24 @@
          ...

  - Language features:
-
+    
      - @-patterns as in Haskell. For instance, in a function definition
-
+        
            f = args @ {x, y, z}: ...;
-
+        
        `args` refers to the argument as a whole, which is further
        pattern-matched against the attribute set pattern `{x, y, z}`.
-
+    
      - “`...`” (ellipsis) patterns. An attribute set pattern can now
        say `...` at the end of the attribute name list to specify that
        the function takes *at least* the listed attributes, while
        ignoring additional attributes. For instance,
-
+        
            {stdenv, fetchurl, fuse, ...}: ...
-
+        
        defines a function that accepts any attribute set that includes
        at least the three listed attributes.
-
+    
      - New primops: `builtins.parseDrvName` (split a package name
        string like `"nix-0.12pre12876"` into its name and version
        components, e.g. `"nix"` and `"0.12pre12876"`),
@@ -3,7 +3,7 @@
 This is primarily a bug fix release. It has some new features:

  - Syntactic sugar for writing nested attribute sets. Instead of
-
+    
        {
          foo = {
            bar = 123;
@@ -11,15 +11,15 @@ This is primarily a bug fix release. It has some new features:
          };
          a = { b = { c = "d"; }; };
        }
-
+    
    you can write
-
+    
        {
          foo.bar = 123;
          foo.xyzzy = true;
          a.b.c = "d";
        }
-
+    
    This is useful, for instance, in NixOS configuration files.

  - Support for Nix channels generated by Hydra, the Nix-based
@@ -1,15 +1,15 @@
 # Release 0.6 (2004-11-14)

  - Rewrite of the normalisation engine.
-
+    
      - Multiple builds can now be performed in parallel (option `-j`).
-
+    
      - Distributed builds. Nix can now call a shell script to forward
        builds to Nix installations on remote machines, which may or may
        not be of the same platform type.
-
+    
      - Option `--fallback` allows recovery from broken substitutes.
-
+    
      - Option `--keep-going` causes building of other (unaffected)
        derivations to continue if one failed.

@@ -28,32 +28,32 @@
  - Manual updates.

  - `nix-env` changes:
-
+    
      - Derivations for other platforms are filtered out (which can be
        overridden using `--system-filter`).
-
+    
      - `--install` by default now uninstall previous derivations with
        the same name.
-
+    
      - `--upgrade` allows upgrading to a specific version.
-
+    
      - New operation `--delete-generations` to remove profile
        generations (necessary for effective garbage collection).
-
+    
      - Nicer output (sorted, columnised).

  - More sensible verbosity levels all around (builder output is now
    shown always, unless `-Q` is given).

  - Nix expression language changes:
-
+    
      - New language construct: `with
                                                        E1;
                                                        E2` brings all attributes defined in the attribute set *E1* in
        scope in *E2*.
-
+    
      - Added a `map` function.
-
+    
      - Various new operators (e.g., string concatenation).

  - Expression evaluation is much faster.
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .90.0
 .18.1