sysutils/nix: Update to 2.31.1.

- Unbreak port - Switch to meson/ninja from autotools - Depend on C++23 compiler - Remove testing targets/dependencies
2025-09-13 21:09:10 +00:00 · 2025-09-13 21:09:10 +00:00 · ae1b8f4346
parent 1a2da0563a
commit ae1b8f4346
4 changed files with 369 additions and 332 deletions
--- a/sysutils/nix/Makefile
+++ b/sysutils/nix/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	nix
-DISTVERSION=	2.20.2
-PORTREVISION=	8
+DISTVERSION=	2.31.1
 CATEGORIES=	sysutils

 MAINTAINER=	ashish@FreeBSD.org
@ -10,130 +9,70 @@ WWW=		https://nixos.org/nix/
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING

-BROKEN=		Fails to build, error: field designator 'cols' does not refer to any field in type 'struct lowdown_opts'
-DEPRECATED=	Outdated version and broken for months
-EXPIRATION_DATE=2025-03-31
-
-BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/ax_cxx_compile_stdcxx.m4:devel/autoconf-archive \
-		gsed:textproc/gsed \
-		bash:shells/bash \
-		docbook-xsl-ns>=0:textproc/docbook-xsl-ns \
-		gnustat:sysutils/coreutils \
-		grealpath:sysutils/coreutils \
-		xmllint:textproc/libxml2 \
-		xsltproc:textproc/libxslt \
+BUILD_DEPENDS=	bash:shells/bash \
 		jq:textproc/jq \
-		nlohmann-json>=3.9:devel/nlohmann-json
+		nlohmann-json>=3.9:devel/nlohmann-json \
+		toml11>=0:devel/toml11
 LIB_DEPENDS=	libaws-cpp-sdk-core.so:devel/aws-sdk-cpp \
 		libaws-crt-cpp.so:devel/aws-crt-cpp \
+		libblake3.so:devel/libblake3 \
 		libboost_context.so:devel/boost-libs \
 		libbrotlienc.so:archivers/brotli \
+		libcpuid.so:sysutils/libcpuid \
 		libcurl.so:ftp/curl \
 		libeditline.so:devel/editline \
-		libgc.so:devel/boehm-gc \
-		libsodium.so:security/libsodium \
-		libcpuid.so:sysutils/libcpuid \
+		libgc-threaded.so:devel/boehm-gc-threaded \
 		libgit2.so:devel/libgit2 \
-		liblowdown.so:textproc/lowdown
-TEST_DEPENDS=	dot:graphics/graphviz \
-		git:devel/git \
-		gxargs:misc/findutils \
-		hg:devel/mercurial
+		liblowdown.so:textproc/lowdown \
+		libsodium.so:security/libsodium

-USES=		autoreconf bison compiler:c++17-lang cpe gmake localbase libarchive \
-		pkgconfig sqlite:3 ssl
+USES=		bison cmake:indirect compiler:c++23-lang cpe libarchive localbase \
+		meson ninja pkgconfig sqlite:3 ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	NixOS
 USE_LDCONFIG=	yes

 CPE_VENDOR=	nix_project

-HAS_CONFIGURE=		yes
-# Workaround for bashisms in the configure script.
-CONFIGURE_SHELL=	${_BASH}
-CONFIGURE_ARGS=		--disable-seccomp-sandboxing \
-			--enable-gc \
-			--disable-unit-tests
-CONFIGURE_ENV=		OPENSSL_CFLAGS="-I ${OPENSSLINC}" \
-			OPENSSL_LIBS="-L ${OPENSSLLIB}"
-# Workaround for:
-#   /usr/bin/ld: error: undefined symbol: SHA512_Update
-MAKE_ARGS=		libutil_ALLOW_UNDEFINED=yes V=s
-# XXX: Tests require the port to be installed on the system. It is not enough
-# to have the port staged.
-TEST_ARGS=		nix_tests="${_PASSING_TESTS}"
-TEST_TARGET=		installcheck
-
-# grealpath and gnustat are needed for tests.
-BINARY_ALIAS=	realpath=grealpath stat=gnustat sed=gsed
+MESON_ARGS=	-Dbenchmarks=false \
+		-Dbindings=false \
+		-Dunit-tests=false
+LDFLAGS+=	-L${LOCALBASE}/lib

 SUB_FILES=	pkg-message

 GROUPS=		nixbld

-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=		DOCS
+DOCS_USES=		python:build
+DOCS_MESON_TRUE=	doc-gen
+DOCS_BUILD_DEPENDS=	mdbook-linkcheck>=0:textproc/mdbook-linkcheck \
+			mdbook>=0:textproc/mdbook \
+			rsync:net/rsync

-DOCS_CONFIGURE_ENABLE=	doc-gen
-DOCS_BUILD_DEPENDS=	mdbook>=0:textproc/mdbook \
-			mdbook-linkcheck>=0:textproc/mdbook-linkcheck
-
-_BASH=		${LOCALBASE}/bin/bash
 _STRIP_TARGETS=	bin/nix bin/nix-build bin/nix-channel bin/nix-collect-garbage \
 		bin/nix-copy-closure bin/nix-daemon bin/nix-env \
 		bin/nix-instantiate bin/nix-prefetch-url bin/nix-store \
 		lib/libnixexpr.so lib/libnixmain.so lib/libnixstore.so \
 		lib/libnixutil.so lib/libnixcmd.so lib/libnixfetchers.so
-# Regenerate the list of all tests with:
-# make patch && make -f $(make -V WRKSRC)/tests/local.mk -V nix_tests
-
-_ALL_TESTS=	test-infra.sh init.sh flakes/flakes.sh flakes/develop.sh \
-		flakes/run.sh flakes/mercurial.sh flakes/circular.sh \
-		flakes/init.sh flakes/inputs.sh flakes/follow-paths.sh \
-		flakes/bundle.sh flakes/check.sh flakes/unlocked-override.sh \
-		flakes/absolute-paths.sh flakes/absolute-attr-paths.sh \
-		flakes/build-paths.sh flakes/flake-in-submodule.sh gc.sh \
-		nix-collect-garbage-d.sh remote-store.sh legacy-ssh-store.sh \
-		lang.sh lang-test-infra.sh experimental-features.sh \
-		fetchMercurial.sh gc-auto.sh user-envs.sh \
-		user-envs-migration.sh binary-cache.sh multiple-outputs.sh \
-		nix-build.sh gc-concurrent.sh repair.sh fixed.sh export-graph.sh \
-		timeout.sh fetchGitRefs.sh gc-runtime.sh tarball.sh fetchGit.sh \
-		fetchurl.sh fetchPath.sh fetchTree-file.sh simple.sh referrers.sh \
-		optimise-store.sh substitute-with-invalid-ca.sh signing.sh hash.sh \
-		gc-non-blocking.sh check.sh nix-shell.sh check-refs.sh \
-		build-remote-input-addressed.sh secure-drv-outputs.sh restricted.sh \
-		fetchGitSubmodules.sh fetchGitVerification.sh flakes/search-root.sh \
-		readfile-context.sh nix-channel.sh recursive.sh dependencies.sh \
-		check-reqs.sh build-remote-content-addressed-fixed.sh \
-		build-remote-content-addressed-floating.sh \
-		build-remote-trustless-should-pass-0.sh \
-		build-remote-trustless-should-pass-1.sh \
-		build-remote-trustless-should-pass-2.sh \
-		build-remote-trustless-should-pass-3.sh \
-		build-remote-trustless-should-fail-0.sh \
-		build-remote-with-mounted-ssh-ng.sh \
-		nar-access.sh impure-eval.sh pure-eval.sh eval.sh repl.sh \
-		binary-cache-build-remote.sh search.sh logging.sh export.sh config.sh \
-		add.sh local-store.sh filter-source.sh misc.sh dump-db.sh \
-		linux-sandbox.sh supplementary-groups.sh build-dry.sh \
-		structured-attrs.sh shell.sh brotli.sh zstd.sh compression-levels.sh \
-		nix-copy-ssh.sh nix-copy-ssh-ng.sh post-hook.sh function-trace.sh \
-		flakes/config.sh fmt.sh eval-store.sh why-depends.sh derivation-json.sh \
-		import-derivation.sh nix_path.sh case-hack.sh placeholders.sh \
-		ssh-relay.sh build.sh build-delete.sh output-normalization.sh \
-		selfref-gc.sh db-migration.sh bash-profile.sh pass-as-file.sh \
-		nix-profile.sh suggestions.sh store-info.sh fetchClosure.sh completions.sh \
-		flakes/show.sh impure-derivations.sh path-from-hash-part.sh path-info.sh \
-		toString-path.sh read-only-store.sh nested-sandboxing.sh impure-env.sh \
-		compute-levels.sh test-libstoreconsumer.sh plugins.sh
-
-# Remove problematic tests from the list:
-# - restricted.sh is hanging and never finishes.
-_PASSING_TESTS=	${_ALL_TESTS:Nrestricted.sh}

 post-patch:
-	${REINPLACE_CMD} -e 's,=/dummy,=${WRKDIR}/dummy,g' \
-		${WRKSRC}/doc/manual/local.mk
+	${REINPLACE_CMD} -e "/seccomp-sandboxing/s/,$$/, value : 'disabled',/" \
+		${WRKSRC}/src/libstore/meson.options
+	${REINPLACE_CMD} -e "/^bdw_gc/s/'bdw-gc'/'bdw-gc-threaded'/" \
+		${WRKSRC}/src/libexpr/meson.build
+	${FIND} ${WRKSRC} -type f -name meson.build | \
+		${XARGS} ${GREP} -E -R -l 'Werror=(suggest-override|undef)|/dummy' | \
+		${XARGS} ${REINPLACE_CMD} -E -e '/Werror=(suggest-override|undef)/d' \
+			-e 's,/dummy,/tmp/dummy,g'
+
+post-patch-DOCS-on:
+	${REINPLACE_CMD} -E -e '/(internal|external)-api-docs/d' \
+		${WRKSRC}/meson.build
+	${FIND} ${WRKSRC} -type f -name 'book.toml.in' | ${XARGS} \
+		${REINPLACE_CMD} -e "s,'python3','${PYTHON_CMD}'," \
+			-e 's,"python3 ,"${PYTHON_CMD} ,' \
+			${WRKSRC}/src/nix-manual/meson.build

 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
@ -144,21 +83,4 @@ post-install:

 	@cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} ${_STRIP_TARGETS}

-pre-test:
-	${MKDIR} /tmp/nix-test
-
-	${REINPLACE_CMD} -e 's| xargs | gxargs |g' ${WRKSRC}/tests/push-to-store.sh
-	${REINPLACE_CMD} -e 's| touch | /usr/bin/touch |g' ${WRKSRC}/tests/timeout.nix
-	${REINPLACE_CMD} -e 's| touch | /usr/bin/touch |g' ${WRKSRC}/tests/check-reqs.nix
-	${REINPLACE_CMD} -e 's| touch | /usr/bin/touch |g' ${WRKSRC}/tests/nar-access.nix
-	${REINPLACE_CMD} -e 's| touch | /usr/bin/touch |g' ${WRKSRC}/tests/pass-as-file.sh
-	${REINPLACE_CMD} -e 's| date | ${LOCALBASE}/bin/gdate |g' ${WRKSRC}/tests/check.nix
-
-	${REINPLACE_CMD} -e 's| wc -l)| /usr/bin/grep -c .)|g' ${WRKSRC}/tests/gc-auto.sh
-	${REINPLACE_CMD} -e 's| tar c tarball)| tar -cf - tarball)|' ${WRKSRC}/tests/tarball.sh
-	${REINPLACE_CMD} -e 's|^grep |/usr/bin/grep |' ${WRKSRC}/tests/check.sh
-
-post-test:
-	${RM} -r /tmp/nix-test
-
 .include <bsd.port.mk>
--- a/sysutils/nix/distinfo
+++ b/sysutils/nix/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1708452546
-SHA256 (NixOS-nix-2.20.2_GH0.tar.gz) = 296d6cbe5ef404ea57944c464da86625bb65452fecc458ec943be1801534ae18
-SIZE (NixOS-nix-2.20.2_GH0.tar.gz) = 1507205
+TIMESTAMP = 1757245607
+SHA256 (NixOS-nix-2.31.1_GH0.tar.gz) = 2376e5ecc74fffbe54de4a74cc7546ebb04d7d900ba91631614e9ea74c7165f5
+SIZE (NixOS-nix-2.31.1_GH0.tar.gz) = 1898151
--- a/sysutils/nix/files/patch-src_libutil_current-process.cc
+++ b/sysutils/nix/files/patch-src_libutil_current-process.cc
@ -0,0 +1,14 @@
+--- src/libutil/current-process.cc.orig	2025-09-13 18:20:31 UTC
+++ src/libutil/current-process.cc
+@@ -134,6 +134,11 @@ std::optional<Path> getSelfExe()
+             return std::nullopt;
+         }
+ 
+        // error: input string '/usr/ports/sysutils/nix/work/nix-2.31.1/_build/src/nix/nix␀' cannot be represented
+        //    as Nix string because it contains null bytes
+        // So: pop the '\0' character in the string
+        path.pop_back();
+
+         return Path(path.begin(), path.end());
+ #else
+         return std::nullopt;
--- a/sysutils/nix/pkg-plist
+++ b/sysutils/nix/pkg-plist
@ -14,214 +14,283 @@ etc/profile.d/nix-daemon.fish
 etc/profile.d/nix-daemon.sh
 etc/profile.d/nix.fish
 etc/profile.d/nix.sh
-include/nix/abstract-setting-to-json.hh
-include/nix/ansicolor.hh
-include/nix/archive.hh
-include/nix/args.hh
-include/nix/args/root.hh
-include/nix/attr-path.hh
-include/nix/attr-set.hh
-include/nix/attrs.hh
-include/nix/binary-cache-store.hh
-include/nix/build-result.hh
-include/nix/build/child.hh
-include/nix/build/derivation-goal.hh
-include/nix/build/drv-output-substitution-goal.hh
-include/nix/build/goal.hh
-include/nix/build/hook-instance.hh
-include/nix/build/local-derivation-goal.hh
-include/nix/build/personality.hh
-include/nix/build/substitution-goal.hh
-include/nix/build/worker.hh
-include/nix/built-path.hh
-include/nix/builtins.hh
-include/nix/builtins/buildenv.hh
-include/nix/ca-specific-schema.sql.gen.hh
-include/nix/cache.hh
-include/nix/callback.hh
-include/nix/canon-path.hh
-include/nix/cgroup.hh
-include/nix/chunked-vector.hh
-include/nix/closure.hh
-include/nix/command-installable-value.hh
-include/nix/command.hh
-include/nix/common-args.hh
-include/nix/common-eval-args.hh
-include/nix/common-protocol-impl.hh
-include/nix/common-protocol.hh
-include/nix/comparator.hh
-include/nix/compression.hh
-include/nix/compute-levels.hh
-include/nix/config-impl.hh
-include/nix/config.h
-include/nix/config.hh
-include/nix/content-address.hh
-include/nix/current-process.hh
-include/nix/daemon.hh
-include/nix/derivations.hh
-include/nix/derived-path-map.hh
-include/nix/derived-path.hh
-include/nix/downstream-placeholder.hh
-include/nix/editor-for.hh
-include/nix/english.hh
-include/nix/environment-variables.hh
-include/nix/error.hh
-include/nix/eval-cache.hh
-include/nix/eval-inline.hh
-include/nix/eval-settings.hh
-include/nix/eval.hh
-include/nix/experimental-features.hh
-include/nix/fetch-settings.hh
-include/nix/fetch-to-store.hh
-include/nix/fetchers.hh
-include/nix/fetchurl.nix.gen.hh
-include/nix/file-content-address.hh
-include/nix/file-descriptor.hh
-include/nix/file-system.hh
-include/nix/filetransfer.hh
-include/nix/filtering-input-accessor.hh
-include/nix/finally.hh
-include/nix/flake/call-flake.nix.gen.hh
+etc/rc.d/nix-daemon
+include/nix/cmd/built-path.hh
+include/nix/cmd/command-installable-value.hh
+include/nix/cmd/command.hh
+include/nix/cmd/common-eval-args.hh
+include/nix/cmd/compatibility-settings.hh
+include/nix/cmd/editor-for.hh
+include/nix/cmd/installable-attr-path.hh
+include/nix/cmd/installable-derived-path.hh
+include/nix/cmd/installable-flake.hh
+include/nix/cmd/installable-value.hh
+include/nix/cmd/installables.hh
+include/nix/cmd/legacy.hh
+include/nix/cmd/markdown.hh
+include/nix/cmd/misc-store-flags.hh
+include/nix/cmd/network-proxy.hh
+include/nix/cmd/repl-interacter.hh
+include/nix/cmd/repl.hh
+include/nix/expr/attr-path.hh
+include/nix/expr/attr-set.hh
+include/nix/expr/config.hh
+include/nix/expr/eval-cache.hh
+include/nix/expr/eval-error.hh
+include/nix/expr/eval-gc.hh
+include/nix/expr/eval-inline.hh
+include/nix/expr/eval-profiler-settings.hh
+include/nix/expr/eval-profiler.hh
+include/nix/expr/eval-settings.hh
+include/nix/expr/eval.hh
+include/nix/expr/function-trace.hh
+include/nix/expr/gc-small-vector.hh
+include/nix/expr/get-drvs.hh
+include/nix/expr/json-to-value.hh
+include/nix/expr/nixexpr.hh
+include/nix/expr/parser-state.hh
+include/nix/expr/primops.hh
+include/nix/expr/print-ambiguous.hh
+include/nix/expr/print-options.hh
+include/nix/expr/print.hh
+include/nix/expr/repl-exit-status.hh
+include/nix/expr/search-path.hh
+include/nix/expr/symbol-table.hh
+include/nix/expr/value-to-json.hh
+include/nix/expr/value-to-xml.hh
+include/nix/expr/value.hh
+include/nix/expr/value/context.hh
+include/nix/fetchers/attrs.hh
+include/nix/fetchers/cache.hh
+include/nix/fetchers/fetch-settings.hh
+include/nix/fetchers/fetch-to-store.hh
+include/nix/fetchers/fetchers.hh
+include/nix/fetchers/filtering-source-accessor.hh
+include/nix/fetchers/git-lfs-fetch.hh
+include/nix/fetchers/git-utils.hh
+include/nix/fetchers/input-cache.hh
+include/nix/fetchers/registry.hh
+include/nix/fetchers/store-path-accessor.hh
+include/nix/fetchers/tarball.hh
 include/nix/flake/flake.hh
 include/nix/flake/flakeref.hh
 include/nix/flake/lockfile.hh
+include/nix/flake/settings.hh
 include/nix/flake/url-name.hh
-include/nix/fmt.hh
-include/nix/fs-input-accessor.hh
-include/nix/fs-sink.hh
-include/nix/function-trace.hh
-include/nix/gc-small-vector.hh
-include/nix/gc-store.hh
-include/nix/get-drvs.hh
-include/nix/git-utils.hh
-include/nix/git.hh
-include/nix/globals.hh
-include/nix/hash.hh
-include/nix/hilite.hh
-include/nix/imported-drv-to-derivation.nix.gen.hh
-include/nix/indirect-root-store.hh
-include/nix/input-accessor.hh
-include/nix/installable-attr-path.hh
-include/nix/installable-derived-path.hh
-include/nix/installable-flake.hh
-include/nix/installable-value.hh
-include/nix/installables.hh
-include/nix/json-impls.hh
-include/nix/json-to-value.hh
-include/nix/json-utils.hh
-include/nix/keys.hh
-include/nix/legacy-ssh-store.hh
-include/nix/legacy.hh
-include/nix/length-prefixed-protocol-helper.hh
+include/nix/lexer-tab.cc
 include/nix/lexer-tab.hh
-include/nix/local-fs-store.hh
-include/nix/local-store.hh
-include/nix/lock.hh
-include/nix/log-store.hh
-include/nix/loggers.hh
-include/nix/logging.hh
-include/nix/lru-cache.hh
-include/nix/machines.hh
-include/nix/make-content-addressed.hh
-include/nix/markdown.hh
-include/nix/memory-input-accessor.hh
-include/nix/memory-source-accessor.hh
-include/nix/monitor-fd.hh
-include/nix/mounted-input-accessor.hh
-include/nix/names.hh
-include/nix/namespaces.hh
-include/nix/nar-accessor.hh
-include/nix/nar-info-disk-cache.hh
-include/nix/nar-info.hh
-include/nix/nixexpr.hh
-include/nix/outputs-spec.hh
-include/nix/parsed-derivations.hh
-include/nix/parser-state.hh
+include/nix/main/common-args.hh
+include/nix/main/loggers.hh
+include/nix/main/plugin.hh
+include/nix/main/progress-bar.hh
+include/nix/main/shared.hh
+include/nix/parser-tab.cc
 include/nix/parser-tab.hh
-include/nix/path-info.hh
-include/nix/path-references.hh
-include/nix/path-regex.hh
-include/nix/path-with-outputs.hh
-include/nix/path.hh
-include/nix/pathlocks.hh
-include/nix/pool.hh
-include/nix/position.hh
-include/nix/posix-fs-canonicalise.hh
-include/nix/posix-source-accessor.hh
-include/nix/primops.hh
-include/nix/print-ambiguous.hh
-include/nix/print-options.hh
-include/nix/print.hh
-include/nix/processes.hh
-include/nix/profiles.hh
-include/nix/progress-bar.hh
-include/nix/realisation.hh
-include/nix/ref.hh
-include/nix/references.hh
-include/nix/regex-combinators.hh
-include/nix/registry.hh
-include/nix/remote-fs-accessor.hh
-include/nix/remote-store-connection.hh
-include/nix/remote-store.hh
-include/nix/repair-flag.hh
-include/nix/repl.hh
-include/nix/s3-binary-cache-store.hh
-include/nix/s3.hh
-include/nix/schema.sql.gen.hh
-include/nix/search-path.hh
-include/nix/serialise.hh
-include/nix/serve-protocol-impl.hh
-include/nix/serve-protocol.hh
-include/nix/shared.hh
-include/nix/signals.hh
-include/nix/signature/local-keys.hh
-include/nix/signature/signer.hh
-include/nix/source-accessor.hh
-include/nix/source-path.hh
-include/nix/split.hh
-include/nix/sqlite.hh
-include/nix/ssh-store-config.hh
-include/nix/ssh.hh
-include/nix/store-api.hh
-include/nix/store-cast.hh
-include/nix/store-dir-config.hh
-include/nix/suggestions.hh
-include/nix/symbol-table.hh
-include/nix/sync.hh
-include/nix/tarball.hh
-include/nix/tarfile.hh
-include/nix/terminal.hh
-include/nix/thread-pool.hh
-include/nix/topo-sort.hh
-include/nix/types.hh
-include/nix/uds-remote-store.hh
-include/nix/unix-domain-socket.hh
-include/nix/url-parts.hh
-include/nix/url.hh
-include/nix/users.hh
-include/nix/util.hh
-include/nix/value-to-json.hh
-include/nix/value-to-xml.hh
-include/nix/value.hh
-include/nix/value/context.hh
-include/nix/variant-wrapper.hh
-include/nix/worker-protocol-impl.hh
-include/nix/worker-protocol.hh
-include/nix/xml-writer.hh
+include/nix/store/binary-cache-store.hh
+include/nix/store/build-result.hh
+include/nix/store/build/child.hh
+include/nix/store/build/derivation-builder.hh
+include/nix/store/build/derivation-building-goal.hh
+include/nix/store/build/derivation-building-misc.hh
+include/nix/store/build/derivation-goal.hh
+include/nix/store/build/derivation-trampoline-goal.hh
+include/nix/store/build/drv-output-substitution-goal.hh
+include/nix/store/build/goal.hh
+include/nix/store/build/hook-instance.hh
+include/nix/store/build/substitution-goal.hh
+include/nix/store/build/worker.hh
+include/nix/store/builtins.hh
+include/nix/store/builtins/buildenv.hh
+include/nix/store/common-protocol-impl.hh
+include/nix/store/common-protocol.hh
+include/nix/store/common-ssh-store-config.hh
+include/nix/store/config.hh
+include/nix/store/content-address.hh
+include/nix/store/daemon.hh
+include/nix/store/derivation-options.hh
+include/nix/store/derivations.hh
+include/nix/store/derived-path-map.hh
+include/nix/store/derived-path.hh
+include/nix/store/downstream-placeholder.hh
+include/nix/store/filetransfer.hh
+include/nix/store/gc-store.hh
+include/nix/store/globals.hh
+include/nix/store/http-binary-cache-store.hh
+include/nix/store/indirect-root-store.hh
+include/nix/store/keys.hh
+include/nix/store/legacy-ssh-store.hh
+include/nix/store/length-prefixed-protocol-helper.hh
+include/nix/store/local-binary-cache-store.hh
+include/nix/store/local-fs-store.hh
+include/nix/store/local-overlay-store.hh
+include/nix/store/local-store.hh
+include/nix/store/log-store.hh
+include/nix/store/machines.hh
+include/nix/store/make-content-addressed.hh
+include/nix/store/names.hh
+include/nix/store/nar-accessor.hh
+include/nix/store/nar-info-disk-cache.hh
+include/nix/store/nar-info.hh
+include/nix/store/outputs-spec.hh
+include/nix/store/parsed-derivations.hh
+include/nix/store/path-info.hh
+include/nix/store/path-references.hh
+include/nix/store/path-regex.hh
+include/nix/store/path-with-outputs.hh
+include/nix/store/path.hh
+include/nix/store/pathlocks.hh
+include/nix/store/posix-fs-canonicalise.hh
+include/nix/store/profiles.hh
+include/nix/store/realisation.hh
+include/nix/store/references.hh
+include/nix/store/remote-fs-accessor.hh
+include/nix/store/remote-store-connection.hh
+include/nix/store/remote-store.hh
+include/nix/store/restricted-store.hh
+include/nix/store/s3-binary-cache-store.hh
+include/nix/store/s3.hh
+include/nix/store/serve-protocol-connection.hh
+include/nix/store/serve-protocol-impl.hh
+include/nix/store/serve-protocol.hh
+include/nix/store/sqlite.hh
+include/nix/store/ssh-store.hh
+include/nix/store/ssh.hh
+include/nix/store/store-api.hh
+include/nix/store/store-cast.hh
+include/nix/store/store-dir-config.hh
+include/nix/store/store-open.hh
+include/nix/store/store-reference.hh
+include/nix/store/store-registration.hh
+include/nix/store/uds-remote-store.hh
+include/nix/store/user-lock.hh
+include/nix/store/worker-protocol-connection.hh
+include/nix/store/worker-protocol-impl.hh
+include/nix/store/worker-protocol.hh
+include/nix/util/abstract-setting-to-json.hh
+include/nix/util/ansicolor.hh
+include/nix/util/archive.hh
+include/nix/util/args.hh
+include/nix/util/args/root.hh
+include/nix/util/array-from-string-literal.hh
+include/nix/util/base-n.hh
+include/nix/util/base-nix-32.hh
+include/nix/util/callback.hh
+include/nix/util/canon-path.hh
+include/nix/util/checked-arithmetic.hh
+include/nix/util/chunked-vector.hh
+include/nix/util/closure.hh
+include/nix/util/comparator.hh
+include/nix/util/compression.hh
+include/nix/util/compute-levels.hh
+include/nix/util/config-global.hh
+include/nix/util/config-impl.hh
+include/nix/util/configuration.hh
+include/nix/util/current-process.hh
+include/nix/util/english.hh
+include/nix/util/environment-variables.hh
+include/nix/util/error.hh
+include/nix/util/exec.hh
+include/nix/util/executable-path.hh
+include/nix/util/exit.hh
+include/nix/util/experimental-features.hh
+include/nix/util/file-content-address.hh
+include/nix/util/file-descriptor.hh
+include/nix/util/file-path-impl.hh
+include/nix/util/file-path.hh
+include/nix/util/file-system.hh
+include/nix/util/finally.hh
+include/nix/util/fmt.hh
+include/nix/util/freebsd-jail.hh
+include/nix/util/fs-sink.hh
+include/nix/util/git.hh
+include/nix/util/hash.hh
+include/nix/util/hilite.hh
+include/nix/util/json-impls.hh
+include/nix/util/json-utils.hh
+include/nix/util/logging.hh
+include/nix/util/lru-cache.hh
+include/nix/util/memory-source-accessor.hh
+include/nix/util/monitor-fd.hh
+include/nix/util/muxable-pipe.hh
+include/nix/util/os-string.hh
+include/nix/util/pool.hh
+include/nix/util/pos-idx.hh
+include/nix/util/pos-table.hh
+include/nix/util/position.hh
+include/nix/util/posix-source-accessor.hh
+include/nix/util/processes.hh
+include/nix/util/ref.hh
+include/nix/util/regex-combinators.hh
+include/nix/util/repair-flag.hh
+include/nix/util/serialise.hh
+include/nix/util/signals-impl.hh
+include/nix/util/signals.hh
+include/nix/util/signature/local-keys.hh
+include/nix/util/signature/signer.hh
+include/nix/util/sort.hh
+include/nix/util/source-accessor.hh
+include/nix/util/source-path.hh
+include/nix/util/split.hh
+include/nix/util/std-hash.hh
+include/nix/util/strings-inline.hh
+include/nix/util/strings.hh
+include/nix/util/suggestions.hh
+include/nix/util/sync.hh
+include/nix/util/tarfile.hh
+include/nix/util/terminal.hh
+include/nix/util/thread-pool.hh
+include/nix/util/topo-sort.hh
+include/nix/util/types.hh
+include/nix/util/unix-domain-socket.hh
+include/nix/util/url-parts.hh
+include/nix/util/url.hh
+include/nix/util/users.hh
+include/nix/util/util.hh
+include/nix/util/variant-wrapper.hh
+include/nix/util/xml-writer.hh
+include/nix_api_expr.h
+include/nix_api_expr_internal.h
+include/nix_api_external.h
+include/nix_api_fetchers.h
+include/nix_api_fetchers_internal.hh
+include/nix_api_flake.h
+include/nix_api_flake_internal.hh
+include/nix_api_main.h
+include/nix_api_store.h
+include/nix_api_store_internal.h
+include/nix_api_util.h
+include/nix_api_util_internal.h
+include/nix_api_value.h
 lib/libnixcmd.so
 lib/libnixexpr.so
+lib/libnixexprc.so
 lib/libnixfetchers.so
+lib/libnixfetchersc.so
+lib/libnixflake.so
+lib/libnixflakec.so
 lib/libnixmain.so
+lib/libnixmainc.so
 lib/libnixstore.so
+lib/libnixstorec.so
 lib/libnixutil.so
+lib/libnixutilc.so
 libdata/pkgconfig/nix-cmd.pc
+libdata/pkgconfig/nix-expr-c.pc
 libdata/pkgconfig/nix-expr.pc
+libdata/pkgconfig/nix-fetchers-c.pc
+libdata/pkgconfig/nix-fetchers.pc
+libdata/pkgconfig/nix-flake-c.pc
+libdata/pkgconfig/nix-flake.pc
+libdata/pkgconfig/nix-main-c.pc
 libdata/pkgconfig/nix-main.pc
+libdata/pkgconfig/nix-store-c.pc
 libdata/pkgconfig/nix-store.pc
+libdata/pkgconfig/nix-util-c.pc
+libdata/pkgconfig/nix-util.pc
 libexec/nix/build-remote
-%%DATADIR%%/add-nixbld-users
 share/bash-completion/completions/nix
 share/fish/vendor_completions.d/nix.fish
+%%DATADIR%%/add-nixbld-users
 share/zsh/site-functions/_nix
 share/zsh/site-functions/run-help-nix
 %%PORTDOCS%%%%DOCSDIR%%/manual/.nojekyll
@ -238,11 +307,13 @@ share/zsh/site-functions/run-help-nix
 %%PORTDOCS%%%%DOCSDIR%%/manual/advanced-topics/cores-vs-jobs.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/advanced-topics/diff-hook.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/advanced-topics/distributed-builds.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/advanced-topics/eval-profiler.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/advanced-topics/index.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/advanced-topics/post-build-hook.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/architecture/architecture.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/ayu-highlight.css
 %%PORTDOCS%%%%DOCSDIR%%/manual/book.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/c-api.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/clipboard.min.js
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/conf-file.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/env-common.html
@ -268,6 +339,8 @@ share/zsh/site-functions/run-help-nix
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-derivation.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-develop.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-edit.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-env-shell.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-env.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-eval.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-flake-archive.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-flake-check.html
@ -277,11 +350,15 @@ share/zsh/site-functions/run-help-nix
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-flake-lock.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-flake-metadata.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-flake-new.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-flake-prefetch-inputs.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-flake-prefetch.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-flake-show.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-flake-update.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-flake.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-fmt.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-formatter-build.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-formatter-run.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-formatter.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-hash-convert.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-hash-file.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-hash-path.html
@ -303,9 +380,9 @@ share/zsh/site-functions/run-help-nix
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-nar.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-path-info.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-print-dev-env.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-profile-add.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-profile-diff-closures.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-profile-history.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-profile-install.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-profile-list.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-profile-remove.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-profile-rollback.html
@ -322,7 +399,6 @@ share/zsh/site-functions/run-help-nix
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-repl.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-run.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-search.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-shell.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-store-add-file.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-store-add-path.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-store-add.html
@ -338,7 +414,6 @@ share/zsh/site-functions/run-help-nix
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-store-make-content-addressed.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-store-optimise.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-store-path-from-hash-part.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-store-ping.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-store-prefetch-file.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-store-repair.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-store-sign.html
@ -390,18 +465,23 @@ share/zsh/site-functions/run-help-nix
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/nix-store/verify.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/opt-common.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/utilities.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/contributing/cli-guideline.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/contributing/cxx.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/contributing/documentation.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/contributing/experimental-features.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/contributing/hacking.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/contributing/index.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/contributing/testing.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/xp-features.json
 %%PORTDOCS%%%%DOCSDIR%%/manual/css/chrome.css
 %%PORTDOCS%%%%DOCSDIR%%/manual/css/general.css
 %%PORTDOCS%%%%DOCSDIR%%/manual/css/print.css
 %%PORTDOCS%%%%DOCSDIR%%/manual/css/variables.css
 %%PORTDOCS%%%%DOCSDIR%%/manual/custom.css
+%%PORTDOCS%%%%DOCSDIR%%/manual/development/benchmarking.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/development/building.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/development/cli-guideline.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/development/contributing.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/development/cxx.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/development/debugging.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/development/documentation.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/development/experimental-features.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/development/index.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/development/json-guideline.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/development/testing.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/elasticlunr.min.js
 %%PORTDOCS%%%%DOCSDIR%%/manual/favicon.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/favicon.svg
@ -440,33 +520,38 @@ share/zsh/site-functions/run-help-nix
 %%PORTDOCS%%%%DOCSDIR%%/manual/installation/uninstall.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/installation/upgrading.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/introduction.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/json/derivation.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/json/index.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/json/store-object-info.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/language/advanced-attributes.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/language/builtin-constants.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/language/builtins.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/language/constructs.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/language/constructs/lookup-path.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/language/derivations.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/language/evaluation.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/language/identifiers.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/language/import-from-derivation.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/language/index.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/language/operators.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/language/scope.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/language/string-context.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/language/string-interpolation.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/language/values.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/language/string-literals.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/language/syntax.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/language/types.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/language/variables.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/mark.min.js
 %%PORTDOCS%%%%DOCSDIR%%/manual/package-management/binary-cache-substituter.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/package-management/copy-closure.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/package-management/garbage-collection.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/package-management/garbage-collector-roots.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/package-management/index.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/package-management/profiles.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/package-management/s3-substituter.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/package-management/sharing-packages.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/package-management/ssh-substituter.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/print.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/protocols/derivation-aterm.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/protocols/index.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/protocols/json/derivation.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/protocols/json/index.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/protocols/json/store-object-info.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/protocols/nix-archive.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/protocols/store-path.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/protocols/tarball-fetcher.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/quick-start.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/redirects.js
@ -516,22 +601,41 @@ share/zsh/site-functions/run-help-nix
 %%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.19.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.2.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.20.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.21.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.22.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.23.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.24.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.25.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.26.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.27.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.28.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.29.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.3.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.30.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.31.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.4.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.5.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.6.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.7.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.8.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.9.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-next.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/searcher.js
 %%PORTDOCS%%%%DOCSDIR%%/manual/searchindex.js
-%%PORTDOCS%%%%DOCSDIR%%/manual/searchindex.json
+%%PORTDOCS%%%%DOCSDIR%%/manual/store/building.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/store/derivation/index.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/store/derivation/outputs/content-address.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/store/derivation/outputs/index.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/store/derivation/outputs/input-address.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/store/file-system-object.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/store/file-system-object/content-address.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/store/index.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/store/store-object.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/store/store-object/content-address.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/store/store-path.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/store/types/dummy-store.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/store/types/experimental-ssh-store-with-filesytem-mounted.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/store/types/experimental-local-overlay-store.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/store/types/experimental-ssh-store-with-filesystem-mounted.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/store/types/experimental-ssh-store.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/store/types/http-binary-cache-store.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/store/types/index.html
@ -598,6 +702,7 @@ share/zsh/site-functions/run-help-nix
 %%PORTDOCS%%share/man/man1/nix3-derivation.1.gz
 %%PORTDOCS%%share/man/man1/nix3-develop.1.gz
 %%PORTDOCS%%share/man/man1/nix3-edit.1.gz
+%%PORTDOCS%%share/man/man1/nix3-env-shell.1.gz
 %%PORTDOCS%%share/man/man1/nix3-eval.1.gz
 %%PORTDOCS%%share/man/man1/nix3-flake-archive.1.gz
 %%PORTDOCS%%share/man/man1/nix3-flake-check.1.gz
@ -626,7 +731,6 @@ share/zsh/site-functions/run-help-nix
 %%PORTDOCS%%share/man/man1/nix3-key-generate-secret.1.gz
 %%PORTDOCS%%share/man/man1/nix3-key.1.gz
 %%PORTDOCS%%share/man/man1/nix3-log.1.gz
-%%PORTDOCS%%share/man/man1/nix3-manpages.gz
 %%PORTDOCS%%share/man/man1/nix3-nar-cat.1.gz
 %%PORTDOCS%%share/man/man1/nix3-nar-dump-path.1.gz
 %%PORTDOCS%%share/man/man1/nix3-nar-ls.1.gz
@ -634,9 +738,9 @@ share/zsh/site-functions/run-help-nix
 %%PORTDOCS%%share/man/man1/nix3-nar.1.gz
 %%PORTDOCS%%share/man/man1/nix3-path-info.1.gz
 %%PORTDOCS%%share/man/man1/nix3-print-dev-env.1.gz
+%%PORTDOCS%%share/man/man1/nix3-profile-add.1.gz
 %%PORTDOCS%%share/man/man1/nix3-profile-diff-closures.1.gz
 %%PORTDOCS%%share/man/man1/nix3-profile-history.1.gz
-%%PORTDOCS%%share/man/man1/nix3-profile-install.1.gz
 %%PORTDOCS%%share/man/man1/nix3-profile-list.1.gz
 %%PORTDOCS%%share/man/man1/nix3-profile-remove.1.gz
 %%PORTDOCS%%share/man/man1/nix3-profile-rollback.1.gz
@ -653,7 +757,6 @@ share/zsh/site-functions/run-help-nix
 %%PORTDOCS%%share/man/man1/nix3-repl.1.gz
 %%PORTDOCS%%share/man/man1/nix3-run.1.gz
 %%PORTDOCS%%share/man/man1/nix3-search.1.gz
-%%PORTDOCS%%share/man/man1/nix3-shell.1.gz
 %%PORTDOCS%%share/man/man1/nix3-store-add-file.1.gz
 %%PORTDOCS%%share/man/man1/nix3-store-add-path.1.gz
 %%PORTDOCS%%share/man/man1/nix3-store-add.1.gz
@ -669,7 +772,6 @@ share/zsh/site-functions/run-help-nix
 %%PORTDOCS%%share/man/man1/nix3-store-make-content-addressed.1.gz
 %%PORTDOCS%%share/man/man1/nix3-store-optimise.1.gz
 %%PORTDOCS%%share/man/man1/nix3-store-path-from-hash-part.1.gz
-%%PORTDOCS%%share/man/man1/nix3-store-ping.1.gz
 %%PORTDOCS%%share/man/man1/nix3-store-prefetch-file.1.gz
 %%PORTDOCS%%share/man/man1/nix3-store-repair.1.gz
 %%PORTDOCS%%share/man/man1/nix3-store-sign.1.gz
@ -680,4 +782,3 @@ share/zsh/site-functions/run-help-nix
 %%PORTDOCS%%share/man/man5/nix-profiles.5.gz
 %%PORTDOCS%%share/man/man5/nix.conf.5.gz
 %%PORTDOCS%%share/man/man8/nix-daemon.8.gz
-%%PORTDOCS%%@dir %%DOCSDIR%%/manual/store/types.tmp