nix: update, not building, needs more dependencies.

[nikita <nikita%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Tue Apr 12 23:16:33 2022 +0200
Changeset:	e4958222ad69071021fbdef3b68fac8b0c6727d9

Modified Files:
	nix/Makefile
	nix/TODO
	nix/distinfo
Removed Files:
	nix/patches/patch-src_libexpr_primops_fetchGit.cc

Log Message:
nix: update, not building, needs more dependencies.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e4958222ad69071021fbdef3b68fac8b0c6727d9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 nix/Makefile                                      | 23 +++++++++++++++--------
 nix/TODO                                          |  5 ++++-
 nix/distinfo                                      |  7 +++----
 nix/patches/patch-src_libexpr_primops_fetchGit.cc | 15 ---------------
 4 files changed, 22 insertions(+), 28 deletions(-)

diffs:
diff --git a/nix/Makefile b/nix/Makefile
index 0420e11a6d..e54e177bc0 100644
--- a/nix/Makefile
+++ b/nix/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=		nix-2.3.7
+DISTNAME=		nix-2.7.0
 CATEGORIES=		wip
 MASTER_SITES=		${MASTER_SITE_GITHUB:=NixOS/}
 
@@ -76,11 +76,11 @@ PKG_USERS+=	nixbld${i}:nixbld
 #SUBST_SED.docbook+=	-e 's,http://docbook.sourceforge.net/release/xsl/current,${PREFIX}/share/xsl/docbook,g'
 
 # and one more.
-SUBST_CLASSES+=		docbook2
-SUBST_MESSAGE.docbook2=	Fixing docbook URLs.
-SUBST_FILES.docbook2+=	doc/manual/local.mk
-SUBST_STAGE.docbook2=	pre-configure
-SUBST_SED.docbook2+=	-e 's,http://docbook.org/xml/5.0/rng/docbook.rng,${PREFIX}/share/xsl/docbook,g'
+# SUBST_CLASSES+=		docbook2
+# SUBST_MESSAGE.docbook2=	Fixing docbook URLs.
+# SUBST_FILES.docbook2+=	doc/manual/local.mk
+# SUBST_STAGE.docbook2=	pre-configure
+# SUBST_SED.docbook2+=	-e 's,http://docbook.org/xml/5.0/rng/docbook.rng,${PREFIX}/share/xsl/docbook,g'
 
 # remove workdir references
 SUBST_CLASSES+=			confignix
@@ -93,6 +93,12 @@ SUBST_SED.confignix+=		-e 's,@tr@,/usr/bin/tr,g'
 
 BUILD_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
 BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+BUILD_DEPENDS+=	jq-[0-9]*:../../devel/jq
+
+# Linux is supported, FreeBSD support is experimental.
+# macOS is probably supported.
+# Whoever updates this package and maybe imports it
+# should declare other OS as unsupported.
 
 #.if ${OPSYS} == "NetBSD"
 #USE_BUILTIN.editline=	yes
@@ -113,13 +119,14 @@ pre-configure:
 
 #.include "../../archivers/lzmalib/buildlink3.mk"
 #.include "../../mk/dlopen.buildlink3.mk"
-.include "../../archivers/xz/buildlink3.mk"
 .include "../../archivers/brotli/buildlink3.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
+.include "../../archivers/libarchive/buildlink3.mk"
+.include "../../archivers/xz/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/boehm-gc/buildlink3.mk"
-.include "../../devel/editline/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/editline/buildlink3.mk"
 .include "../../security/libsodium/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
diff --git a/nix/TODO b/nix/TODO
index 698971b5b1..b1b8239a5f 100644
--- a/nix/TODO
+++ b/nix/TODO
@@ -5,4 +5,7 @@
 
 * port to NetBSD?
   There is a high probability that in addition to packaging, supported platforms
-  must be tested and non-supported (like NetBSD host) ported to.
+  must be tested and non-supported (like NetBSD host) ported to and maintained.
+
+* dependencies:
+  needs https://github.com/anrieff/libcpuid
\ No newline at end of file
diff --git a/nix/distinfo b/nix/distinfo
index 576b0b87ec..9c8f735b69 100644
--- a/nix/distinfo
+++ b/nix/distinfo
@@ -1,6 +1,5 @@
 $NetBSD$
 
-RMD160 (nix-2.3.7.tar.gz) = bd5e5893f73784aaf26def6f45bd4ddd8209dd84
-SHA512 (nix-2.3.7.tar.gz) = 18516df4bac346d651ac550d088f6ee378bd7ff6c644c1cf9a59445792bd10765444b4dcdad44a06ac914dbf80021c57dd4496bef2d7a0db45cdee2a5ecdc47d
-Size (nix-2.3.7.tar.gz) = 900906 bytes
-SHA1 (patch-src_libexpr_primops_fetchGit.cc) = eed459c989279873a8b48044e0925de88cb358b0
+BLAKE2s (nix-2.7.0.tar.gz) = 6729611a550c89357855a783bf388010c0edd5518b0b6e5ddd59bbf67f88d96e
+SHA512 (nix-2.7.0.tar.gz) = bb946fb66aaaf32379787cbb88dfa94f2b8095cf1c771a6b9a7f38748ca75e8b56c3681af0a98debe148a59bef7c73a270ef44fd5ada21845630e5b22b047421
+Size (nix-2.7.0.tar.gz) = 1131643 bytes
diff --git a/nix/patches/patch-src_libexpr_primops_fetchGit.cc b/nix/patches/patch-src_libexpr_primops_fetchGit.cc
deleted file mode 100644
index 3a7e58ddd6..0000000000
--- a/nix/patches/patch-src_libexpr_primops_fetchGit.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Missing include on NetBSD.
-
---- src/libexpr/primops/fetchGit.cc~	2019-11-01 16:57:52.564146995 +0000
-+++ src/libexpr/primops/fetchGit.cc	2019-11-01 16:59:08.187456642 +0000
-@@ -6,6 +6,8 @@
- #include "hash.hh"
- 
- #include <sys/time.h>
-+#include <sys/wait.h>
-+
- 
- #include <regex>
-