[packages/nix] - up to 2.35.2

Sun Oct 4 12:15:38 CEST 2026

commit 4f867f8d5815b67635bcb0eeeb355d520063e25b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Oct 4 12:16:04 2026 +0200

    - up to 2.35.2

 nix-fix_nix_DIR_in_doc_local_mk.patch |  64 -------
 nix-ldflags.patch                     |  10 -
 nix-link.patch                        |   8 -
 nix-paths.patch                       |  21 ++-
 nix-sh.patch                          |  30 ---
 nix.spec                              | 335 ++++++++++++++++++++++++++--------
 6 files changed, 268 insertions(+), 200 deletions(-)
---

diff --git a/nix.spec b/nix.spec
index 0a7a4d0..f150338 100644
--- a/nix.spec
+++ b/nix.spec
@@ -1,62 +1,71 @@
+# TODO: json-schema-checks under tests bcond? (BR: jv from jsonschema)
 #
 # Conditional build:
-%bcond_with	perl	# Perl module (needs update: uses C++11, while main libs need C++17 now)
+%bcond_with	s3	# S3 AWS auth support
 
 Summary:	A purely functional package manager
 Summary(pl.UTF-8):	Czysto funkcyjny zarządca pakietów
 Name:		nix
-Version:	2.14.1
+Version:	2.35.2
 Release:	0.1
 License:	LGPL v2.1+
 Group:		Applications/System
 #Source0Download: https://github.com/NixOS/nix/tags
 Source0:	https://github.com/NixOS/nix/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	a132c8cf9a246c6ceecb8625163beff0
-Patch0:		%{name}-sh.patch
+# Source0-md5:	0a03af3b164ead26aeff9cd431de6a8f
 Patch1:		%{name}-paths.patch
-Patch2:		%{name}-ldflags.patch
-Patch3:		%{name}-link.patch
-Patch4:		%{name}-fix_nix_DIR_in_doc_local_mk.patch
 URL:		https://nixos.org/nix/
-BuildRequires:	autoconf >= 2.50
-BuildRequires:	autoconf-archive
-BuildRequires:	automake
-# TODO: aws-sdk-cpp/aws-cpp-sdk-s3 (aws/s3/S3Client.h)
+%{?with_s3:BuildRequires:	aws-c-auth-devel}
+%{?with_s3:BuildRequires:	aws-c-common-devel}
+%{?with_s3:BuildRequires:	aws-crt-cpp-devel}
 BuildRequires:	bison
+BuildRequires:	blake3-devel >= 1.8.2
 BuildRequires:	boost-devel >= 1.66
 BuildRequires:	bzip2-devel
 %{?with_perl:BuildRequires:	curl}
-BuildRequires:	curl-devel
+BuildRequires:	curl-devel >= 8.17.0
+BuildRequires:	doxygen
+# or readline with -Dlibcmd:readline-flavor=readline
 BuildRequires:	editline-devel >= 1.15.2
 BuildRequires:	flex
 BuildRequires:	gc-devel
+BuildRequires:	gmock-devel
 BuildRequires:	graphviz
 BuildRequires:	gtest-devel
 BuildRequires:	jq
 BuildRequires:	libarchive-devel >= 3.1.2
+%ifarch %{arm} ppc
+BuildRequires:	libatomic-devel
+%endif
 BuildRequires:	libbrotli-devel
-BuildRequires:	libseccomp-devel
+%ifarch %{x8664} x32
+BuildRequires:	libcpuid-devel >= 0.7.0
+%endif
+BuildRequires:	libgit2-devel >= 1.9
+BuildRequires:	libseccomp-devel >= 2.5.5
 BuildRequires:	libsodium-devel
-BuildRequires:	libstdc++-devel >= 6:7
+BuildRequires:	libstdc++-devel >= 6:11
+BuildRequires:	llvm-devel >= 16
 BuildRequires:	lowdown-devel >= 0.9.0
 BuildRequires:	lsof
 BuildRequires:	mdbook
 BuildRequires:	mdbook-linkcheck
-BuildRequires:	nlohmann-json-devel >= 3.10.5-3
-BuildRequires:	openssl-devel
-# with gtest support
-BuildRequires:	rapidcheck-devel
+BuildRequires:	meson >= 1.8
+BuildRequires:	ninja >= 1.5
+BuildRequires:	nlohmann-json-devel >= 3.12
+BuildRequires:	openssl-devel >= 1.1.1
+BuildRequires:	pkgconfig
+BuildRequires:	python3 >= 1:3
+BuildRequires:	python3-json-schema-for-humans
+# with gtest support and .pc files
+BuildRequires:	rapidcheck-devel >= 0-0.20231204
 BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpmbuild(macros) >= 1.720
-%if %{with perl}
-BuildRequires:	perl-DBI
-BuildRequires:	perl-DBD-SQLite
-BuildRequires:	perl-base >= 1:5.8.0
-%endif
 BuildRequires:	pkgconfig >= 1:0.9.0
 BuildRequires:	sqlite3-devel >= 3.6.19
-BuildRequires:	xz-devel
-Requires:	%{name}-libs = %{version}-%{release}
+BuildRequires:	toml11 >= 3.7.0
+BuildRequires:	zstd-devel >= 1.4.0
+Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 Provides:	/var/nix/manifests
 Provides:	/var/nix/profiles
 Obsoletes:	nix-emacs-mode < 2.3
@@ -64,6 +73,12 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		nixdir		/var/lib/nix
 
+# uses `assert(false)` under default switch conditions
+%define		filterout_cpp	-DNDEBUG
+
+# non-function _ZN3nix4unix14interruptCheckE symbol in libnixutil
+%define		skip_post_check_so	libnixcmd.so.* libnixexpr.so.* libnixfetchers.so.* libnixmain.so.* libnixstore.so.* 
+
 %description
 Nix is a purely functional package manager. It allows multiple
 versions of a package to be installed side-by-side, ensures that
@@ -82,6 +97,19 @@ użytkowników. Posiada też wiele innych funkcji.
 Summary:	Nix libraries
 Summary(pl.UTF-8):	Biblioteki Niksa
 Group:		Libraries
+Requires:	blake3%{?_isa} >= 1.8.2
+Requires:	curl-libs%{?_isa} >= 8.17.0
+Requires:	editline%{?_isa} >= 1.15.2
+Requires:	libarchive%{?_isa} >= 3.1.2
+%ifarch %{x8664} x32
+Requires:	libcpuid%{?_isa} >= 0.7.0
+%endif
+Requires:	libgit2%{?_isa} >= 1.9
+Requires:	libseccomp%{?_isa} >= 2.5.5
+Requires:	lowdown%{?_isa} >= 0.9.0
+Requires:	openssl%{?_isa} >= 1.1.1
+Requires:	sqlite3-libs%{?_isa} >= 3.6.19
+Requires:	zstd%{?_isa} >= 1.4.0
 
 %description libs
 Nix libraries.
@@ -93,9 +121,29 @@ Biblioteki Niksa.
 Summary:	Header files for Nix
 Summary(pl.UTF-8):	Pliki nagłówkowe Niksa
 Group:		Development/Libraries
-Requires:	%{name}-libs = %{version}-%{release}
-Requires:	gc-devel
-Requires:	libstdc++-devel >= 6:7
+Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
+%if %{with s3}
+Requires:	aws-crt-cpp-devel%{?_isa}
+%endif
+Requires:	blake3-devel%{?_isa} >= 1.8.2
+Requires:	boost-devel%{?_isa} >= 1.66
+Requires:	curl-devel%{?_isa} >= 8.17.0
+Requires:	editline-devel%{?_isa} >= 1.15.2
+Requires:	gc-devel%{?_isa}
+Requires:	libarchive-devel%{?_isa} >= 3.1.2
+Requires:	libbrotli-devel%{?_isa}
+%ifarch %{x8664} x32
+Requires:	libcpuid-devel%{?_isa} >= 0.7.0
+%endif
+Requires:	libgit2-devel%{?_isa} >= 1.9
+Requires:	libseccomp-devel%{?_isa} >= 2.5.5
+Requires:	libsodium-devel%{?_isa}
+Requires:	libstdc++-devel%{?_isa} >= 6:11
+Requires:	lowdown-devel%{?_isa} >= 0.9.0
+Requires:	nlohmann-json-devel%{?_isa} >= 3.12
+Requires:	openssl-devel%{?_isa} >= 1.1.1
+Requires:	sqlite3-devel%{?_isa} >= 3.6.19
+Requires:	zstd-devel%{?_isa} >= 1.4.0
 
 %description devel
 Header files for Nix.
@@ -103,6 +151,71 @@ Header files for Nix.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe Niksa.
 
+%package static
+Summary:	Static Nix libraries
+Summary(pl.UTF-8):	Statyczne biblioteki Niksa
+Group:		Development/Libraries
+Requires:	%{name}-devel%{?_isa} = %{version}-%{release}
+
+%description static
+Static Nix libraries.
+
+%description static -l pl.UTF-8
+Statyczne biblioteki Niksa.
+
+%package test-libs
+Summary:	Nix test libraries
+Summary(pl.UTF-8):	Biblioteki testowe Niksa
+Group:		Libraries
+Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
+
+%description test-libs
+Nix test libraries.
+
+%description test-libs -l pl.UTF-8
+Biblioteki testowe Niksa.
+
+%package test-devel
+Summary:	Development files for Nix test libraries
+Summary(pl.UTF-8):	Pliki programistyczne bibliotek testowych Niksa
+Group:		Development/Libraries
+Requires:	%{name}-devel%{?_isa} = %{version}-%{release}
+Requires:	%{name}-test-libs%{?_isa} = %{version}-%{release}
+# libLLVM for nix-clang-tidy plugin
+Requires:	llvm-devel%{?_isa} >= 16
+Requires:	rapidcheck-devel%{?_isa} >= 0-0.20231204
+Requires:	gtest-devel%{?_isa}
+
+%description test-devel
+Development files for Nix test libraries.
+
+%description test-devel -l pl.UTF-8
+Pliki programistyczne bibliotek testowych Niksa.
+
+%package test-static
+Summary:	Static Nix test libraries
+Summary(pl.UTF-8):	Statyczne biblioteki testowe Niksa
+Group:		Development/Libraries
+Requires:	%{name}-test-devel%{?_isa} = %{version}-%{release}
+
+%description test-static
+Static Nix test libraries.
+
+%description test-static -l pl.UTF-8
+Statyczne biblioteki testowe Niksa.
+
+%package apidocs
+Summary:	API documentation for Nix
+Summary(pl.UTF-8):	Dokumentacja API Niksa
+Group:		Documentation
+BuildArch:	noarch
+
+%description apidocs
+API documentation for Nix.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API Niksa.
+
 %package -n bash-completion-nix
 Summary:	Bash completion for nix commands
 Summary(pl.UTF-8):	Dopełnianie parametrów w bashu dla poleceń nix
@@ -147,69 +260,52 @@ Dopełnianie parametrów w zsh dla poleceń nix.
 
 %prep
 %setup -q
-%patch -P0 -p1
 %patch -P1 -p1
-%patch -P2 -p1
-%patch -P3 -p1
-%patch -P4 -p1
 
 %build
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%configure \
+%meson \
 	--localstatedir=%{nixdir}/var \
-	--with-store-dir=%{nixdir}/store
-
-# avoid BOOST_LDFLAGS=-L%{_libdir} which causes to link with system nix libraries instead of built ones
-%{__make} \
-	BOOST_LDFLAGS="" \
-	GLOBAL_CXXFLAGS="%{rpmcxxflags} -Wall -include config.h -std=c++17 -I src -fPIC" \
-	GLOBAL_LDFLAGS="%{rpmldflags}" \
-	V=1
-
-%if %{with perl}
-ln -sf nix src/nix/nix-instantiate
-topdir=$(pwd)
-cd perl
-%configure \
-	NIX_CFLAGS="-I$topdir/src/libstore -I$topdir/src/libutil" \
-	NIX_LIBS="-L$topdir/src/libstore -lnixstore" \
-	NIX_INSTANTIATE_PROGRAM="$topdir/src/nix/nix-instantiate"
-
-%{__make} \
-	V=1
+	-Ddoc-gen=true \
+	-Djson-schema-checks=false \
+	-Dlibcmd:markdown=enabled \
+	-Dlibexpr:gc=enabled \
+	-Dlibstore:log-dir=%{nixdir}/var/log/nix \
+	-Dlibstore:s3-aws-auth=%{__enabled_disabled s3} \
+	-Dlibstore:seccomp-sandboxing=enabled \
+	-Dlibstore:store-dir=%{nixdir}/store \
+%ifarch %{x8664}
+	-Dlibutil:cpuid=enabled \
 %endif
+	-Dnix:mimalloc=disabled \
+	-Dnix:profile-dir=/etc/profile.d
+
+# -Dplugin-c-api=true ?
+
+%meson_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	BOOST_LDFLAGS="" \
-	DESTDIR=$RPM_BUILD_ROOT \
-	V=1
-
-%if %{with perl}
-%{__make} -C perl install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	V=1
-%endif
+%meson_install
 
 install -d $RPM_BUILD_ROOT%{nixdir}/{store,var/nix/{gcroots,profiles}/per-user}
 
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/nix3-manpages
-# dead upstart stuff
-%{__rm} -r $RPM_BUILD_ROOT/etc/init
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
+
+%post	test-libs -p /sbin/ldconfig
+%postun	test-libs -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc README.md
 %attr(755,root,root) %{_bindir}/nix*
-%dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libdir}/%{name}/build-remote
+%attr(755,root,root) %{_libexecdir}/nix-nswrapper
+%dir %{_libexecdir}/nix
+%attr(755,root,root) %{_libexecdir}/nix/build-remote
 %{systemdunitdir}/nix-daemon.service
 %{systemdunitdir}/nix-daemon.socket
 %{systemdtmpfilesdir}/nix-daemon.conf
@@ -229,26 +325,109 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/nix-*.1*
 %{_mandir}/man1/nix3-*.1*
 %{_mandir}/man5/nix.conf.5*
+%{_mandir}/man5/nix-profiles.5*
 %{_mandir}/man8/nix-daemon.8*
 %dir %{_docdir}/nix
 %{_docdir}/nix/manual
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libnixcmd.so
-%attr(755,root,root) %{_libdir}/libnixexpr.so
-%attr(755,root,root) %{_libdir}/libnixfetchers.so
-%attr(755,root,root) %{_libdir}/libnixmain.so
-%attr(755,root,root) %{_libdir}/libnixstore.so
-%attr(755,root,root) %{_libdir}/libnixutil.so
+%{_libdir}/libnixcmd.so.*.*.*
+%{_libdir}/libnixexpr.so.*.*.*
+%{_libdir}/libnixexprc.so.*.*.*
+%{_libdir}/libnixfetchers.so.*.*.*
+%{_libdir}/libnixfetchersc.so.*.*.*
+%{_libdir}/libnixflake.so.*.*.*
+%{_libdir}/libnixflakec.so.*.*.*
+%{_libdir}/libnixmain.so.*.*.*
+%{_libdir}/libnixmainc.so.*.*.*
+%{_libdir}/libnixstore.so.*.*.*
+%{_libdir}/libnixstorec.so.*.*.*
+%{_libdir}/libnixutil.so.*.*.*
+%{_libdir}/libnixutilc.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)
+%{_libdir}/libnixcmd.so
+%{_libdir}/libnixexpr.so
+%{_libdir}/libnixexprc.so
+%{_libdir}/libnixfetchers.so
+%{_libdir}/libnixfetchersc.so
+%{_libdir}/libnixflake.so
+%{_libdir}/libnixflakec.so
+%{_libdir}/libnixmain.so
+%{_libdir}/libnixmainc.so
+%{_libdir}/libnixstore.so
+%{_libdir}/libnixstorec.so
+%{_libdir}/libnixutil.so
+%{_libdir}/libnixutilc.so
 %{_includedir}/nix
+%exclude %{_includedir}/nix/expr/tests
+%exclude %{_includedir}/nix/store/tests
+%exclude %{_includedir}/nix/util/tests
+%{_includedir}/nix_api_store
+%{_includedir}/nix_api_*.h
+%{_includedir}/nix_api_*.hh
 %{_pkgconfigdir}/nix-cmd.pc
 %{_pkgconfigdir}/nix-expr.pc
+%{_pkgconfigdir}/nix-expr-c.pc
+%{_pkgconfigdir}/nix-fetchers.pc
+%{_pkgconfigdir}/nix-fetchers-c.pc
+%{_pkgconfigdir}/nix-flake.pc
+%{_pkgconfigdir}/nix-flake-c.pc
 %{_pkgconfigdir}/nix-main.pc
+%{_pkgconfigdir}/nix-main-c.pc
 %{_pkgconfigdir}/nix-store.pc
+%{_pkgconfigdir}/nix-store-c.pc
+%{_pkgconfigdir}/nix-util.pc
+%{_pkgconfigdir}/nix-util-c.pc
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libnixcmd.a
+%{_libdir}/libnixexpr.a
+%{_libdir}/libnixexprc.a
+%{_libdir}/libnixfetchers.a
+%{_libdir}/libnixfetchersc.a
+%{_libdir}/libnixflake.a
+%{_libdir}/libnixflakec.a
+%{_libdir}/libnixmain.a
+%{_libdir}/libnixmainc.a
+%{_libdir}/libnixstore.a
+%{_libdir}/libnixstorec.a
+%{_libdir}/libnixutil.a
+%{_libdir}/libnixutilc.a
+
+%files test-libs
+%defattr(644,root,root,755)
+%{_libdir}/libnix-clang-tidy.so
+%{_libdir}/libnix-expr-test-support.so.*.*.*
+%{_libdir}/libnix-store-test-support.so.*.*.*
+%{_libdir}/libnix-util-test-support.so.*.*.*
+
+%files test-devel
+%defattr(644,root,root,755)
+%{_libdir}/libnix-expr-test-support.so
+%{_libdir}/libnix-store-test-support.so
+%{_libdir}/libnix-util-test-support.so
+%{_includedir}/nix/expr/tests
+%{_includedir}/nix/store/tests
+%{_includedir}/nix/util/tests
+%{_pkgconfigdir}/nix-clang-tidy.pc
+%{_pkgconfigdir}/nix-expr-test-support.pc
+%{_pkgconfigdir}/nix-store-test-support.pc
+%{_pkgconfigdir}/nix-util-test-support.pc
+
+%files test-static
+%defattr(644,root,root,755)
+%{_libdir}/libnix-expr-test-support.a
+%{_libdir}/libnix-store-test-support.a
+%{_libdir}/libnix-util-test-support.a
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_docdir}/nix/external-api
+%{_docdir}/nix/internal-api
 
 %files -n bash-completion-nix
 %defattr(644,root,root,755)
diff --git a/nix-fix_nix_DIR_in_doc_local_mk.patch b/nix-fix_nix_DIR_in_doc_local_mk.patch
deleted file mode 100644
index 8a9054b..0000000
--- a/nix-fix_nix_DIR_in_doc_local_mk.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Subject: Fix build phase depending on installed binary
-Author: Thomas Koch <thomas at koch.ro>
-Bug: https://github.com/NixOS/nix/issues/5781
-Forwarded: https://github.com/NixOS/nix/pull/6015
-
---- a/doc/manual/local.mk
-+++ b/doc/manual/local.mk
-@@ -24,7 +24,7 @@ dummy-env = env -i \
- 	NIX_STATE_DIR=/dummy \
- 	NIX_CONFIG='cores = 0'
- 
--nix-eval = $(dummy-env) $(bindir)/nix eval --experimental-features nix-command -I nix/corepkgs=corepkgs --store dummy:// --impure --raw
-+nix-eval = $(dummy-env) $(nix_DIR)/nix eval --experimental-features nix-command -I nix/corepkgs=corepkgs --store dummy:// --impure --raw
- 
- $(d)/%.1: $(d)/src/command-ref/%.md
- 	@printf "Title: %s\n\n" "$$(basename $@ .1)" > $^.tmp
-@@ -48,29 +48,29 @@ $(d)/src/SUMMARY.md: $(d)/src/SUMMARY.md
- 	$(trace-gen) cat doc/manual/src/SUMMARY.md.in | while IFS= read line; do if [[ $$line = @manpages@ ]]; then cat doc/manual/src/command-ref/new-cli/SUMMARY.md; else echo "$$line"; fi; done > $@.tmp
- 	@mv $@.tmp $@
- 
--$(d)/src/command-ref/new-cli: $(d)/nix.json $(d)/generate-manpage.nix $(bindir)/nix
-+$(d)/src/command-ref/new-cli: $(d)/nix.json $(d)/generate-manpage.nix $(nix_DIR)/nix
- 	@rm -rf $@
- 	$(trace-gen) $(nix-eval) --write-to $@.tmp --expr 'import doc/manual/generate-manpage.nix { toplevel = builtins.readFile $<; }'
- 	@# @docroot@: https://nixos.org/manual/nix/unstable/contributing/hacking.html#docroot-variable
- 	$(trace-gen) sed -i $@.tmp/*.md -e 's^@docroot@^../..^g'
- 	@mv $@.tmp $@
- 
--$(d)/src/command-ref/conf-file.md: $(d)/conf-file.json $(d)/generate-options.nix $(d)/src/command-ref/conf-file-prefix.md $(bindir)/nix
-+$(d)/src/command-ref/conf-file.md: $(d)/conf-file.json $(d)/generate-options.nix $(d)/src/command-ref/conf-file-prefix.md $(nix_DIR)/nix
- 	@cat doc/manual/src/command-ref/conf-file-prefix.md > $@.tmp
- 	@# @docroot@: https://nixos.org/manual/nix/unstable/contributing/hacking.html#docroot-variable
- 	$(trace-gen) $(nix-eval) --expr 'import doc/manual/generate-options.nix (builtins.fromJSON (builtins.readFile $<))' \
- 	  | sed -e 's^@docroot@^..^g'>> $@.tmp
- 	@mv $@.tmp $@
- 
--$(d)/nix.json: $(bindir)/nix
--	$(trace-gen) $(dummy-env) $(bindir)/nix __dump-args > $@.tmp
-+$(d)/nix.json: $(nix_DIR)/nix
-+	$(trace-gen) $(dummy-env) $(nix_DIR)/nix __dump-args > $@.tmp
- 	@mv $@.tmp $@
- 
--$(d)/conf-file.json: $(bindir)/nix
--	$(trace-gen) $(dummy-env) $(bindir)/nix show-config --json --experimental-features nix-command > $@.tmp
-+$(d)/conf-file.json: $(nix_DIR)/nix
-+	$(trace-gen) $(dummy-env) $(nix_DIR)/nix show-config --json --experimental-features nix-command > $@.tmp
- 	@mv $@.tmp $@
- 
--$(d)/src/language/builtins.md: $(d)/builtins.json $(d)/generate-builtins.nix $(d)/src/language/builtins-prefix.md $(bindir)/nix
-+$(d)/src/language/builtins.md: $(d)/builtins.json $(d)/generate-builtins.nix $(d)/src/language/builtins-prefix.md $(nix_DIR)/nix
- 	@cat doc/manual/src/language/builtins-prefix.md > $@.tmp
- 	@# @docroot@: https://nixos.org/manual/nix/unstable/contributing/hacking.html#docroot-variable
- 	$(trace-gen) $(nix-eval) --expr 'import doc/manual/generate-builtins.nix (builtins.fromJSON (builtins.readFile $<))' \
-@@ -78,8 +78,8 @@ $(d)/src/language/builtins.md: $(d)/buil
- 	@cat doc/manual/src/language/builtins-suffix.md >> $@.tmp
- 	@mv $@.tmp $@
- 
--$(d)/builtins.json: $(bindir)/nix
--	$(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs $(bindir)/nix __dump-builtins > $@.tmp
-+$(d)/builtins.json: $(nix_DIR)/nix
-+	$(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs $(nix_DIR)/nix __dump-builtins > $@.tmp
- 	@mv $@.tmp $@
- 
- # Generate the HTML manual.
diff --git a/nix-ldflags.patch b/nix-ldflags.patch
deleted file mode 100644
index 8e87201..0000000
--- a/nix-ldflags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- nix-2.9.2/configure.ac.orig	2021-03-13 17:10:59.748579291 +0100
-+++ nix-2.9.2/configure.ac	2021-03-13 19:03:22.665383108 +0100
-@@ -132,7 +132,6 @@ AC_SUBST(storedir)
- AX_BOOST_BASE([1.66], [CXXFLAGS="$BOOST_CPPFLAGS $CXXFLAGS"], [AC_MSG_ERROR([Nix requires boost.])])
- # For unknown reasons, setting this directly in the ACTION-IF-FOUND above
- # ends up with LDFLAGS being empty, so we set it afterwards.
--LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"
- 
- # On some platforms, new-style atomics need a helper library
- AC_MSG_CHECKING(whether -latomic is needed)
diff --git a/nix-link.patch b/nix-link.patch
deleted file mode 100644
index 3610580..0000000
--- a/nix-link.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- nix-2.14.1/src/libexpr/tests/local.mk.orig	2023-03-02 00:24:44.000000000 +0100
-+++ nix-2.14.1/src/libexpr/tests/local.mk	2023-04-02 21:38:17.553805363 +0200
-@@ -16,4 +16,4 @@ libexpr-tests_CXXFLAGS += -I src/libexpr
- 
- libexpr-tests_LIBS = libstore-tests libutils-tests libexpr libutil libstore libfetchers
- 
--libexpr-tests_LDFLAGS := $(GTEST_LIBS) -lgmock
-+libexpr-tests_LDFLAGS := -lrapidcheck $(GTEST_LIBS) -lgmock
diff --git a/nix-paths.patch b/nix-paths.patch
index cba6bf7..8333782 100644
--- a/nix-paths.patch
+++ b/nix-paths.patch
@@ -1,10 +1,11 @@
---- nix-2.9.2/misc/systemd/local.mk.orig	2022-07-04 11:48:18.334153925 +0200
-+++ nix-2.9.2/misc/systemd/local.mk	2022-07-04 16:55:51.821491895 +0200
-@@ -1,6 +1,6 @@
- ifdef HOST_LINUX
- 
--  $(foreach n, nix-daemon.socket nix-daemon.service, $(eval $(call install-file-in, $(d)/$(n), $(prefix)/lib/systemd/system, 0644)))
-+  $(foreach n, nix-daemon.socket nix-daemon.service, $(eval $(call install-file-in, $(d)/$(n), /lib/systemd/system, 0644)))
-   $(foreach n, nix-daemon.conf, $(eval $(call install-file-in, $(d)/$(n), $(prefix)/lib/tmpfiles.d, 0644)))
- 
-   clean-files += $(d)/nix-daemon.socket $(d)/nix-daemon.service $(d)/nix-daemon.conf
+--- nix-2.35.2/misc/systemd/meson.build.orig	2026-08-12 23:09:18.000000000 +0200
++++ nix-2.35.2/misc/systemd/meson.build	2026-09-24 21:16:34.129078070 +0200
+@@ -3,7 +3,7 @@ foreach config : [ 'nix-daemon.socket',
+     input : config + '.in',
+     output : config,
+     install : true,
+-    install_dir : get_option('prefix') / 'lib/systemd/system',
++    install_dir : '/lib/systemd/system',
+     install_mode : 'rw-r--r--',
+     configuration : {
+       'storedir' : store_dir,
diff --git a/nix-sh.patch b/nix-sh.patch
deleted file mode 100644
index dcf2686..0000000
--- a/nix-sh.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- nix-2.9.2/configure.ac.orig	2022-07-04 22:48:50.076117019 +0200
-+++ nix-2.9.2/configure.ac	2022-07-05 21:31:45.863099554 +0200
-@@ -259,10 +259,10 @@ AC_SUBST(ENABLE_S3, [$enable_s3])
- AC_LANG_POP(C++)
- 
- if test -n "$enable_s3"; then
--  declare -a aws_version_tokens=($(printf '#include <aws/core/VersionConfig.h>\nAWS_SDK_VERSION_STRING' | $CPP $CPPFLAGS - | grep -v '^#.*' | sed 's/"//g' | tr '.' ' '))
--  AC_DEFINE_UNQUOTED([AWS_VERSION_MAJOR], ${aws_version_tokens@<:@0@:>@}, [Major version of aws-sdk-cpp.])
--  AC_DEFINE_UNQUOTED([AWS_VERSION_MINOR], ${aws_version_tokens@<:@1@:>@}, [Minor version of aws-sdk-cpp.])
--  AC_DEFINE_UNQUOTED([AWS_VERSION_PATCH], ${aws_version_tokens@<:@2@:>@}, [Patch version of aws-sdk-cpp.])
-+  aws_version="$(printf '#include <aws/core/VersionConfig.h>\nAWS_SDK_VERSION_STRING' | $CPP $CPPFLAGS - | grep -v '^#.*' | sed 's/"//g')"
-+  AC_DEFINE_UNQUOTED([AWS_VERSION_MAJOR], $(echo "$aws_version" | cut -d. -f1), [Major version of aws-sdk-cpp.])
-+  AC_DEFINE_UNQUOTED([AWS_VERSION_MINOR], $(echo "$aws_version" | cut -d. -f2), [Minor version of aws-sdk-cpp.])
-+  AC_DEFINE_UNQUOTED([AWS_VERSION_PATCH], $(echo "$aws_version" | cut -d. -f3), [Patch version of aws-sdk-cpp.])
- fi
- 
- 
-@@ -309,9 +309,9 @@ fi
- test "$prefix" = NONE && prefix=$ac_default_prefix
- test "$exec_prefix" = NONE && exec_prefix='${prefix}'
- for name in $ac_subst_vars; do
--    declare $name="$(eval echo "${!name}")"
--    declare $name="$(eval echo "${!name}")"
--    declare $name="$(eval echo "${!name}")"
-+    eval $name=\"$(eval echo "\${$name}")\"
-+    eval $name=\"$(eval echo "\${$name}")\"
-+    eval $name=\"$(eval echo "\${$name}")\"
- done
- 
- rm -f Makefile.config
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nix.git/commitdiff/4f867f8d5815b67635bcb0eeeb355d520063e25b

