Index: branches/2021Q1/sysutils/nix/Makefile =================================================================== --- branches/2021Q1/sysutils/nix/Makefile (revision 564729) +++ branches/2021Q1/sysutils/nix/Makefile (revision 564730) @@ -1,114 +1,117 @@ # Created by: Mateusz Piotrowski <0mp@FreeBSD.org> # $FreeBSD$ PORTNAME= nix -DISTVERSION= 2.3.7 +DISTVERSION= 2.3.10 +PORTREVISION= 1 CATEGORIES= sysutils +PATCH_SITES= https://github.com/NixOS/nix/commit/ +PATCHFILES= 7c112351d9e941567e64063638396259546d9a48.patch:-p1 # libutil: EPERM from kill(-1, ...) is fine #4530 MAINTAINER= 0mp@FreeBSD.org COMMENT= Purely functional package manager LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/share/aclocal/ax_cxx_compile_stdcxx.m4:devel/autoconf-archive \ bash:shells/bash \ docbook-xsl-ns>=0:textproc/docbook-xsl-ns \ gnustat:sysutils/coreutils \ grealpath:sysutils/coreutils \ xmllint:textproc/libxml2 \ xsltproc:textproc/libxslt LIB_DEPENDS= libaws-cpp-sdk-core.so:devel/aws-sdk-cpp \ libboost_context.so:devel/boost-libs \ libbrotlienc.so:archivers/brotli \ libcurl.so:ftp/curl \ libeditline.so:devel/editline \ libgc.so:devel/boehm-gc \ libsodium.so:security/libsodium TEST_DEPENDS= dot:graphics/graphviz \ git:devel/git \ gxargs:misc/findutils \ hg:devel/mercurial USES= autoreconf bison compiler:c++17-lang gmake localbase pkgconfig \ sqlite:3 ssl USE_GITHUB= yes GH_ACCOUNT= NixOS USE_LDCONFIG= yes HAS_CONFIGURE= yes # Workaround for bashisms in the configure script. CONFIGURE_SHELL= ${_BASH} CONFIGURE_ARGS= --disable-seccomp-sandboxing \ --enable-gc CONFIGURE_ENV= OPENSSL_CFLAGS="-I ${OPENSSLINC}" \ OPENSSL_LIBS="-L ${OPENSSLLIB}" # Workaround for: # /usr/bin/ld: error: undefined symbol: SHA512_Update MAKE_ARGS= libutil_ALLOW_UNDEFINED=yes # XXX: Tests require the port to be installed on the system. It is not enough # to have the port staged. TEST_ARGS= nix_tests="${_PASSING_TESTS}" TEST_TARGET= installcheck # grealpath and gnustat are needed for tests. BINARY_ALIAS= realpath=grealpath stat=gnustat SUB_FILES= pkg-message GROUPS= nixbld OPTIONS_DEFINE= DOCS _BASH= ${LOCALBASE}/bin/bash _STRIP_TARGETS= bin/nix bin/nix-build bin/nix-channel bin/nix-collect-garbage \ bin/nix-copy-closure bin/nix-daemon bin/nix-env \ bin/nix-instantiate bin/nix-prefetch-url bin/nix-store \ lib/libnixexpr.so lib/libnixmain.so lib/libnixstore.so \ lib/libnixutil.so # Regenerate the list of all tests with: # make patch && make -f $(make -V WRKSRC)/tests/local.mk -V nix_tests _ALL_TESTS= init.sh hash.sh lang.sh add.sh simple.sh dependencies.sh gc.sh \ gc-concurrent.sh gc-auto.sh referrers.sh user-envs.sh \ logging.sh nix-build.sh misc.sh fixed.sh gc-runtime.sh \ check-refs.sh filter-source.sh remote-store.sh export.sh \ export-graph.sh timeout.sh secure-drv-outputs.sh nix-channel.sh \ multiple-outputs.sh import-derivation.sh fetchurl.sh \ optimise-store.sh binary-cache.sh nix-profile.sh repair.sh \ dump-db.sh case-hack.sh check-reqs.sh pass-as-file.sh \ tarball.sh restricted.sh placeholders.sh nix-shell.sh \ linux-sandbox.sh build-dry.sh build-remote.sh nar-access.sh \ structured-attrs.sh fetchGit.sh fetchMercurial.sh signing.sh \ run.sh brotli.sh pure-eval.sh check.sh plugins.sh search.sh \ nix-copy-ssh.sh post-hook.sh function-trace.sh # Remove problematic tests from the list: # - restricted.sh is hanging and never finishes. _PASSING_TESTS= ${_ALL_TESTS:Nrestricted.sh} post-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${FILESDIR}/add-nixbld-users ${STAGEDIR}${DATADIR} @${RM} ${STAGEDIR}${PREFIX}/libexec/nix/build-remote @${RLN} ${STAGEDIR}${PREFIX}/bin/nix ${STAGEDIR}${PREFIX}/libexec/nix/build-remote @cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} ${_STRIP_TARGETS} pre-test: ${MKDIR} /tmp/nix-test ${REINPLACE_CMD} -e 's| xargs | gxargs |g' ${WRKSRC}/tests/push-to-store.sh ${REINPLACE_CMD} -e 's| touch | /usr/bin/touch |g' ${WRKSRC}/tests/timeout.nix ${REINPLACE_CMD} -e 's| touch | /usr/bin/touch |g' ${WRKSRC}/tests/check-reqs.nix ${REINPLACE_CMD} -e 's| touch | /usr/bin/touch |g' ${WRKSRC}/tests/nar-access.nix ${REINPLACE_CMD} -e 's| touch | /usr/bin/touch |g' ${WRKSRC}/tests/pass-as-file.sh ${REINPLACE_CMD} -e 's| date | ${LOCALBASE}/bin/gdate |g' ${WRKSRC}/tests/check.nix ${REINPLACE_CMD} -e 's| wc -l)| /usr/bin/grep -c .)|g' ${WRKSRC}/tests/gc-auto.sh ${REINPLACE_CMD} -e 's| tar c tarball)| tar -cf - tarball)|' ${WRKSRC}/tests/tarball.sh ${REINPLACE_CMD} -e 's|^grep |/usr/bin/grep |' ${WRKSRC}/tests/check.sh post-test: ${RM} -r /tmp/nix-test .include Index: branches/2021Q1/sysutils/nix/distinfo =================================================================== --- branches/2021Q1/sysutils/nix/distinfo (revision 564729) +++ branches/2021Q1/sysutils/nix/distinfo (revision 564730) @@ -1,3 +1,5 @@ -TIMESTAMP = 1600718771 -SHA256 (NixOS-nix-2.3.7_GH0.tar.gz) = d5ea34196922c5f0d962649929be2a489b8cd29effcf1481c63aca154c65e739 -SIZE (NixOS-nix-2.3.7_GH0.tar.gz) = 900906 +TIMESTAMP = 1612780772 +SHA256 (NixOS-nix-2.3.10_GH0.tar.gz) = 04e1c7c625b753df35bf0e0a952d1a886fd6c6b582190832d57a7269241b4b50 +SIZE (NixOS-nix-2.3.10_GH0.tar.gz) = 903852 +SHA256 (7c112351d9e941567e64063638396259546d9a48.patch) = 22d513a2337a61d5cebf7ed1542b9d72d6cbc57f99bcd10f3e311870e71d9e3a +SIZE (7c112351d9e941567e64063638396259546d9a48.patch) = 2050 Index: branches/2021Q1 =================================================================== --- branches/2021Q1 (revision 564729) +++ branches/2021Q1 (revision 564730) Property changes on: branches/2021Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r560702,564693