DeterminateSystems · edolstra · May 20, 2026 · May 20, 2026 · May 20, 2026 · May 20, 2026
diff --git a/.clang-tidy b/.clang-tidy
diff --git a/.clang-tidy b/.clang-tidy
@@ -0,0 +1 @@
+nix-meson-build-support/common/clang-tidy/.clang-tidy
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -4,3 +4,11 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "nix"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    groups:
+      flake-inputs:
+        patterns:
+          - "*"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -157,7 +157,7 @@ jobs:
         run: mkdir -p ./artifacts
 
       - name: Fetch artifacts
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           path: downloaded
       - name: Move downloaded artifacts to artifacts directory

diff --git a/.gitignore b/.gitignore
@@ -2,23 +2,8 @@
 /build
 # Meson creates this file too
 src/.wraplock
-
-# /tests/functional/
-/tests/functional/common/subst-vars.sh
-/tests/functional/restricted-innocent
-/tests/functional/debugger-test-out
-/tests/functional/test-libstoreconsumer/test-libstoreconsumer
-/tests/functional/nix-shell
-
-# /tests/functional/lang/
-/tests/functional/lang/*.out
-/tests/functional/lang/*.out.xml
-/tests/functional/lang/*.err
-/tests/functional/lang/*.ast
-
-# /tests/functional/cli-characterisation/
-/tests/functional/cli-characterisation/*.out
-/tests/functional/cli-characterisation/*.err
+# Python bytecode (clang-tidy runner scripts)
+__pycache__/
 
 /outputs
 

diff --git a/.version b/.version
@@ -1 +1 @@
-2.34.8
+2.35.1
diff --git a/ci/gha/tests/default.nix b/ci/gha/tests/default.nix
@@ -57,8 +57,6 @@ rec {
       nix-expr = prev.nix-expr.override { enableGC = !withSanitizers; };
 
       mesonComponentOverrides = lib.composeManyExtensions componentOverrides;
-      # Unclear how to make Perl bindings work with a dynamically linked ASAN.
-      nix-perl-bindings = if withSanitizers then null else prev.nix-perl-bindings;
     }
   );
 
@@ -78,6 +76,7 @@ rec {
     installerScriptForGHA = hydraJobs.installerScriptForGHA.${system};
     nixpkgsLibTests = hydraJobs.tests.nixpkgsLibTests.${system};
     nixpkgsLibTestsLazy = hydraJobs.tests.nixpkgsLibTestsLazy.${system};
+    filetransfer-retry-backoff = hydraJobs.tests.filetransfer-retry-backoff.${system};
     rl-next = pkgs.buildPackages.runCommand "test-rl-next-release-notes" { } ''
       LANG=C.UTF-8 ${pkgs.changelog-d}/bin/changelog-d ${../../../doc/manual/rl-next} >$out
     '';

diff --git a/doc/manual/generate-store-info.nix b/doc/manual/generate-store-info.nix
@@ -46,10 +46,12 @@ let
 
         ## Settings
 
-        ${showSettings {
-          prefix = "store-${slug}";
-          inherit inlineHTML;
-        } settings}
+        ${replaceStrings [ "@store-slug@" ] [ "store-${slug}" ] (
+          showSettings {
+            prefix = "store-${slug}";
+            inherit inlineHTML;
+          } settings
+        )}
       '';
 
       experimentalFeatureNote = optionalString (experimentalFeature != null) ''

diff --git a/doc/manual/meson.build b/doc/manual/meson.build
@@ -1,7 +1,7 @@
 project(
   'nix-manual',
   version : files('.version'),
-  meson_version : '>= 1.1',
+  meson_version : '>= 1.8',
   license : 'LGPL-2.1-or-later',
 )
 
@@ -231,7 +231,9 @@ foreach command : nix_nested_manpages
         meson.current_source_dir() / 'source',
         meson.current_build_dir() / 'source',
         doc_url,
-        meson.current_source_dir() / 'source/command-ref' / command[0] / (page + '.md'),
+        meson.current_source_dir() / 'source/command-ref' / command[0] / (
+          page + '.md'
+        ),
         '@OUTPUT0@',
       ],
       input : [
@@ -320,8 +322,6 @@ nix3_manpages = [
   'nix3-provenance-show',
   'nix3-provenance-verify',
   'nix3-ps',
-  'nix3-realisation',
-  'nix3-realisation-info',
   'nix3-registry',
   'nix3-registry-add',
   'nix3-registry-list',
@@ -336,6 +336,8 @@ nix3_manpages = [
   'nix3-store-add',
   'nix3-store-add-file',
   'nix3-store-add-path',
+  'nix3-store-build-trace-info',
+  'nix3-store-build-trace',
   'nix3-store-cat',
   'nix3-store-copy-log',
   'nix3-store-copy-sigs',

diff --git a/doc/manual/package.nix b/doc/manual/package.nix
@@ -145,6 +145,21 @@ mkMesonDerivation (finalAttrs: {
               # Exclude undocumented builtins
               ".*/language/builtins\\.html#builtins-addErrorContext"
               ".*/language/builtins\\.html#builtins-appendContext"
+              # `print.html` aggregates content from all pages, including
+              # the JSON schema pages and builtins pages excluded above,
+              # so it inherits the same broken fragment links.
+              ".*/print\\.html#algorithm"
+              ".*/print\\.html#root"
+              ".*/print\\.html#builtins-addErrorContext"
+              ".*/print\\.html#builtins-appendContext"
+              ".*/print\\.html#derivations_pattern1_structuredAttrs_additionalProperties"
+              ".*/print\\.html#structuredAttrs_additionalProperties"
+            ];
+            # `404.html` uses `<base href="/">` so that absolute links
+            # work on the deployed site. Lychee cannot resolve `/` against
+            # a local file path, so skip the file entirely.
+            exclude_path = [
+              ".*/404\\.html"
             ];
           };
         };

diff --git a/doc/manual/redirects.json b/doc/manual/redirects.json
@@ -283,7 +283,7 @@
         "string-literal": "string-literals.html"
     },
     "language/derivations.html": {
-        "builder-execution": "../store/building.html#builder-execution"
+        "builder-execution": "../store/building.html"
     },
     "installation/installing-binary.html": {
         "uninstalling": "uninstall.html"
@@ -297,7 +297,6 @@
         "debugging-failing-functional-tests": "testing.html#debugging-failing-functional-tests",
         "integration-tests": "testing.html#integration-tests",
         "installer-tests": "testing.html#installer-tests",
-        "one-time-setup": "testing.html#one-time-setup",
         "using-the-ci-generated-installer-for-manual-testing":
             "testing.html#using-the-ci-generated-installer-for-manual-testing",
         "characterization-testing": "testing.html#characterisation-testing-unit",
@@ -307,6 +306,9 @@
         "reverting": "contributing.html#reverting",
         "branches": "contributing.html#branches"
     },
+    "store/store-path.html": {
+        "store-directory": "#store-directory-path"
+    },
     "glossary.html": {
         "gloss-local-store": "store/types/local-store.html",
         "package-attribute-set": "#package",

diff --git a/doc/manual/remove_before_wrapper.py b/doc/manual/remove_before_wrapper.py
@@ -22,7 +22,7 @@ def main():
     shutil.rmtree(output, ignore_errors=True)
     shutil.rmtree(output_temp, ignore_errors=True)
 
-    # Execute nix command with `--write-to` tempary output
+    # Execute nix command with `--write-to` temporary output
     nix_command_write_to = nix_command + ['--write-to', output_temp]
     subprocess.run(nix_command_write_to, check=True)
 

diff --git a/doc/manual/source/SUMMARY.md.in b/doc/manual/source/SUMMARY.md.in
@@ -14,9 +14,10 @@
 - [Nix Store](store/index.md)
   - [File System Object](store/file-system-object.md)
     - [Content-Addressing File System Objects](store/file-system-object/content-address.md)
+    - [Exposing in OS File Systems](store/file-system-object/os-file-system.md)
   - [Store Object](store/store-object.md)
     - [Content-Addressing Store Objects](store/store-object/content-address.md)
-  - [Store Path](store/store-path.md)
+  - [Store Path and Store Directory](store/store-path.md)
   - [Store Derivation and Deriving Path](store/derivation/index.md)
     - [Derivation Outputs and Types of Derivations](store/derivation/outputs/index.md)
       - [Content-addressing derivation outputs](store/derivation/outputs/content-address.md)
@@ -118,8 +119,10 @@
     - [Hash](protocols/json/hash.md)
     - [Content Address](protocols/json/content-address.md)
     - [Store Path](protocols/json/store-path.md)
+    - [Signature](protocols/json/signature.md)
     - [Store Object Info](protocols/json/store-object-info.md)
     - [Derivation](protocols/json/derivation/index.md)
+      - [Resolved Derivation](protocols/json/derivation/resolved.md)
       - [Derivation Options](protocols/json/derivation/options.md)
     - [Deriving Path](protocols/json/deriving-path.md)
     - [Build Trace Entry](protocols/json/build-trace-entry.md)
@@ -128,7 +131,9 @@
   - [Serving Tarball Flakes](protocols/tarball-fetcher.md)
   - [Store Path Specification](protocols/store-path.md)
   - [Nix Archive (NAR) Format](protocols/nix-archive/index.md)
-  - [Nix Cache Info Format](protocols/nix-cache-info.md)
+  - [Binary Cache](protocols/binary-cache/index.md)
+    - [`nix-cache-info` Format](protocols/binary-cache/nix-cache-info.md)
+    - [`.narinfo` Format](protocols/binary-cache/narinfo.md)
   - [Derivation "ATerm" file format](protocols/derivation-aterm.md)
   - [Nix32 Encoding](protocols/nix32.md)
   - [`builtins.wasm` Host Interface](protocols/wasm.md)
@@ -142,8 +147,9 @@
   - [Debugging](development/debugging.md)
   - [Documentation](development/documentation.md)
   - [CLI guideline](development/cli-guideline.md)
-  - [JSON guideline](development/json-guideline.md)
+  - [Data Modeling Guidelines](development/data-modeling.md)
   - [C++ style guide](development/cxx.md)
+  - [Static Analysis](development/static-analysis.md)
   - [Experimental Features](development/experimental-features.md)
   - [Contributing](development/contributing.md)
 - [Determinate Nix Release Notes](release-notes-determinate/index.md)
@@ -211,6 +217,7 @@
   - [Release 3.0.0 (2025-03-04)](release-notes-determinate/rl-3.0.0.md)
 - [Nix Release Notes](release-notes/index.md)
 {{#include ./SUMMARY-rl-next.md}}
+  - [Release 2.35 (2026-06-22)](release-notes/rl-2.35.md)
   - [Release 2.34 (2026-02-27)](release-notes/rl-2.34.md)
   - [Release 2.33 (2025-12-09)](release-notes/rl-2.33.md)
   - [Release 2.32 (2025-10-06)](release-notes/rl-2.32.md)

diff --git a/doc/manual/source/_redirects b/doc/manual/source/_redirects
@@ -27,7 +27,8 @@
 /contributing/documentation /development/documentation 301!
 /contributing/experimental-features /development/experimental-features 301!
 /contributing/cli-guideline /development/cli-guideline 301!
-/contributing/json-guideline /development/json-guideline 301!
+/contributing/json-guideline /development/data-modeling 301!
+/development/json-guideline /development/data-modeling 301!
 /contributing/cxx /development/cxx 301!
 
 /expressions/expression-language /language/ 301!
@@ -36,6 +37,7 @@
 /expressions/language-values /language/values 301!
 /expressions/* /language/:splat 301!
 /language/values /language/types 301!
+/language/values.html /language/types 301!
 /language/constructs /language/syntax 301!
 /language/builtin-constants /language/builtins 301!
 
@@ -46,6 +48,7 @@
 /package-management/package-management /package-management 301!
 /package-management/s3-substituter /store/types/s3-binary-cache-store 301!
 
+/protocols/nix-cache-info /protocols/binary-cache/nix-cache-info 301!
 /protocols/protocols /protocols 301!
 /json/* /protocols/json/:splat 301!
 

diff --git a/doc/manual/source/command-ref/conf-file-prefix.md b/doc/manual/source/command-ref/conf-file-prefix.md
@@ -8,19 +8,26 @@ Nix supports a variety of configuration settings, which are read from configurat
 
 ## Configuration file
 
-By default Nix reads settings from the following places, in that order:
+By default Nix reads settings from each of the following places.
+Settings are applied on top of one another, so later settings overwrite earlier entries.
 
-1. The system-wide configuration file `sysconfdir/nix/nix.conf` (i.e. `/etc/nix/nix.conf` on most systems), or `$NIX_CONF_DIR/nix.conf` if [`NIX_CONF_DIR`](./env-common.md#env-NIX_CONF_DIR) is set.
+1. The system-wide configuration file `nix.conf` in the configuration directory.
+
+   The configuration directory defaults to `${sysconfdir}/nix` (i.e. `/etc/nix` on most Unix systems) or `%PROGRAMDATA%\nix\conf` on Windows, and can be overridden with [`NIX_CONF_DIR`](./env-common.md#env-NIX_CONF_DIR).
 
    Values loaded in this file are not forwarded to the Nix daemon.
    The client assumes that the daemon has already loaded them.
 
-1. If [`NIX_USER_CONF_FILES`](./env-common.md#env-NIX_USER_CONF_FILES) is set, then each path separated by `:` will be loaded in reverse order.
+1. If [`NIX_USER_CONF_FILES`](./env-common.md#env-NIX_USER_CONF_FILES) is set, then each path in the list will be loaded in reverse order.
+   The list separator is `:` on Unix and `;` on Windows.
+
+   Otherwise it will look for `nix.conf` in:
 
-   Otherwise it will look for `nix/nix.conf` files in `XDG_CONFIG_DIRS` and [`XDG_CONFIG_HOME`](./env-common.md#env-XDG_CONFIG_HOME).
-   If unset, `XDG_CONFIG_DIRS` defaults to `/etc/xdg`, and `XDG_CONFIG_HOME` defaults to `$HOME/.config` as per [XDG Base Directory Specification](https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html).
+   - The [user configuration directory](./env-common.md#user-conf-dir)
+   - On Unix additionally, `nix/nix.conf` under each directory in [`XDG_CONFIG_DIRS`](./env-common.md#env-XDG_CONFIG_DIRS)
 
 1. If [`NIX_CONFIG`](./env-common.md#env-NIX_CONFIG) is set, its contents are treated as the contents of a configuration file.
+   In particular, settings are separated by newlines, just as in the configuration file.
 
 ### File format
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		nix-meson-build-support/common/clang-tidy/.clang-tidy