nix: update, failing.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: nix: update, failing.
From: nikita <nikita%NetBSD.org@localhost>
Date: Wed, 03 May 2023 16:14:04 +0000
Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Wed May 3 18:14:04 2023 +0200
Changeset:	e80ceffeac0fa7d1ae96dc464fb398ad6ab91c74

Modified Files:
	nix/Makefile
	nix/TODO
	nix/distinfo

Log Message:
nix: update, failing.

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

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

diffstat:
 nix/Makefile | 53 ++++++++++++++++++++++++++---------------------------
 nix/TODO     | 18 ++++++++----------
 nix/distinfo |  6 +++---
 3 files changed, 37 insertions(+), 40 deletions(-)

diffs:
diff --git a/nix/Makefile b/nix/Makefile
index 7b77fec4aa..ea3ef8eae3 100644
--- a/nix/Makefile
+++ b/nix/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
-DISTNAME=		nix-2.12.0
-CATEGORIES=		wip
+DISTNAME=		nix-2.15.0
+CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_GITHUB:=NixOS/}
 
 MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
@@ -11,8 +11,8 @@ LICENSE=		gnu-lgpl-v2.1
 
 USE_TOOLS+=		pkg-config flex bash bison gmake
 USE_TOOLS+=		automake autoconf autoreconf
-USE_LANGUAGES=		c c++
-GNU_CONFIGURE=		YES
+USE_LANGUAGES=		c c++17
+GNU_CONFIGURE=		yes
 
 BUILD_DEPENDS+=		autoconf-archive-[0-9]*:../../devel/autoconf-archive
 
@@ -23,8 +23,13 @@ PKGCONFIG_OVERRIDE+=	src/libstore/nix-store.pc.in
 .include "../../mk/bsd.prefs.mk"
 
 # CONFIGURE_ARGS+=	--localstatedir=/nix/var
-CONFIGURE_ARGS+=	--with-sandbox-shell=/bin/sh
-CONFIGURE_ARGS+=	--enable-gc
+# CONFIGURE_ARGS+=	--with-sandbox-shell=/bin/sh
+# CONFIGURE_ARGS+=	--enable-static=rapidcheck
+
+# one of those fixes the detection of rapidcheck
+CONFIGURE_ENV+=		RAPIDCHECK_HEADERS=${BUILDLINK_PREFIX.rapidcheck}/include/rapidcheck
+CFLAGS+=		-I${BUILDLINK_PREFIX.rapidcheck}/include/rapidcheck
+LDFLAGS+=		-L${BUILDLINK_PREFIX.rapidcheck}/lib
 
 # s3 option needs s3-cpp, this was reported as a cause for error if
 # left unchanged.
@@ -33,16 +38,17 @@ CONFIGURE_ENV+=		ac_cv_header_aws_s3_S3Client_h=no
 #CONFIGURE_ENV+=	EDITLINE_LIBS=-L${BUILDLINK_PREFIX.editlinereadline:Q}/lib
 #CONFIGURE_ENV+=	EDITLINE_CFLAGS=-I${BUILDLINK_PREFIX.editlinereadline:Q}/include/readline
 CONFIGURE_ENV+=		EDITLINE_CFLAGS="-DREADLINE"
-CONFIGURE_ENV+=		EDITLINE_LIBS="-ledit -L${BUILDLINK_PREFIX.editlinereadline:Q}/lib"
+#CONFIGURE_ENV+=	EDITLINE_LIBS="-ledit -L${BUILDLINK_PREFIX.editlinereadline}/lib"
+CONFIGURE_ENV+=		EDITLINE_LIBS="-ledit -L${BUILDLINK_PREFIX.editline}/lib"
 #CONFIGURE_ENV+=	EDITLINE_CFLAGS=${BUILDLINK_PREFIX.editline:Q}/include/readline
 #CONFIGURE_ENV+=	EDITLINE_LIBS=${BUILDLINK_PREFIX.editline:Q}/lib
-#CONFIGURE_ENV+=		LIBLZMA_CFLAGS="-I${BUILDLINK_PREFIX.xz:Q}/include"
-#CONFIGURE_ENV+=		LIBLZMA_LIBS="-llzma -L${BUILDLINK_PREFIX.xz:Q}/lib"
-CONFIGURE_ENV+=		BOOST_ROOT=${BUILDLINK_PREFIX.boost:Q}/lib
+#CONFIGURE_ENV+=	LIBLZMA_CFLAGS="-I${BUILDLINK_PREFIX.xz:Q}/include"
+#CONFIGURE_ENV+=	LIBLZMA_LIBS="-llzma -L${BUILDLINK_PREFIX.xz:Q}/lib"
+CONFIGURE_ENV+=		BOOST_ROOT=${BUILDLINK_PREFIX.boost-libs}/lib
 
 # Workaround for:
 #   /usr/bin/ld: error: undefined symbol: SHA512_Update
-MAKE_ARGS+=	libutil_ALLOW_UNDEFINED=yes
+MAKE_FLAGS+=	libutil_ALLOW_UNDEFINED=yes
 
 BUILDLINK_TRANSFORM.NetBSD+=	rm:-ldl
 
@@ -67,7 +73,7 @@ PKG_GROUPS+=	nixbld
 PKG_USERS+=	nixbld${i}:nixbld
 .endfor
 
-#SUBST_CLASSES+=		docbook
+#SUBST_CLASSES+=	docbook
 #SUBST_MESSAGE.docbook=	Fixing docbook URLs.
 #SUBST_FILES.docbook+=	doc/manual/installation/prerequisites-source.xml
 #SUBST_FILES.docbook+=	doc/manual/local.mk
@@ -79,17 +85,8 @@ PKG_USERS+=	nixbld${i}:nixbld
 # 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
-SUBST_MESSAGE.confignix=	remove workdir references
-SUBST_FILES.confignix+=		corepkgs/config.nix.in
-SUBST_STAGE.confignix=		post-configure
-SUBST_SED.confignix+=		-e 's,@bash@,${PREFIX}/bin/bash,g'
-SUBST_SED.confignix+=		-e 's,@coreutils@,/bin,g'
-SUBST_SED.confignix+=		-e 's,@tr@,/usr/bin/tr,g'
+# SUBST_STAGE.docbook2=		pre-configure
+# SUBST_SED.docbook2+=		-e 's,http://docbook.org/xml/5.0/rng/docbook.rng,${PREFIX}/share/xsl/docbook,g'
 
 BUILD_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
 BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
@@ -109,9 +106,9 @@ BUILD_DEPENDS+=	jq-[0-9]*:../../devel/jq
 # .if ${READLINE_TYPE} == "readline"
 # SUBST_CLASSES+=		editline
 # SUBST_MESSAGE.editline=	Fixing editline header.
-# SUBST_STAGE.editline=	pre-configure
-# SUBST_FILES.editline=	src/nix/repl.cc
-# SUBST_SED.editline=	-e "s,editline\.h,readline\.h,g"
+# SUBST_STAGE.editline=		pre-configure
+# SUBST_FILES.editline=		src/nix/repl.cc
+# SUBST_SED.editline=		-e "s,editline\.h,readline\.h,g"
 # .endif
 
 pre-configure:
@@ -131,7 +128,9 @@ pre-configure:
 .include "../../sysutils/libcpuid/buildlink3.mk"
 .include "../../security/libsodium/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/nlohmann-json/buildlink3.mk"
+.include "../../textproc/lowdown/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
-.include "../../wip/nlohmann-json/buildlink3.mk"
+.include "../../wip/rapidcheck/buildlink3.mk"
 #.include "../../wip/aws-sdk-cpp/buildlink3.mk" # Needs some source fixes
 .include "../../mk/bsd.pkg.mk"
diff --git a/nix/TODO b/nix/TODO
index b1b8239a5f..65cc64531c 100644
--- a/nix/TODO
+++ b/nix/TODO
@@ -1,11 +1,9 @@
-* patch:
-  - code in next release will have moved to
-    src/libexpr/primops/fetchTree.cc , check if <sys/wait.h> is still
-    required.
+c++ -o src/libstore/s3-binary-cache-store.o -c src/libstore/s3-binary-cache-store.cc -I/usr/pkg/include -I/usr/include -I/usr/include/readline -I/usr/pkg/include/sodium -I/usr/include/krb5  -O3  -fPIC -g -Wno-deprecated-declarations -Werror=switch -g -Wall -include config.h -std=c++2a -I src -I/usr/pkg/include -I /usr/pkg/include/rapidcheck -I/usr/pkg/include -I/usr/pkg/include/libcpuid -I/usr/pkg/include -I/usr/pkg/include -DREADLINE -I/usr/pkg/include -O2 -I/usr/pkg/include/rapidcheck -fPIC -D_FORTIFY_SOURCE=2 -pthread -I/usr/pkg/include -I/usr/include -I/usr/include/readline -I/usr/pkg/include/sodium -I/usr/include/krb5 -I src/libutil -I src/libstore -I src/libstore/build -DNIX_PREFIX=\"/usr/pkg\" -DNIX_STORE_DIR=\"/nix/store\" -DNIX_DATA_DIR=\"/usr/pkg/share\" -DNIX_STATE_DIR=\"/nix/var/nix\" -DNIX_LOG_DIR=\"/nix/var/log/nix\" -DNIX_CONF_DIR=\"/usr/pkg/etc/nix\" -DNIX_BIN_DIR=\"/usr/pkg/bin\" -DNIX_MAN_DIR=\"/usr/pkg/man\" -DLSOF=\"lsof\" -Werror=switch-enum -MMD -MF src
/libstore/.s3-binary-cache-store.o.dep -MP
+c++ -o src/libstore/sqlite.o -c src/libstore/sqlite.cc -I/usr/pkg/include -I/usr/include -I/usr/include/readline -I/usr/pkg/include/sodium -I/usr/include/krb5  -O3  -fPIC -g -Wno-deprecated-declarations -Werror=switch -g -Wall -include config.h -std=c++2a -I src -I/usr/pkg/include -I /usr/pkg/include/rapidcheck -I/usr/pkg/include -I/usr/pkg/include/libcpuid -I/usr/pkg/include -I/usr/pkg/include -DREADLINE -I/usr/pkg/include -O2 -I/usr/pkg/include/rapidcheck -fPIC -D_FORTIFY_SOURCE=2 -pthread -I/usr/pkg/include -I/usr/include -I/usr/include/readline -I/usr/pkg/include/sodium -I/usr/include/krb5 -I src/libutil -I src/libstore -I src/libstore/build -DNIX_PREFIX=\"/usr/pkg\" -DNIX_STORE_DIR=\"/nix/store\" -DNIX_DATA_DIR=\"/usr/pkg/share\" -DNIX_STATE_DIR=\"/nix/var/nix\" -DNIX_LOG_DIR=\"/nix/var/log/nix\" -DNIX_CONF_DIR=\"/usr/pkg/etc/nix\" -DNIX_BIN_DIR=\"/usr/pkg/bin\" -DNIX_MAN_DIR=\"/usr/pkg/man\" -DLSOF=\"lsof\" -Werror=switch-enum -MMD -MF src/libstore/.sqlite.o.dep -MP
+src/libstore/sqlite.cc: In static member function 'static void nix::SQLiteError::throw_(sqlite3*, nix::hintformat&&)':
+src/libstore/sqlite.cc:27:18: error: 'sqlite3_error_offset' was not declared in this scope; did you mean 'sqlite3_str_reset'?
+   27 |     int offset = sqlite3_error_offset(db);
+      |                  ^~~~~~~~~~~~~~~~~~~~
+      |                  sqlite3_str_reset
+gmake: *** [mk/patterns.mk:3: src/libstore/sqlite.o] Error 1
 
-* 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 and maintained.
-
-* dependencies:
-  needs https://github.com/anrieff/libcpuid
\ No newline at end of file
diff --git a/nix/distinfo b/nix/distinfo
index d86ec895e2..8f2334808b 100644
--- a/nix/distinfo
+++ b/nix/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (nix-2.12.0.tar.gz) = 36414c2dc06343afd30f3fde7b09591e90c6ce32d33a74baf87b4670b4c46b70
-SHA512 (nix-2.12.0.tar.gz) = d70c34bbcd8a7898408ec3ea7b895f8663742ebd825bde789684df64fa6c02a71991a734b4512c96efd5eab9e6132f3f3085d625f00bf0536f95062970123b6d
-Size (nix-2.12.0.tar.gz) = 1204781 bytes
+BLAKE2s (nix-2.15.0.tar.gz) = 079a9b0057e4adce76ff3c8ea75147b5d0cb6144b3a64e319db50e3919be616c
+SHA512 (nix-2.15.0.tar.gz) = c37d40c3f80ba04f0a0e20d5067fc9e4f908670f7bbabbc3c15f291116e024b6fb97fdb04b51378c5ba5c39487e8a949b12db163cef06cadcd521f1f6c6e6aa4
+Size (nix-2.15.0.tar.gz) = 1290181 bytes
Prev by Date: polkit-qt5: remove, imported into main
Next by Date: nix: take maintainership
Previous by Thread: polkit-qt5: remove, imported into main
Next by Thread: nix: take maintainership
Indexes:
Home | Main Index | Thread Index | Old Index