nix: Update to nix-2.2.2

[ng0 <ng0%n0.is@localhost>]

Module Name:	pkgsrc-wip
Committed By:	ng0 <ng0%n0.is@localhost>
Pushed By:	ng0
Date:		Tue Jun 25 20:19:59 2019 +0000
Changeset:	ad90a5fc02eeeabdc84f2d6173ae1f62b41cfecb

Modified Files:
	nix/Makefile
	nix/distinfo
Added Files:
	nix/TODO
	nix/patches/patch-aa__configure_ac
	nix/patches/patch-ab__Makefile_config_in
	nix/patches/patch-mk__libraries_mk
	nix/patches/patch-mk__programs_mk

Log Message:
nix: Update to nix-2.2.2

Makefile: Detect editline.

No Changelog

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

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

diffstat:
 nix/Makefile                             | 13 ++++++++-----
 nix/TODO                                 |  3 +++
 nix/distinfo                             | 12 ++++++++----
 nix/patches/patch-aa__configure_ac       |  8 ++++++++
 nix/patches/patch-ab__Makefile_config_in |  8 ++++++++
 nix/patches/patch-mk__libraries_mk       | 11 +++++++++++
 nix/patches/patch-mk__programs_mk        | 12 ++++++++++++
 7 files changed, 58 insertions(+), 9 deletions(-)

diffs:
diff --git a/nix/Makefile b/nix/Makefile
index 6b47660ee8..06883c20a4 100644
--- a/nix/Makefile
+++ b/nix/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 GITHUB_PROJECT=	nix
-DISTNAME=	2.2.1
+DISTNAME=	2.2.2
 PKGNAME=	${GITHUB_PROJECT}-${DISTNAME}
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=NixOS/}
@@ -12,7 +12,7 @@ HOMEPAGE=	https://github.com/NixOS/nix/
 COMMENT=	Purely functional package manager
 LICENSE=	gnu-lgpl-v2.1
 
-WRKSRC=		${WRKDIR}/nix-2.2.1
+WRKSRC=		${WRKDIR}/nix-2.2.2
 USE_TOOLS+=	pkg-config yacc flex automake autoconf autoreconf #bison?
 USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	YES
@@ -23,15 +23,18 @@ PKGCONFIG_OVERRIDE+=	src/libstore/nix-store.pc.in
 
 CONFIGURE_ARGS+=	--with-sandbox-shell=/bin/sh
 CONFIGURE_ARGS+=	--enable-gc
+CONFIGURE_ARGS+=	--disable-s3
 #CONFIGURE_ARGS+=	--localstatedir=
 
-#pkg-config fails to find editline and suggests to set the following:
-#EDITLINE_CFLAGS
-#EDITLINE_LIBS
+CONFIGURE_ENV+=		EDITLINE_CFLAGS=${BUILDLINK_PREFIX.editlinereadline:Q}/include
+CONFIGURE_ENV+=		EDITLINE_LIBS=${BUILDLINK_PREFIX.editlinereadline:Q}/lib
+CONFIGURE_ENV+=		LIBLZMA_CFLAGS=${BUILDLINK_PREFIX.lzmalib:Q}/include
+CONFIGURE_ENV+=		LIBLZMA_LIBS=${BUILDLINK_PREFIX.lzmalib:Q}/lib
 
 pre-configure:
 	cd ${WRKSRC} && ${SH} bootstrap.sh
 
+.include "../../archivers/lzmalib/buildlink3.mk"
 .include "../../archivers/brotli/buildlink3.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
diff --git a/nix/TODO b/nix/TODO
new file mode 100644
index 0000000000..f07be9d8e2
--- /dev/null
+++ b/nix/TODO
@@ -0,0 +1,3 @@
+* 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.
\ No newline at end of file
diff --git a/nix/distinfo b/nix/distinfo
index b8ff876819..0e55d1f944 100644
--- a/nix/distinfo
+++ b/nix/distinfo
@@ -1,6 +1,10 @@
 $NetBSD$
 
-SHA1 (nix/2.2.1.tar.gz) = c4fe22ab7d058a94a841b2c12791e9cc74fee629
-RMD160 (nix/2.2.1.tar.gz) = 3a21c478082061d18d4c11e6b1d86f227d84fbfa
-SHA512 (nix/2.2.1.tar.gz) = 604d830225b2ee65c9206e93c33bbf35a41cb0d479ec969731281d25d87f236043f8c39ef7d2647e7412fb71336349651e131ec1b414e1679b0d3d097fb884c4
-Size (nix/2.2.1.tar.gz) = 865875 bytes
+SHA1 (nix/2.2.2.tar.gz) = 2bf4001dc70472d695534f04bea3803f546a9594
+RMD160 (nix/2.2.2.tar.gz) = 5d95c107c10833c52e674f75ffab3e06f2657082
+SHA512 (nix/2.2.2.tar.gz) = 793fb94a4fa7959651238d7b31853cba231a0016d2d7cb2ab5b8445ad9fbfe738673cfc1cc8666a2c59898bfda481c1b8d31c64af65123052f11194867f2a97d
+Size (nix/2.2.2.tar.gz) = 865747 bytes
+SHA1 (patch-aa__configure_ac) = 6c20b077d347ed08a73e64a189d67e11f75ebe23
+SHA1 (patch-ab__Makefile_config_in) = aecad05838282840f966b1f529e7b87dfe6f6c41
+SHA1 (patch-mk__libraries_mk) = 1ea7f8d5b6d743efa146dc9f9d1773bd01c4ec60
+SHA1 (patch-mk__programs_mk) = 5b8481e4d47f57f1d4fb02d94a8804216d3a8867
diff --git a/nix/patches/patch-aa__configure_ac b/nix/patches/patch-aa__configure_ac
new file mode 100644
index 0000000000..6f53d4beb2
--- /dev/null
+++ b/nix/patches/patch-aa__configure_ac
@@ -0,0 +1,8 @@
+Respect CFLAGS and CXXFLAGS.
+--- configure.ac~
++++ configure.ac
+@@ -57,4 +57,2 @@ fi
+ 
+-CFLAGS=
+-CXXFLAGS=
+ AC_PROG_CC
diff --git a/nix/patches/patch-ab__Makefile_config_in b/nix/patches/patch-ab__Makefile_config_in
new file mode 100644
index 0000000000..32acfc74c0
--- /dev/null
+++ b/nix/patches/patch-ab__Makefile_config_in
@@ -0,0 +1,8 @@
+
+--- Makefile.config.in~
++++ Makefile.config.in
+@@ -5,3 +5,4 @@ CXX = @CXX@
+ CXXFLAGS = @CXXFLAGS@
++LDFLAGS = @LDFLAGS@
+ ENABLE_S3 = @ENABLE_S3@
+ HAVE_SODIUM = @HAVE_SODIUM@
diff --git a/nix/patches/patch-mk__libraries_mk b/nix/patches/patch-mk__libraries_mk
new file mode 100644
index 0000000000..8b4470ad99
--- /dev/null
+++ b/nix/patches/patch-mk__libraries_mk
@@ -0,0 +1,11 @@
+--- mk/libraries.mk~
++++ mk/libraries.mk
+@@ -88,3 +88,3 @@ define build-library
+     $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) | $$(_d)/
+-	$$(trace-ld) $(CXX) -o $$(abspath $$@) -shared $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) $$($(1)_LDFLAGS_UNINSTALLED)
++	$$(trace-ld) $(CXX) -o $$(abspath $$@) -shared $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) $$($(1)_LDFLAGS_UNINSTALLED)
+ 
+@@ -102,3 +102,3 @@ define build-library
+     $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $(DESTDIR)$$($(1)_INSTALL_DIR)/
+-	$$(trace-ld) $(CXX) -o $$@ -shared $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED))
++	$$(trace-ld) $(CXX) -o $$@ -shared $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED))
diff --git a/nix/patches/patch-mk__programs_mk b/nix/patches/patch-mk__programs_mk
new file mode 100644
index 0000000000..4384271d5f
--- /dev/null
+++ b/nix/patches/patch-mk__programs_mk
@@ -0,0 +1,12 @@
+--- mk/programs.mk~
++++ mk/programs.mk
+@@ -34,3 +34,3 @@ define build-program
+   $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) | $$(_d)/
+-	$$(trace-ld) $(CXX) -o $$@ $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE))
++	$$(trace-ld) $(CXX) -o $$@ $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE))
+ 
+@@ -48,3 +48,3 @@ define build-program
+     $(DESTDIR)$$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $(DESTDIR)$$($(1)_INSTALL_DIR)/
+-	$$(trace-ld) $(CXX) -o $$@ $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED))
++	$$(trace-ld) $(CXX) -o $$@ $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED))
+