Attachment #245361 for bug #269637

Lines 1-9 Link Here

(-)b/sysutils/nix/Makefile (-63 / +60 lines)
1	PORTNAME= nix	1	PORTNAME= nix
2	DISTVERSION= 2.3.11	2	DISTVERSION= 2.13.2
3	PORTREVISION= 3
4	CATEGORIES= sysutils	3	CATEGORIES= sysutils
5	PATCH_SITES= https://github.com/NixOS/nix/commit/
6	PATCHFILES= 7c112351d9e941567e64063638396259546d9a48.patch:-p1 # libutil: EPERM from kill(-1, ...) is fine #4530
7		4
8	MAINTAINER= ports@FreeBSD.org	5	MAINTAINER= ports@FreeBSD.org
9	COMMENT= Purely functional package manager	6	COMMENT= Purely functional package manager
Lines 12-24 WWW= https://nixos.org/nix/ Link Here
12	LICENSE= LGPL21	9	LICENSE= LGPL21
13	LICENSE_FILE= ${WRKSRC}/COPYING	10	LICENSE_FILE= ${WRKSRC}/COPYING
14		11
15	BROKEN= undefined symbol: Aws::Crt::ByteCursorFromArray
16
17	BUILD_DEPENDS= ${LOCALBASE}/share/aclocal/ax_cxx_compile_stdcxx.m4:devel/autoconf-archive \	12	BUILD_DEPENDS= ${LOCALBASE}/share/aclocal/ax_cxx_compile_stdcxx.m4:devel/autoconf-archive \
18	bash:shells/bash \	13	bash:shells/bash \
19	docbook-xsl-ns>=0:textproc/docbook-xsl-ns \	14	docbook-xsl-ns>=0:textproc/docbook-xsl-ns \
20	gnustat:sysutils/coreutils \	15	gnustat:sysutils/coreutils \
21	grealpath:sysutils/coreutils \	16	grealpath:sysutils/coreutils \
		17	mdbook-linkcheck:textproc/mdbook-linkcheck \
		18	mdbook:textproc/mdbook \
22	xmllint:textproc/libxml2 \	19	xmllint:textproc/libxml2 \
23	xsltproc:textproc/libxslt	20	xsltproc:textproc/libxslt
24	LIB_DEPENDS= libaws-cpp-sdk-core.so:devel/aws-sdk-cpp \	21	LIB_DEPENDS= libaws-cpp-sdk-core.so:devel/aws-sdk-cpp \
Lines 27-60 LIB_DEPENDS= libaws-cpp-sdk-core.so:devel/aws-sdk-cpp \ Link Here
27	libcurl.so:ftp/curl \	24	libcurl.so:ftp/curl \
28	libeditline.so:devel/editline \	25	libeditline.so:devel/editline \
29	libgc.so:devel/boehm-gc \	26	libgc.so:devel/boehm-gc \
		27	liblowdown.so:textproc/lowdown \
30	libsodium.so:security/libsodium	28	libsodium.so:security/libsodium
31	TEST_DEPENDS= dot:graphics/graphviz \	29	TEST_DEPENDS= dot:graphics/graphviz \
32	git:devel/git \	30	git:devel/git \
33	gxargs:misc/findutils \
34	hg:devel/mercurial	31	hg:devel/mercurial
35		32
36	USES= autoreconf bison compiler:c++17-lang cpe gmake localbase pkgconfig \	33	USES= autoreconf bison compiler:c++17-lang cpe gmake localbase \
37	sqlite:3 ssl	34	pkgconfig sqlite:3 ssl
		35	CPE_VENDOR= nix_project
38	USE_GITHUB= yes	36	USE_GITHUB= yes
39	GH_ACCOUNT= NixOS	37	GH_ACCOUNT= NixOS
40	USE_LDCONFIG= yes	38	USE_LDCONFIG= yes
41		39
42	CPE_VENDOR= nix_project	40	GNU_CONFIGURE= yes
43		41	GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
44	HAS_CONFIGURE= yes
45	# Workaround for bashisms in the configure script.	42	# Workaround for bashisms in the configure script.
46	CONFIGURE_SHELL= ${_BASH}	43	CONFIGURE_SHELL= ${_BASH}
47	CONFIGURE_ARGS= --disable-seccomp-sandboxing \	44	CONFIGURE_ARGS= --disable-seccomp-sandboxing \
48	--enable-gc	45	--enable-gc
49	CONFIGURE_ENV= OPENSSL_CFLAGS="-I ${OPENSSLINC}" \	46	CONFIGURE_ENV= OPENSSL_CFLAGS="-I ${OPENSSLINC}" \
50	OPENSSL_LIBS="-L ${OPENSSLLIB}"	47	OPENSSL_LIBS="-L ${OPENSSLLIB}"
51	# Workaround for:	48	# libutil_ALLOW_UNDEFINED=yes is a workaround for:
52	# /usr/bin/ld: error: undefined symbol: SHA512_Update	49	# /usr/bin/ld: error: undefined symbol: SHA512_Update
53	MAKE_ARGS= libutil_ALLOW_UNDEFINED=yes	50	MAKE_ARGS= libutil_ALLOW_UNDEFINED=yes
54	# XXX: Tests require the port to be installed on the system. It is not enough	51	# XXX: Tests require the port to be installed on the system. It is not enough
55	# to have the port staged.	52	# to have the port staged.
56	TEST_ARGS= nix_tests="${_PASSING_TESTS}"	53	TEST_ARGS= nix_tests="${_PASSING_TESTS}"
57	TEST_TARGET= installcheck	54	TEST_TARGET= installcheck
58		55
59	# grealpath and gnustat are needed for tests.	56	# grealpath and gnustat are needed for tests.
60	BINARY_ALIAS= realpath=grealpath stat=gnustat	57	BINARY_ALIAS= realpath=grealpath stat=gnustat
Lines 63-91 SUB_FILES= pkg-message Link Here
63		60
64	GROUPS= nixbld	61	GROUPS= nixbld
65		62
66	OPTIONS_DEFINE= DOCS	63	OPTIONS_DEFINE= CPUID DOCS
		64
		65	CPUID_DESC= Determine microarchitecture levels (relevant to x86_64 only)
		66	CPUID_LIB_DEPENDS= libcpuid.so:sysutils/libcpuid
		67	CPUID_CONFIGURE_ENABLE= cpuid
67		68
68	_BASH= ${LOCALBASE}/bin/bash	69	_BASH= ${LOCALBASE}/bin/bash
69	_STRIP_TARGETS= bin/nix bin/nix-build bin/nix-channel bin/nix-collect-garbage \	70	_STRIP_TARGETS= bin/nix lib/*.so
70	bin/nix-copy-closure bin/nix-daemon bin/nix-env \	71
71	bin/nix-instantiate bin/nix-prefetch-url bin/nix-store \	72	# Regenerate _ALL_TESTS with 'make -f files/Makefile.regentestlist'
72	lib/libnixexpr.so lib/libnixmain.so lib/libnixstore.so \	73	_ALL_TESTS= flakes/flakes.sh flakes/run.sh flakes/mercurial.sh \
73	lib/libnixutil.so	74	flakes/circular.sh flakes/init.sh flakes/follow-paths.sh \
74	# Regenerate the list of all tests with:	75	flakes/bundle.sh flakes/check.sh flakes/unlocked-override.sh \
75	# make patch && make -f $(make -V WRKSRC)/tests/local.mk -V nix_tests	76	flakes/absolute-paths.sh flakes/build-paths.sh ca/gc.sh gc.sh \
76	_ALL_TESTS= init.sh hash.sh lang.sh add.sh simple.sh dependencies.sh gc.sh \	77	remote-store.sh lang.sh fetchMercurial.sh gc-auto.sh \
77	gc-concurrent.sh gc-auto.sh referrers.sh user-envs.sh \	78	user-envs.sh binary-cache.sh multiple-outputs.sh ca/build.sh \
78	logging.sh nix-build.sh misc.sh fixed.sh gc-runtime.sh \	79	nix-build.sh gc-concurrent.sh repair.sh fixed.sh \
79	check-refs.sh filter-source.sh remote-store.sh export.sh \	80	export-graph.sh timeout.sh fetchGitRefs.sh gc-runtime.sh \
80	export-graph.sh timeout.sh secure-drv-outputs.sh nix-channel.sh \	81	tarball.sh fetchGit.sh fetchurl.sh fetchPath.sh \
81	multiple-outputs.sh import-derivation.sh fetchurl.sh \	82	fetchTree-file.sh simple.sh referrers.sh optimise-store.sh \
82	optimise-store.sh binary-cache.sh nix-profile.sh repair.sh \	83	substitute-with-invalid-ca.sh ca/concurrent-builds.sh \
83	dump-db.sh case-hack.sh check-reqs.sh pass-as-file.sh \	84	signing.sh ca/build-with-garbage-path.sh hash.sh \
84	tarball.sh restricted.sh placeholders.sh nix-shell.sh \	85	gc-non-blocking.sh check.sh ca/substitute.sh nix-shell.sh \
85	linux-sandbox.sh build-dry.sh build-remote.sh nar-access.sh \	86	ca/signatures.sh ca/nix-shell.sh ca/nix-copy.sh check-refs.sh \
86	structured-attrs.sh fetchGit.sh fetchMercurial.sh signing.sh \	87	build-remote-input-addressed.sh secure-drv-outputs.sh \
87	run.sh brotli.sh pure-eval.sh check.sh plugins.sh search.sh \	88	restricted.sh fetchGitSubmodules.sh flakes/search-root.sh \
88	nix-copy-ssh.sh post-hook.sh function-trace.sh	89	ca/duplicate-realisation-in-closure.sh readfile-context.sh \
		90	nix-channel.sh recursive.sh dependencies.sh check-reqs.sh \
		91	build-remote-content-addressed-fixed.sh \
		92	build-remote-content-addressed-floating.sh nar-access.sh \
		93	pure-eval.sh eval.sh ca/post-hook.sh repl.sh ca/repl.sh \
		94	ca/recursive.sh binary-cache-build-remote.sh search.sh \
		95	logging.sh export.sh config.sh add.sh local-store.sh \
		96	filter-source.sh misc.sh dump-db.sh linux-sandbox.sh \
		97	build-dry.sh structured-attrs.sh shell.sh brotli.sh zstd.sh \
		98	compression-levels.sh nix-copy-ssh.sh post-hook.sh \
		99	function-trace.sh flakes/config.sh fmt.sh eval-store.sh \
		100	why-depends.sh ca/why-depends.sh import-derivation.sh \
		101	ca/import-derivation.sh nix_path.sh case-hack.sh \
		102	placeholders.sh ssh-relay.sh plugins.sh build.sh ca/nix-run.sh \
		103	selfref-gc.sh ca/selfref-gc.sh db-migration.sh bash-profile.sh \
		104	pass-as-file.sh describe-stores.sh nix-profile.sh \
		105	suggestions.sh store-ping.sh fetchClosure.sh completions.sh \
		106	impure-derivations.sh path-from-hash-part.sh toString-path.sh
89	# Remove problematic tests from the list:	107	# Remove problematic tests from the list:
90	# - restricted.sh is hanging and never finishes.	108	# - restricted.sh is hanging and never finishes.
91	_PASSING_TESTS= ${_ALL_TESTS:Nrestricted.sh}	109	_PASSING_TESTS= ${_ALL_TESTS:Nrestricted.sh}
Lines 93-119 _PASSING_TESTS= ${_ALL_TESTS:Nrestricted.sh} Link Here
93	post-install:	111	post-install:
94	@${MKDIR} ${STAGEDIR}${DATADIR}	112	@${MKDIR} ${STAGEDIR}${DATADIR}
95	${INSTALL_SCRIPT} ${FILESDIR}/add-nixbld-users ${STAGEDIR}${DATADIR}	113	${INSTALL_SCRIPT} ${FILESDIR}/add-nixbld-users ${STAGEDIR}${DATADIR}
96
97	@${RM} ${STAGEDIR}${PREFIX}/libexec/nix/build-remote
98	@${RLN} ${STAGEDIR}${PREFIX}/bin/nix ${STAGEDIR}${PREFIX}/libexec/nix/build-remote
99
100	@cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} ${_STRIP_TARGETS}	114	@cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} ${_STRIP_TARGETS}
101		115
102	pre-test:
103	${MKDIR} /tmp/nix-test
104
105	${REINPLACE_CMD} -e 's\| xargs \| gxargs \|g' ${WRKSRC}/tests/push-to-store.sh
106	${REINPLACE_CMD} -e 's\| touch \| /usr/bin/touch \|g' ${WRKSRC}/tests/timeout.nix
107	${REINPLACE_CMD} -e 's\| touch \| /usr/bin/touch \|g' ${WRKSRC}/tests/check-reqs.nix
108	${REINPLACE_CMD} -e 's\| touch \| /usr/bin/touch \|g' ${WRKSRC}/tests/nar-access.nix
109	${REINPLACE_CMD} -e 's\| touch \| /usr/bin/touch \|g' ${WRKSRC}/tests/pass-as-file.sh
110	${REINPLACE_CMD} -e 's\| date \| ${LOCALBASE}/bin/gdate \|g' ${WRKSRC}/tests/check.nix
111
112	${REINPLACE_CMD} -e 's\| wc -l)\| /usr/bin/grep -c .)\|g' ${WRKSRC}/tests/gc-auto.sh
113	${REINPLACE_CMD} -e 's\| tar c tarball)\| tar -cf - tarball)\|' ${WRKSRC}/tests/tarball.sh
114	${REINPLACE_CMD} -e 's\|^grep \|/usr/bin/grep \|' ${WRKSRC}/tests/check.sh
115
116	post-test:
117	${RM} -r /tmp/nix-test
118
119	.include <bsd.port.mk>	116	.include <bsd.port.mk>

Lines 1-5 Link Here

(-)b/sysutils/nix/distinfo (-5 / +3 lines)
1	TIMESTAMP = 1661019919	1	TIMESTAMP = 1676902174
2	SHA256 (NixOS-nix-2.3.11_GH0.tar.gz) = 3980c8c84f9d8969d949a05557819686c8ddedb9217e18a26396f67fc353b6e4	2	SHA256 (NixOS-nix-2.13.2_GH0.tar.gz) = 4587244c5273b6dd0252c0585ef564358b4ccff1d31ba0eaa1fcacbdab70e709
3	SIZE (NixOS-nix-2.3.11_GH0.tar.gz) = 904939	3	SIZE (NixOS-nix-2.13.2_GH0.tar.gz) = 1224489
4	SHA256 (7c112351d9e941567e64063638396259546d9a48.patch) = 22d513a2337a61d5cebf7ed1542b9d72d6cbc57f99bcd10f3e311870e71d9e3a
5	SIZE (7c112351d9e941567e64063638396259546d9a48.patch) = 2050




# Makefile for developer to update _ALL_TESTS when updating the sysutils/nix
# port.
#
# usage:
#
# cd sysutils/nix && make -f files/Makefile.regentestlist
#
# Then edit sysutils/nix/Makefile and replace the contents of _ALL_TESTS
# with the contents of _NEW_ALL_TESTS from ${WRKDIR}/Makefile.newtests

all: regentestlist .PHONY

.include "Makefile"

# portfmt (from ports-mgmt/portfmt) is just used to format the generated
# list. It is not strictly necessary, so any failure status from that is
# ignored.
${WRKDIR}/Makefile.newtests: ${WRKSRC}/tests/local.mk
	@${TOUCH} ${WRKSRC}/Makefile.config
	@${PRINTF} 'listtests:\n\t@echo $${nix_tests}\n' >> ${WRKSRC}/tests/local.mk
	@{ ${PRINTF} '_NEW_ALL_TESTS=\t'; ${GMAKE} --no-print-directory -C ${WRKSRC} listtests; } > ${WRKDIR}/Makefile.newtests
	@-portfmt -D ${WRKDIR}/Makefile.newtests | ${PATCH} --silent ${WRKDIR}/Makefile.newtests

regentestlist: patch ${WRKDIR}/Makefile.newtests .PHONY
	${CAT} ${WRKDIR}/Makefile.newtests
	@${PRINTF} '\nReplace _ALL_TESTS with the contents of _NEW_ALL_TESTS in ${.CURDIR}/Makefile\n'




Don't use the location of 'cat' to indicate where all core utilities are. In
FreeBSD, for instance, they are not just in one directory.

--- configure.ac.orig	2023-01-25 20:28:02 UTC
+++ configure.ac
@@ -115,7 +115,7 @@ AC_PATH_PROG(lsof, lsof, lsof)
 NEED_PROG(jq, jq)
 
 
-AC_SUBST(coreutils, [$(dirname $(type -p cat))])
+AC_SUBST(coreutils, [/bin:/usr/bin])
 
 
 AC_ARG_WITH(store-dir, AS_HELP_STRING([--with-store-dir=PATH],[path of the Nix store (defaults to /nix/store)]),




Fix for https://github.com/NixOS/nix/issues/7360 (Build fails ... /usr/local/lib/libnixutil.so: Permission denied)

See also pull request https://github.com/NixOS/nix/pull/7888

--- doc/manual/local.mk.orig	2023-01-25 20:28:02 UTC
+++ 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) src/nix/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,31 @@ $(d)/src/SUMMARY.md: $(d)/src/SUMMARY.md.in $(d)/src/c
 	$(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 src/nix/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'
+	$(trace-gen) sed -i.tmpbak -e 's^@docroot@^../..^g' $@.tmp/*.md
+	@rm $@.tmp/*.md.tmpbak
 	@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 src/nix/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: $(DESTDIR)$(bindir)/nix
+$(d)/nix.json: src/nix/nix
+	$(trace-gen) $(dummy-env) src/nix/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: src/nix/nix
+	$(trace-gen) $(dummy-env) src/nix/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 src/nix/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 +80,8 @@ $(d)/src/language/builtins.md: $(d)/builtins.json $(d)
 	@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: src/nix/nix
+	$(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs src/nix/nix __dump-builtins > $@.tmp
 	@mv $@.tmp $@
 
 # Generate the HTML manual.




--- src/libexpr/primops/fetchGit.cc.orig	2019-10-10 13:03:46 UTC
+++ src/libexpr/primops/fetchGit.cc
@@ -6,6 +6,7 @@
 #include "hash.hh"
 
 #include <sys/time.h>
+#include <sys/wait.h>
 
 #include <regex>
 
@@ -173,7 +174,7 @@ GitInfo exportGit(ref<Store> store, const std::string 
     Path tmpDir = createTempDir();
     AutoDelete delTmpDir(tmpDir, true);
 
-    runProgram("tar", true, { "x", "-C", tmpDir }, tar);
+    runProgram("tar", true, { "x", "-C", tmpDir, "-f", "-"}, tar);
 
     gitInfo.storePath = store->addToStore(name, tmpDir);
 




--- src/libstore/build.cc.orig	2019-11-28 21:39:47 UTC
+++ src/libstore/build.cc
@@ -44,12 +44,16 @@
 #include <grp.h>
 
 /* Includes required for chroot support. */
-#if __linux__
+#if __linux__ || __FreeBSD__
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
+#endif
+#if __linux__
 #include <netinet/ip.h>
 #include <sys/personality.h>
+#endif
+#if __linux__ || __FreeBSD__
 #include <sys/mman.h>
 #include <sched.h>
 #include <sys/param.h>
@@ -1943,7 +1947,7 @@ void DerivationGoal::startBuilder()
     /* If `build-users-group' is not empty, then we have to build as
        one of the members of that group. */
     if (settings.buildUsersGroup != "" && getuid() == 0) {
-#if defined(__linux__) || defined(__APPLE__)
+#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
         buildUser = std::make_unique<UserLock>();
 
         /* Make sure that no other processes are executing under this




--- src/libstore/local-store.cc.orig	2023-01-25 20:28:02 UTC
+++ src/libstore/local-store.cc
@@ -27,10 +27,12 @@
 #include <time.h>
 #include <grp.h>
 
-#if __linux__
+#if __linux__ || __FreeBSD__
 #include <sched.h>
 #include <sys/statvfs.h>
 #include <sys/mount.h>
+#endif
+#if __linux__
 #include <sys/ioctl.h>
 #include <sys/xattr.h>
 #endif
@@ -526,6 +528,7 @@ void LocalStore::openDB(State & state, bool create)
    bind mount.  So make the Nix store writable for this process. */
 void LocalStore::makeStoreWritable()
 {
+//#if __linux__ || __FreeBSD__
 #if __linux__
     if (getuid() != 0) return;
     /* Check if /nix/store is on a read-only mount. */




--- src/libutil/util.cc.orig	2023-01-25 20:28:02 UTC
+++ src/libutil/util.cc
@@ -33,6 +33,10 @@
 #include <mach-o/dyld.h>
 #endif
 
+#ifdef __FreeBSD__
+#include <sys/sysctl.h>
+#endif
+
 #ifdef __linux__
 #include <sys/prctl.h>
 #include <sys/resource.h>
@@ -618,6 +622,18 @@ std::optional<Path> getSelfExe()
             return buf;
         else
             return std::nullopt;
+        #elif __FreeBSD__
+        int mib[4];
+        mib[0] = CTL_KERN;
+        mib[1] = KERN_PROC;
+        mib[2] = KERN_PROC_PATHNAME;
+        mib[3] = -1;
+        char buf[1024];
+        size_t len = sizeof(buf);
+        if (sysctl(mib, 4, buf, &len, NULL, 0) != 0 || len == 0)
+            return std::nullopt;
+        buf[len - 1] = '\0';
+        return buf;
         #else
         return std::nullopt;
         #endif




GNU cmp assumes a comparison to stdin if only one file arg. Use '-' instead
for better portability.

--- tests/build.sh.orig	2023-01-25 20:28:02 UTC
+++ tests/build.sh
@@ -127,7 +127,7 @@ issue_6572_independent_outputs() {
     # Make sure that 'nix build' tracks input-outputs correctly when a single output is already present.
     nix-store --delete "$(jq -r <$TEST_ROOT/independent.json .[0].outputs.first)"
     p=$(nix build -f multiple-outputs.nix use-independent --no-link --print-out-paths)
-    cmp $p <<EOF
+    cmp $p - <<EOF
 first
 second
 EOF
@@ -136,7 +136,7 @@ EOF
     # Make sure that 'nix build' tracks input-outputs correctly when a single output is already present.
     nix-store --delete "$(jq -r <$TEST_ROOT/independent.json .[0].outputs.second)"
     p=$(nix build -f multiple-outputs.nix use-independent --no-link --print-out-paths)
-    cmp $p <<EOF
+    cmp $p - <<EOF
 first
 second
 EOF
@@ -157,7 +157,7 @@ issue_6572_dependent_outputs() {
     # Make sure that 'nix build' tracks input-outputs correctly when a single output is already present.
     nix-store --delete "$(jq -r <$TEST_ROOT/a.json .[0].outputs.second)"
     p=$(nix build -f multiple-outputs.nix use-a --no-link --print-out-paths)
-    cmp $p <<EOF
+    cmp $p - <<EOF
 first
 second
 EOF

Added Link Here

(-)b/sysutils/nix/files/patch-tests-common.sh.in (+11 lines)
1	--- tests/common.sh.in.orig 2023-01-25 20:28:02 UTC
2	+++ tests/common.sh.in
3	@@ -181,7 +190,7 @@ buggyNeedLocalStore() {
4
5	enableFeatures() {
6	local features="$1"
7	- sed -i 's/experimental-features .*/& '"$features"'/' "$NIX_CONF_DIR"/nix.conf
8	+ sed -i '' 's/experimental-features .*/& '"$features"'/' "$NIX_CONF_DIR"/nix.conf
9	}
10
11	set -x




GNU touch accepts option args after positional args.
Put option args first for better portability.

--- tests/fetchPath.sh.orig	2023-01-25 20:28:02 UTC
+++ tests/fetchPath.sh
@@ -1,6 +1,6 @@
 source common.sh
 
-touch $TEST_ROOT/foo -t 202211111111
+touch -t 202211111111 $TEST_ROOT/foo
 # We only check whether 2022-11-1* **:**:** is the last modified date since
 # `lastModified` is transformed into UTC in `builtins.fetchTarball`.
 [[ "$(nix eval --impure --raw --expr "(builtins.fetchTree \"path://$TEST_ROOT/foo\").lastModifiedDate")" =~ 2022111.* ]]




GNU sed and BSD sed don't parse the non-POSIX -i option the same way.
Use "-i ''" for the FreeBSD port here (and in other patches).
Most portable is:
  sed '<sedexpr>' file > file.new && mv file.new file

--- tests/flakes/circular.sh.orig	2023-01-25 20:28:02 UTC
+++ tests/flakes/circular.sh
@@ -39,7 +39,7 @@ git -C $flakeB commit -a -m 'Foo'
 [[ $(nix eval $flakeA#foo) = 1579 ]]
 [[ $(nix eval $flakeA#foo) = 1579 ]]
 
-sed -i $flakeB/flake.nix -e 's/456/789/'
+sed -i '' -e 's/456/789/' $flakeB/flake.nix
 git -C $flakeB commit -a -m 'Foo'
 
 [[ $(nix eval --update-input b $flakeA#foo) = 1912 ]]




--- tests/flakes/flakes.sh.orig	2023-01-25 20:28:02 UTC
+++ tests/flakes/flakes.sh
@@ -75,7 +75,7 @@ nix registry add --registry $registry flake4 flake3
 nix registry add --registry $registry nixpkgs flake1
 
 # Test 'nix registry list'.
-[[ $(nix registry list | wc -l) == 5 ]]
+[[ $(nix registry list | grep -c ^) == 5 ]]
 nix registry list | grep -q    '^global'
 nix registry list | grep -q -v '^user' # nothing in user registry
 
@@ -334,23 +334,23 @@ nix build -o $TEST_ROOT/result flake4/removeXyzzy#sth
 
 # Testing the nix CLI
 nix registry add flake1 flake3
-[[ $(nix registry list | wc -l) == 6 ]]
+[[ $(nix registry list | grep -c ^) == 6 ]]
 nix registry pin flake1
-[[ $(nix registry list | wc -l) == 6 ]]
+[[ $(nix registry list | grep -c ^) == 6 ]]
 nix registry pin flake1 flake3
-[[ $(nix registry list | wc -l) == 6 ]]
+[[ $(nix registry list | grep -c ^) == 6 ]]
 nix registry remove flake1
-[[ $(nix registry list | wc -l) == 5 ]]
+[[ $(nix registry list | grep -c ^) == 5 ]]
 
 # Test 'nix registry list' with a disabled global registry.
 nix registry add user-flake1 git+file://$flake1Dir
 nix registry add user-flake2 git+file://$flake2Dir
-[[ $(nix --flake-registry "" registry list | wc -l) == 2 ]]
+[[ $(nix --flake-registry "" registry list | grep -c ^) == 2 ]]
 nix --flake-registry "" registry list | grep -q -v '^global' # nothing in global registry
 nix --flake-registry "" registry list | grep -q    '^user'
 nix registry remove user-flake1
 nix registry remove user-flake2
-[[ $(nix registry list | wc -l) == 5 ]]
+[[ $(nix registry list | grep -c ^) == 5 ]]
 
 # Test 'nix flake clone'.
 rm -rf $TEST_ROOT/flake1-v2

Added Link Here

(-)b/sysutils/nix/files/patch-tests-flakes-search-root.sh (+11 lines)
1	--- tests/flakes/search-root.sh.orig 2023-02-27 20:58:50 UTC
2	+++ tests/flakes/search-root.sh
3	@@ -36,7 +36,7 @@ popd
4
5	nix build --override-input foo . \|\| fail "flake should search up directories when not an installable"
6
7	-sed "s,$PWD/foo,$PWD/foo/subdir,g" -i flake.nix
8	+sed -i '' "s,$PWD/foo,$PWD/foo/subdir,g" flake.nix
9	! nix build \|\| fail "flake should not search upwards when part of inputs"
10
11	if [[ -n $(type -p git) ]]; then




--- tests/gc-auto.sh.orig	2023-01-25 20:28:02 UTC
+++ tests/gc-auto.sh
@@ -23,7 +23,7 @@ with import ./config.nix; mkDerivation {
   name = "gc-A";
   buildCommand = ''
     set -x
-    [[ \$(ls \$NIX_STORE/*-garbage? | wc -l) = 3 ]]
+    [[ \$(ls \$NIX_STORE/*-garbage? | grep -c ^) = 3 ]]
 
     mkdir \$out
     echo foo > \$out/bar
@@ -35,7 +36,7 @@ with import ./config.nix; mkDerivation {
     # Wait for the GC to run
     for i in {1..20}; do
         echo ''\${i}...
-        if [[ \$(ls \$NIX_STORE/*-garbage? | wc -l) = 1 ]]; then
+        if [[ \$(ls \$NIX_STORE/*-garbage? | grep -c ^) = 1 ]]; then
             exit 0
         fi
         sleep 1

Added Link Here

(-)b/sysutils/nix/files/patch-tests-recursive.sh (+10 lines)
1	--- tests/recursive.sh.orig 2023-01-25 20:28:02 UTC
2	+++ tests/recursive.sh
3	@@ -1,6 +1,6 @@
4	source common.sh
5
6	-sed -i 's/experimental-features .*/& recursive-nix/' "$NIX_CONF_DIR"/nix.conf
7	+sed -i '' 's/experimental-features .*/& recursive-nix/' "$NIX_CONF_DIR"/nix.conf
8	restartDaemon
9
10	# FIXME

Added Link Here

(-)b/sysutils/nix/files/patch-tests-repl.sh (+11 lines)
1	--- tests/repl.sh.orig 2023-01-25 20:28:02 UTC
2	+++ tests/repl.sh
3	@@ -117,7 +117,7 @@ foo + baz
4	replResult=$( (
5	echo "changingThing"
6	sleep 1 # Leave the repl the time to eval 'foo'
7	-sed -i 's/beforeChange/afterChange/' flake/flake.nix
8	+sed -i '' 's/beforeChange/afterChange/' flake/flake.nix
9	echo ":reload"
10	echo "changingThing"
11	) \| nix repl ./flake --experimental-features 'flakes repl-flake')

Added Link Here

(-)b/sysutils/nix/files/patch-tests-substitute-with-invalid-ca.sh (+11 lines)
1	--- tests/substitute-with-invalid-ca.sh.orig 2023-01-25 20:28:02 UTC
2	+++ tests/substitute-with-invalid-ca.sh
3	@@ -27,7 +27,7 @@ nix-collect-garbage >/dev/null 2>&1
4	goodPathNarInfo=$(getRemoteNarInfo "$good")
5	badPathNarInfo=$(getRemoteNarInfo "$bad")
6	for fieldName in URL FileHash FileSize NarHash NarSize; do
7	- sed -i "/^$fieldName/d" "$goodPathNarInfo"
8	+ sed -i '' "/^$fieldName/d" "$goodPathNarInfo"
9	grep -E "^$fieldName" "$badPathNarInfo" >> "$goodPathNarInfo"
10	done
11




bin/nix-prefetch-url
bin/nix-shell
bin/nix-store
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/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/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/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.hh
include/nix/common-args.hh
include/nix/common-eval-args.hh
include/nix/comparator.hh
include/nix/compression.hh
include/nix/compute-levels.hh
include/nix/config.h
include/nix/config.hh
include/nix/content-address.hh
include/nix/crypto.hh
include/nix/daemon.hh
include/nix/derivations.hh
include/nix/derived-path.hh
include/nix/error.hh
include/nix/eval-cache.hh
include/nix/eval-inline.hh
include/nix/eval.hh
include/nix/experimental-features.hh
include/nix/fetch-settings.hh
include/nix/fetchers.hh
include/nix/fetchurl.nix.gen.hh
include/nix/filetransfer.hh
include/nix/finally.hh
include/nix/flake/call-flake.nix.gen.hh
include/nix/flake/flake.hh
include/nix/flake/flakeref.hh
include/nix/flake/lockfile.hh
include/nix/fmt.hh
include/nix/fs-accessor.hh
include/nix/function-trace.hh
include/nix/gc-store.hh
include/nix/get-drvs.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/installables.hh
include/nix/json-impls.hh
include/nix/json-to-value.hh
include/nix/json-utils.hh
include/nix/legacy.hh
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/monitor-fd.hh
include/nix/names.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-tab.hh
include/nix/path-info.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/primops.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.hh
include/nix/repair-flag.hh
include/nix/s3-binary-cache-store.hh
include/nix/s3.hh
include/nix/schema.sql.gen.hh
include/nix/serialise.hh
include/nix/serve-protocol.hh
include/nix/shared.hh
include/nix/split.hh
include/nix/sqlite.hh
include/nix/ssh.hh
include/nix/store-api.hh
include/nix/store-cast.hh
include/nix/suggestions.hh
include/nix/symbol-table.hh
include/nix/sync.hh
include/nix/tarfile.hh
include/nix/thread-pool.hh
include/nix/topo-sort.hh
include/nix/types.hh
include/nix/uds-remote-store.hh
include/nix/url-parts.hh
include/nix/url.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/worker-protocol.hh
include/nix/xml-writer.hh
lib/libnixcmd.so
lib/libnixexpr.so
lib/libnixfetchers.so
lib/libnixmain.so
lib/libnixstore.so
lib/libnixutil.so
libdata/pkgconfig/nix-cmd.pc
libdata/pkgconfig/nix-expr.pc
libdata/pkgconfig/nix-main.pc
libdata/pkgconfig/nix-store.pc
libexec/nix/build-remote
share/bash-completion/completions/nix
%%PORTDOCS%%%%DOCSDIR%%/manual/.nojekyll
%%PORTDOCS%%%%DOCSDIR%%/manual/404.html
%%PORTDOCS%%%%DOCSDIR%%/manual/FontAwesome/css/font-awesome.css
%%PORTDOCS%%%%DOCSDIR%%/manual/FontAwesome/fonts/FontAwesome.ttf
%%PORTDOCS%%%%DOCSDIR%%/manual/FontAwesome/fonts/fontawesome-webfont.eot
%%PORTDOCS%%%%DOCSDIR%%/manual/FontAwesome/fonts/fontawesome-webfont.svg
%%PORTDOCS%%%%DOCSDIR%%/manual/FontAwesome/fonts/fontawesome-webfont.ttf
%%PORTDOCS%%%%DOCSDIR%%/manual/FontAwesome/fonts/fontawesome-webfont.woff
%%PORTDOCS%%%%DOCSDIR%%/manual/FontAwesome/fonts/fontawesome-webfont.woff2
%%PORTDOCS%%%%DOCSDIR%%/manual/SUMMARY.md.in
%%PORTDOCS%%%%DOCSDIR%%/manual/advanced-topics/advanced-topics.html
%%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/post-build-hook.html
%%PORTDOCS%%%%DOCSDIR%%/manual/architecture/architecture.html
%%PORTDOCS%%%%DOCSDIR%%/manual/ayu-highlight.css
%%PORTDOCS%%%%DOCSDIR%%/manual/book.js
%%PORTDOCS%%%%DOCSDIR%%/manual/clipboard.min.js
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/command-ref.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/conf-file.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/env-common.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/experimental-commands.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/files.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/main-commands.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-build.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-bundle.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-copy.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-daemon.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-describe-stores.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-develop.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-doctor.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-edit.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
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-flake-clone.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-flake-info.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-flake-init.html
%%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.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-hash-file.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-hash-path.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-hash-to-base16.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-hash-to-base32.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-hash-to-base64.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-hash-to-sri.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-hash.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-help.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-key-convert-secret-to-public.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-key-generate-secret.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-key.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-log.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-nar-cat.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-nar-dump-path.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-nar-ls.html
%%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-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
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-profile-upgrade.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-profile-wipe-history.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-profile.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-realisation-info.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-realisation.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-registry-add.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-registry-list.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-registry-pin.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-registry-remove.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-registry.html
%%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-show-config.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-show-derivation.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-cat.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-store-copy-log.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-store-copy-sigs.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-store-delete.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-store-diff-closures.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-store-dump-path.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-store-gc.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-store-ls.html
%%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
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-store-verify.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-store.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-upgrade-nix.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/new-cli/nix3-why-depends.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/nix-build.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/nix-channel.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/nix-collect-garbage.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/nix-copy-closure.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/nix-daemon.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/nix-env.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/nix-hash.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/nix-instantiate.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/nix-prefetch-url.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/nix-shell.html
%%PORTDOCS%%%%DOCSDIR%%/manual/command-ref/nix-store.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/contributing.html
%%PORTDOCS%%%%DOCSDIR%%/manual/contributing/hacking.html
%%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/elasticlunr.min.js
%%PORTDOCS%%%%DOCSDIR%%/manual/favicon.png
%%PORTDOCS%%%%DOCSDIR%%/manual/favicon.svg
%%PORTDOCS%%%%DOCSDIR%%/manual/figures/user-environments.png
%%PORTDOCS%%%%DOCSDIR%%/manual/figures/user-environments.sxd
%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/OPEN-SANS-LICENSE.txt
%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/SOURCE-CODE-PRO-LICENSE.txt
%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/fonts.css
%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-300.woff2
%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-300italic.woff2
%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-600.woff2
%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-600italic.woff2
%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-700.woff2
%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-700italic.woff2
%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-800.woff2
%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-800italic.woff2
%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-italic.woff2
%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/open-sans-v17-all-charsets-regular.woff2
%%PORTDOCS%%%%DOCSDIR%%/manual/fonts/source-code-pro-v11-all-charsets-500.woff2
%%PORTDOCS%%%%DOCSDIR%%/manual/glossary.html
%%PORTDOCS%%%%DOCSDIR%%/manual/highlight.css
%%PORTDOCS%%%%DOCSDIR%%/manual/highlight.js
%%PORTDOCS%%%%DOCSDIR%%/manual/index.html
%%PORTDOCS%%%%DOCSDIR%%/manual/installation/building-source.html
%%PORTDOCS%%%%DOCSDIR%%/manual/installation/env-variables.html
%%PORTDOCS%%%%DOCSDIR%%/manual/installation/installation.html
%%PORTDOCS%%%%DOCSDIR%%/manual/installation/installing-binary.html
%%PORTDOCS%%%%DOCSDIR%%/manual/installation/installing-docker.html
%%PORTDOCS%%%%DOCSDIR%%/manual/installation/installing-source.html
%%PORTDOCS%%%%DOCSDIR%%/manual/installation/multi-user.html
%%PORTDOCS%%%%DOCSDIR%%/manual/installation/nix-security.html
%%PORTDOCS%%%%DOCSDIR%%/manual/installation/obtaining-source.html
%%PORTDOCS%%%%DOCSDIR%%/manual/installation/prerequisites-source.html
%%PORTDOCS%%%%DOCSDIR%%/manual/installation/single-user.html
%%PORTDOCS%%%%DOCSDIR%%/manual/installation/supported-platforms.html
%%PORTDOCS%%%%DOCSDIR%%/manual/installation/upgrading.html
%%PORTDOCS%%%%DOCSDIR%%/manual/introduction.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/derivations.html
%%PORTDOCS%%%%DOCSDIR%%/manual/language/index.html
%%PORTDOCS%%%%DOCSDIR%%/manual/language/operators.html
%%PORTDOCS%%%%DOCSDIR%%/manual/language/string-interpolation.html
%%PORTDOCS%%%%DOCSDIR%%/manual/language/values.html
%%PORTDOCS%%%%DOCSDIR%%/manual/mark.min.js
%%PORTDOCS%%%%DOCSDIR%%/manual/package-management/basic-package-mgmt.html
%%PORTDOCS%%%%DOCSDIR%%/manual/package-management/binary-cache-substituter.html
%%PORTDOCS%%%%DOCSDIR%%/manual/package-management/channels.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/package-management.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/quick-start.html
%%PORTDOCS%%%%DOCSDIR%%/manual/redirects.js
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/release-notes.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-0.10.1.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-0.10.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-0.11.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-0.12.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-0.13.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-0.14.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-0.15.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-0.16.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-0.5.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-0.6.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-0.7.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-0.8.1.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-0.8.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-0.9.1.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-0.9.2.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-0.9.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-1.0.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-1.1.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-1.10.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-1.11.10.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-1.11.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-1.2.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-1.3.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-1.4.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-1.5.2.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-1.5.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-1.6.1.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-1.6.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-1.7.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-1.8.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-1.9.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.0.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.1.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.10.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.11.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.12.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.13.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.2.html
%%PORTDOCS%%%%DOCSDIR%%/manual/release-notes/rl-2.3.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/searcher.js
%%PORTDOCS%%%%DOCSDIR%%/manual/searchindex.js
%%PORTDOCS%%%%DOCSDIR%%/manual/searchindex.json
%%PORTDOCS%%%%DOCSDIR%%/manual/tomorrow-night.css
share/fish/vendor_completions.d/nix.fish
share/man/man1/nix-build.1.gz
share/man/man1/nix-channel.1.gz
share/man/man1/nix-collect-garbage.1.gz

share/man/man1/nix-prefetch-url.1.gz
share/man/man1/nix-shell.1.gz
share/man/man1/nix-store.1.gz
share/man/man1/nix.1.gz
share/man/man1/nix3-build.1.gz
share/man/man1/nix3-bundle.1.gz
share/man/man1/nix3-copy.1.gz
share/man/man1/nix3-daemon.1.gz
share/man/man1/nix3-describe-stores.1.gz
share/man/man1/nix3-develop.1.gz
share/man/man1/nix3-doctor.1.gz
share/man/man1/nix3-edit.1.gz
share/man/man1/nix3-eval.1.gz
share/man/man1/nix3-flake-archive.1.gz
share/man/man1/nix3-flake-check.1.gz
share/man/man1/nix3-flake-clone.1.gz
share/man/man1/nix3-flake-info.1.gz
share/man/man1/nix3-flake-init.1.gz
share/man/man1/nix3-flake-lock.1.gz
share/man/man1/nix3-flake-metadata.1.gz
share/man/man1/nix3-flake-new.1.gz
share/man/man1/nix3-flake-prefetch.1.gz
share/man/man1/nix3-flake-show.1.gz
share/man/man1/nix3-flake-update.1.gz
share/man/man1/nix3-flake.1.gz
share/man/man1/nix3-fmt.1.gz
share/man/man1/nix3-hash-file.1.gz
share/man/man1/nix3-hash-path.1.gz
share/man/man1/nix3-hash-to-base16.1.gz
share/man/man1/nix3-hash-to-base32.1.gz
share/man/man1/nix3-hash-to-base64.1.gz
share/man/man1/nix3-hash-to-sri.1.gz
share/man/man1/nix3-hash.1.gz
share/man/man1/nix3-help.1.gz
share/man/man1/nix3-key-convert-secret-to-public.1.gz
share/man/man1/nix3-key-generate-secret.1.gz
share/man/man1/nix3-key.1.gz
share/man/man1/nix3-log.1.gz
share/man/man1/nix3-manpages.gz
share/man/man1/nix3-nar-cat.1.gz
share/man/man1/nix3-nar-dump-path.1.gz
share/man/man1/nix3-nar-ls.1.gz
share/man/man1/nix3-nar.1.gz
share/man/man1/nix3-path-info.1.gz
share/man/man1/nix3-print-dev-env.1.gz
share/man/man1/nix3-profile-diff-closures.1.gz
share/man/man1/nix3-profile-history.1.gz
share/man/man1/nix3-profile-install.1.gz
share/man/man1/nix3-profile-list.1.gz
share/man/man1/nix3-profile-remove.1.gz
share/man/man1/nix3-profile-rollback.1.gz
share/man/man1/nix3-profile-upgrade.1.gz
share/man/man1/nix3-profile-wipe-history.1.gz
share/man/man1/nix3-profile.1.gz
share/man/man1/nix3-realisation-info.1.gz
share/man/man1/nix3-realisation.1.gz
share/man/man1/nix3-registry-add.1.gz
share/man/man1/nix3-registry-list.1.gz
share/man/man1/nix3-registry-pin.1.gz
share/man/man1/nix3-registry-remove.1.gz
share/man/man1/nix3-registry.1.gz
share/man/man1/nix3-repl.1.gz
share/man/man1/nix3-run.1.gz
share/man/man1/nix3-search.1.gz
share/man/man1/nix3-shell.1.gz
share/man/man1/nix3-show-config.1.gz
share/man/man1/nix3-show-derivation.1.gz
share/man/man1/nix3-store-add-file.1.gz
share/man/man1/nix3-store-add-path.1.gz
share/man/man1/nix3-store-cat.1.gz
share/man/man1/nix3-store-copy-log.1.gz
share/man/man1/nix3-store-copy-sigs.1.gz
share/man/man1/nix3-store-delete.1.gz
share/man/man1/nix3-store-diff-closures.1.gz
share/man/man1/nix3-store-dump-path.1.gz
share/man/man1/nix3-store-gc.1.gz
share/man/man1/nix3-store-ls.1.gz
share/man/man1/nix3-store-make-content-addressed.1.gz
share/man/man1/nix3-store-optimise.1.gz
share/man/man1/nix3-store-path-from-hash-part.1.gz
share/man/man1/nix3-store-ping.1.gz
share/man/man1/nix3-store-prefetch-file.1.gz
share/man/man1/nix3-store-repair.1.gz
share/man/man1/nix3-store-sign.1.gz
share/man/man1/nix3-store-verify.1.gz
share/man/man1/nix3-store.1.gz
share/man/man1/nix3-upgrade-nix.1.gz
share/man/man1/nix3-why-depends.1.gz
share/man/man5/nix.conf.5.gz
share/man/man8/nix-daemon.8.gz
%%PORTDOCS%%%%DOCSDIR%%/manual/figures/user-environments.png
%%PORTDOCS%%%%DOCSDIR%%/manual/images/callouts/1.gif
%%PORTDOCS%%%%DOCSDIR%%/manual/images/callouts/10.gif
%%PORTDOCS%%%%DOCSDIR%%/manual/images/callouts/11.gif
%%PORTDOCS%%%%DOCSDIR%%/manual/images/callouts/12.gif
%%PORTDOCS%%%%DOCSDIR%%/manual/images/callouts/13.gif
%%PORTDOCS%%%%DOCSDIR%%/manual/images/callouts/14.gif
%%PORTDOCS%%%%DOCSDIR%%/manual/images/callouts/15.gif
%%PORTDOCS%%%%DOCSDIR%%/manual/images/callouts/2.gif
%%PORTDOCS%%%%DOCSDIR%%/manual/images/callouts/3.gif
%%PORTDOCS%%%%DOCSDIR%%/manual/images/callouts/4.gif
%%PORTDOCS%%%%DOCSDIR%%/manual/images/callouts/5.gif
%%PORTDOCS%%%%DOCSDIR%%/manual/images/callouts/6.gif
%%PORTDOCS%%%%DOCSDIR%%/manual/images/callouts/7.gif
%%PORTDOCS%%%%DOCSDIR%%/manual/images/callouts/8.gif
%%PORTDOCS%%%%DOCSDIR%%/manual/images/callouts/9.gif
%%PORTDOCS%%%%DOCSDIR%%/manual/index.html
%%PORTDOCS%%%%DOCSDIR%%/manual/manual.html
%%DATADIR%%/add-nixbld-users
share/zsh/site-functions/_nix
share/zsh/site-functions/run-help-nix
%%DATADIR%%/corepkgs/derivation.nix
%%DATADIR%%/corepkgs/fetchurl.nix
%%DATADIR%%/corepkgs/imported-drv-to-derivation.nix
%%DATADIR%%/corepkgs/unpack-channel.nix
%%DATADIR%%/sandbox/sandbox-defaults.sb
%%DATADIR%%/sandbox/sandbox-minimal.sb
%%DATADIR%%/sandbox/sandbox-network.sb

Return to bug 269637

Added Link Here

(-)b/sysutils/nix/files/Makefile.regentestlist (+26 lines)
1	# Makefile for developer to update _ALL_TESTS when updating the sysutils/nix
2	# port.
3	#
4	# usage:
5	#
6	# cd sysutils/nix && make -f files/Makefile.regentestlist
7	#
8	# Then edit sysutils/nix/Makefile and replace the contents of _ALL_TESTS
9	# with the contents of _NEW_ALL_TESTS from ${WRKDIR}/Makefile.newtests
10
11	all: regentestlist .PHONY
12
13	.include "Makefile"
14
15	# portfmt (from ports-mgmt/portfmt) is just used to format the generated
16	# list. It is not strictly necessary, so any failure status from that is
17	# ignored.
18	${WRKDIR}/Makefile.newtests: ${WRKSRC}/tests/local.mk
19	@${TOUCH} ${WRKSRC}/Makefile.config
20	@${PRINTF} 'listtests:\n\t@echo $${nix_tests}\n' >> ${WRKSRC}/tests/local.mk
21	@{ ${PRINTF} '_NEW_ALL_TESTS=\t'; ${GMAKE} --no-print-directory -C ${WRKSRC} listtests; } > ${WRKDIR}/Makefile.newtests
22	@-portfmt -D ${WRKDIR}/Makefile.newtests \| ${PATCH} --silent ${WRKDIR}/Makefile.newtests
23
24	regentestlist: patch ${WRKDIR}/Makefile.newtests .PHONY
25	${CAT} ${WRKDIR}/Makefile.newtests
26	@${PRINTF} '\nReplace _ALL_TESTS with the contents of _NEW_ALL_TESTS in ${.CURDIR}/Makefile\n'

Added Link Here

(-)b/sysutils/nix/files/patch-configure.ac (+14 lines)
1	Don't use the location of 'cat' to indicate where all core utilities are. In
2	FreeBSD, for instance, they are not just in one directory.
3
4	--- configure.ac.orig 2023-01-25 20:28:02 UTC
5	+++ configure.ac
6	@@ -115,7 +115,7 @@ AC_PATH_PROG(lsof, lsof, lsof)
7	NEED_PROG(jq, jq)
8
9
10	-AC_SUBST(coreutils, [$(dirname $(type -p cat))])
11	+AC_SUBST(coreutils, [/bin:/usr/bin])
12
13
14	AC_ARG_WITH(store-dir, AS_HELP_STRING([--with-store-dir=PATH],[path of the Nix store (defaults to /nix/store)]),

Added Link Here

(-)b/sysutils/nix/files/patch-doc_manual_local.mk (+66 lines)
1	Fix for https://github.com/NixOS/nix/issues/7360 (Build fails ... /usr/local/lib/libnixutil.so: Permission denied)
2
3	See also pull request https://github.com/NixOS/nix/pull/7888
4
5	--- doc/manual/local.mk.orig 2023-01-25 20:28:02 UTC
6	+++ doc/manual/local.mk
7	@@ -24,7 +24,7 @@ dummy-env = env -i \
8	NIX_STATE_DIR=/dummy \
9	NIX_CONFIG='cores = 0'
10
11	-nix-eval = $(dummy-env) $(bindir)/nix eval --experimental-features nix-command -I nix/corepkgs=corepkgs --store dummy:// --impure --raw
12	+nix-eval = $(dummy-env) src/nix/nix eval --experimental-features nix-command -I nix/corepkgs=corepkgs --store dummy:// --impure --raw
13
14	$(d)/%.1: $(d)/src/command-ref/%.md
15	@printf "Title: %s\n\n" "$$(basename $@ .1)" > $^.tmp
16	@@ -48,29 +48,31 @@ $(d)/src/SUMMARY.md: $(d)/src/SUMMARY.md.in $(d)/src/c
17	$(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
18	@mv $@.tmp $@
19
20	-$(d)/src/command-ref/new-cli: $(d)/nix.json $(d)/generate-manpage.nix $(bindir)/nix
21	+$(d)/src/command-ref/new-cli: $(d)/nix.json $(d)/generate-manpage.nix src/nix/nix
22	@rm -rf $@
23	$(trace-gen) $(nix-eval) --write-to $@.tmp --expr 'import doc/manual/generate-manpage.nix { toplevel = builtins.readFile $<; }'
24	# @docroot@: https://nixos.org/manual/nix/unstable/contributing/hacking.html#docroot-variable
25	- $(trace-gen) sed -i $@.tmp/*.md -e 's^@docroot@^../..^g'
26	+ $(trace-gen) sed -i.tmpbak -e 's^@docroot@^../..^g' $@.tmp/*.md
27	+ @rm $@.tmp/*.md.tmpbak
28	@mv $@.tmp $@
29
30	-$(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
31	+$(d)/src/command-ref/conf-file.md: $(d)/conf-file.json $(d)/generate-options.nix $(d)/src/command-ref/conf-file-prefix.md src/nix/nix
32	@cat doc/manual/src/command-ref/conf-file-prefix.md > $@.tmp
33	# @docroot@: https://nixos.org/manual/nix/unstable/contributing/hacking.html#docroot-variable
34	$(trace-gen) $(nix-eval) --expr 'import doc/manual/generate-options.nix (builtins.fromJSON (builtins.readFile $<))' \
35	\| sed -e 's^@docroot@^..^g'>> $@.tmp
36	@mv $@.tmp $@
37
38	-$(d)/nix.json: $(bindir)/nix
39	- $(trace-gen) $(dummy-env) $(bindir)/nix __dump-args > $@.tmp
40	+#$(d)/nix.json: $(DESTDIR)$(bindir)/nix
41	+$(d)/nix.json: src/nix/nix
42	+ $(trace-gen) $(dummy-env) src/nix/nix __dump-args > $@.tmp
43	@mv $@.tmp $@
44
45	-$(d)/conf-file.json: $(bindir)/nix
46	- $(trace-gen) $(dummy-env) $(bindir)/nix show-config --json --experimental-features nix-command > $@.tmp
47	+$(d)/conf-file.json: src/nix/nix
48	+ $(trace-gen) $(dummy-env) src/nix/nix show-config --json --experimental-features nix-command > $@.tmp
49	@mv $@.tmp $@
50
51	-$(d)/src/language/builtins.md: $(d)/builtins.json $(d)/generate-builtins.nix $(d)/src/language/builtins-prefix.md $(bindir)/nix
52	+$(d)/src/language/builtins.md: $(d)/builtins.json $(d)/generate-builtins.nix $(d)/src/language/builtins-prefix.md src/nix/nix
53	@cat doc/manual/src/language/builtins-prefix.md > $@.tmp
54	# @docroot@: https://nixos.org/manual/nix/unstable/contributing/hacking.html#docroot-variable
55	$(trace-gen) $(nix-eval) --expr 'import doc/manual/generate-builtins.nix (builtins.fromJSON (builtins.readFile $<))' \
56	@@ -78,8 +80,8 @@ $(d)/src/language/builtins.md: $(d)/builtins.json $(d)
57	@cat doc/manual/src/language/builtins-suffix.md >> $@.tmp
58	@mv $@.tmp $@
59
60	-$(d)/builtins.json: $(bindir)/nix
61	- $(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs $(bindir)/nix __dump-builtins > $@.tmp
62	+$(d)/builtins.json: src/nix/nix
63	+ $(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs src/nix/nix __dump-builtins > $@.tmp
64	@mv $@.tmp $@
65
66	# Generate the HTML manual.

Lines 1-19 Link Here

(-)b/sysutils/nix/files/patch-src_libexpr_primops_fetchGit.cc (-19 lines)
1	--- src/libexpr/primops/fetchGit.cc.orig 2019-10-10 13:03:46 UTC
2	+++ src/libexpr/primops/fetchGit.cc
3	@@ -6,6 +6,7 @@
4	#include "hash.hh"
5
6	#include <sys/time.h>
7	+#include <sys/wait.h>
8
9	#include <regex>
10
11	@@ -173,7 +174,7 @@ GitInfo exportGit(ref<Store> store, const std::string
12	Path tmpDir = createTempDir();
13	AutoDelete delTmpDir(tmpDir, true);
14
15	- runProgram("tar", true, { "x", "-C", tmpDir }, tar);
16	+ runProgram("tar", true, { "x", "-C", tmpDir, "-f", "-"}, tar);
17
18	gitInfo.storePath = store->addToStore(name, tmpDir);
19

Lines 1-29 Link Here

(-)b/sysutils/nix/files/patch-src_libstore_build.cc (-29 lines)
1	--- src/libstore/build.cc.orig 2019-11-28 21:39:47 UTC
2	+++ src/libstore/build.cc
3	@@ -44,12 +44,16 @@
4	#include <grp.h>
5
6	/* Includes required for chroot support. */
7	-#if __linux__
8	+#if __linux__ \|\| __FreeBSD__
9	#include <sys/socket.h>
10	#include <sys/ioctl.h>
11	#include <net/if.h>
12	+#endif
13	+#if __linux__
14	#include <netinet/ip.h>
15	#include <sys/personality.h>
16	+#endif
17	+#if __linux__ \|\| __FreeBSD__
18	#include <sys/mman.h>
19	#include <sched.h>
20	#include <sys/param.h>
21	@@ -1943,7 +1947,7 @@ void DerivationGoal::startBuilder()
22	/* If `build-users-group' is not empty, then we have to build as
23	one of the members of that group. */
24	if (settings.buildUsersGroup != "" && getuid() == 0) {
25	-#if defined(__linux__) \|\| defined(__APPLE__)
26	+#if defined(__linux__) \|\| defined(__APPLE__) \|\| defined(__FreeBSD__)
27	buildUser = std::make_unique<UserLock>();
28
29	/* Make sure that no other processes are executing under this

Added Link Here

(-)b/sysutils/nix/files/patch-src_libstore_local-store.cc (+24 lines)
1	--- src/libstore/local-store.cc.orig 2023-01-25 20:28:02 UTC
2	+++ src/libstore/local-store.cc
3	@@ -27,10 +27,12 @@
4	#include <time.h>
5	#include <grp.h>
6
7	-#if __linux__
8	+#if __linux__ \|\| __FreeBSD__
9	#include <sched.h>
10	#include <sys/statvfs.h>
11	#include <sys/mount.h>
12	+#endif
13	+#if __linux__
14	#include <sys/ioctl.h>
15	#include <sys/xattr.h>
16	#endif
17	@@ -526,6 +528,7 @@ void LocalStore::openDB(State & state, bool create)
18	bind mount. So make the Nix store writable for this process. */
19	void LocalStore::makeStoreWritable()
20	{
21	+//#if __linux__ \|\| __FreeBSD__
22	#if __linux__
23	if (getuid() != 0) return;
24	/* Check if /nix/store is on a read-only mount. */

Added Link Here

(-)b/sysutils/nix/files/patch-src_libutil-util.cc (+32 lines)
1	--- src/libutil/util.cc.orig 2023-01-25 20:28:02 UTC
2	+++ src/libutil/util.cc
3	@@ -33,6 +33,10 @@
4	#include <mach-o/dyld.h>
5	#endif
6
7	+#ifdef __FreeBSD__
8	+#include <sys/sysctl.h>
9	+#endif
10	+
11	#ifdef __linux__
12	#include <sys/prctl.h>
13	#include <sys/resource.h>
14	@@ -618,6 +622,18 @@ std::optional<Path> getSelfExe()
15	return buf;
16	else
17	return std::nullopt;
18	+ #elif __FreeBSD__
19	+ int mib[4];
20	+ mib[0] = CTL_KERN;
21	+ mib[1] = KERN_PROC;
22	+ mib[2] = KERN_PROC_PATHNAME;
23	+ mib[3] = -1;
24	+ char buf[1024];
25	+ size_t len = sizeof(buf);
26	+ if (sysctl(mib, 4, buf, &len, NULL, 0) != 0 \|\| len == 0)
27	+ return std::nullopt;
28	+ buf[len - 1] = '\0';
29	+ return buf;
30	#else
31	return std::nullopt;
32	#endif

Added Link Here

(-)b/sysutils/nix/files/patch-tests-build.sh (+32 lines)
1	GNU cmp assumes a comparison to stdin if only one file arg. Use '-' instead
2	for better portability.
3
4	--- tests/build.sh.orig 2023-01-25 20:28:02 UTC
5	+++ tests/build.sh
6	@@ -127,7 +127,7 @@ issue_6572_independent_outputs() {
7	# Make sure that 'nix build' tracks input-outputs correctly when a single output is already present.
8	nix-store --delete "$(jq -r <$TEST_ROOT/independent.json .[0].outputs.first)"
9	p=$(nix build -f multiple-outputs.nix use-independent --no-link --print-out-paths)
10	- cmp $p <<EOF
11	+ cmp $p - <<EOF
12	first
13	second
14	EOF
15	@@ -136,7 +136,7 @@ EOF
16	# Make sure that 'nix build' tracks input-outputs correctly when a single output is already present.
17	nix-store --delete "$(jq -r <$TEST_ROOT/independent.json .[0].outputs.second)"
18	p=$(nix build -f multiple-outputs.nix use-independent --no-link --print-out-paths)
19	- cmp $p <<EOF
20	+ cmp $p - <<EOF
21	first
22	second
23	EOF
24	@@ -157,7 +157,7 @@ issue_6572_dependent_outputs() {
25	# Make sure that 'nix build' tracks input-outputs correctly when a single output is already present.
26	nix-store --delete "$(jq -r <$TEST_ROOT/a.json .[0].outputs.second)"
27	p=$(nix build -f multiple-outputs.nix use-a --no-link --print-out-paths)
28	- cmp $p <<EOF
29	+ cmp $p - <<EOF
30	first
31	second
32	EOF

Added Link Here

(-)b/sysutils/nix/files/patch-tests-fetchPath.sh (+13 lines)
1	GNU touch accepts option args after positional args.
2	Put option args first for better portability.
3
4	--- tests/fetchPath.sh.orig 2023-01-25 20:28:02 UTC
5	+++ tests/fetchPath.sh
6	@@ -1,6 +1,6 @@
7	source common.sh
8
9	-touch $TEST_ROOT/foo -t 202211111111
10	+touch -t 202211111111 $TEST_ROOT/foo
11	# We only check whether 2022-11-1* ::** is the last modified date since
12	# `lastModified` is transformed into UTC in `builtins.fetchTarball`.
13	[[ "$(nix eval --impure --raw --expr "(builtins.fetchTree \"path://$TEST_ROOT/foo\").lastModifiedDate")" =~ 2022111.* ]]

Added Link Here

(-)b/sysutils/nix/files/patch-tests-flakes-circular.sh (+16 lines)
1	GNU sed and BSD sed don't parse the non-POSIX -i option the same way.
2	Use "-i ''" for the FreeBSD port here (and in other patches).
3	Most portable is:
4	sed '<sedexpr>' file > file.new && mv file.new file
5
6	--- tests/flakes/circular.sh.orig 2023-01-25 20:28:02 UTC
7	+++ tests/flakes/circular.sh
8	@@ -39,7 +39,7 @@ git -C $flakeB commit -a -m 'Foo'
9	[[ $(nix eval $flakeA#foo) = 1579 ]]
10	[[ $(nix eval $flakeA#foo) = 1579 ]]
11
12	-sed -i $flakeB/flake.nix -e 's/456/789/'
13	+sed -i '' -e 's/456/789/' $flakeB/flake.nix
14	git -C $flakeB commit -a -m 'Foo'
15
16	[[ $(nix eval --update-input b $flakeA#foo) = 1912 ]]

Added Link Here

(-)b/sysutils/nix/files/patch-tests-flakes-flakes.sh (+41 lines)
1	--- tests/flakes/flakes.sh.orig 2023-01-25 20:28:02 UTC
2	+++ tests/flakes/flakes.sh
3	@@ -75,7 +75,7 @@ nix registry add --registry $registry flake4 flake3
4	nix registry add --registry $registry nixpkgs flake1
5
6	# Test 'nix registry list'.
7	-[[ $(nix registry list \| wc -l) == 5 ]]
8	+[[ $(nix registry list \| grep -c ^) == 5 ]]
9	nix registry list \| grep -q '^global'
10	nix registry list \| grep -q -v '^user' # nothing in user registry
11
12	@@ -334,23 +334,23 @@ nix build -o $TEST_ROOT/result flake4/removeXyzzy#sth
13
14	# Testing the nix CLI
15	nix registry add flake1 flake3
16	-[[ $(nix registry list \| wc -l) == 6 ]]
17	+[[ $(nix registry list \| grep -c ^) == 6 ]]
18	nix registry pin flake1
19	-[[ $(nix registry list \| wc -l) == 6 ]]
20	+[[ $(nix registry list \| grep -c ^) == 6 ]]
21	nix registry pin flake1 flake3
22	-[[ $(nix registry list \| wc -l) == 6 ]]
23	+[[ $(nix registry list \| grep -c ^) == 6 ]]
24	nix registry remove flake1
25	-[[ $(nix registry list \| wc -l) == 5 ]]
26	+[[ $(nix registry list \| grep -c ^) == 5 ]]
27
28	# Test 'nix registry list' with a disabled global registry.
29	nix registry add user-flake1 git+file://$flake1Dir
30	nix registry add user-flake2 git+file://$flake2Dir
31	-[[ $(nix --flake-registry "" registry list \| wc -l) == 2 ]]
32	+[[ $(nix --flake-registry "" registry list \| grep -c ^) == 2 ]]
33	nix --flake-registry "" registry list \| grep -q -v '^global' # nothing in global registry
34	nix --flake-registry "" registry list \| grep -q '^user'
35	nix registry remove user-flake1
36	nix registry remove user-flake2
37	-[[ $(nix registry list \| wc -l) == 5 ]]
38	+[[ $(nix registry list \| grep -c ^) == 5 ]]
39
40	# Test 'nix flake clone'.
41	rm -rf $TEST_ROOT/flake1-v2

Added Link Here

(-)b/sysutils/nix/files/patch-tests-gc-auto.sh (+20 lines)
1	--- tests/gc-auto.sh.orig 2023-01-25 20:28:02 UTC
2	+++ tests/gc-auto.sh
3	@@ -23,7 +23,7 @@ with import ./config.nix; mkDerivation {
4	name = "gc-A";
5	buildCommand = ''
6	set -x
7	- [[ \$(ls \$NIX_STORE/*-garbage? \| wc -l) = 3 ]]
8	+ [[ \$(ls \$NIX_STORE/*-garbage? \| grep -c ^) = 3 ]]
9
10	mkdir \$out
11	echo foo > \$out/bar
12	@@ -35,7 +36,7 @@ with import ./config.nix; mkDerivation {
13	# Wait for the GC to run
14	for i in {1..20}; do
15	echo ''\${i}...
16	- if [[ \$(ls \$NIX_STORE/*-garbage? \| wc -l) = 1 ]]; then
17	+ if [[ \$(ls \$NIX_STORE/*-garbage? \| grep -c ^) = 1 ]]; then
18	exit 0
19	fi
20	sleep 1