diff --git a/sysutils/nix/Makefile b/sysutils/nix/Makefile index e0e506509d47..666d4acc01fb 100644 --- a/sysutils/nix/Makefile +++ b/sysutils/nix/Makefile @@ -1,117 +1,116 @@ PORTNAME= nix -DISTVERSION= 2.3.10 -PORTREVISION= 3 +DISTVERSION= 2.3.11 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 WWW= https://nixos.org/nix/ 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 cpe gmake localbase pkgconfig \ sqlite:3 ssl USE_GITHUB= yes GH_ACCOUNT= NixOS USE_LDCONFIG= yes CPE_VENDOR= nix_project 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 diff --git a/sysutils/nix/distinfo b/sysutils/nix/distinfo index 55f397307459..eaa7d35673d2 100644 --- a/sysutils/nix/distinfo +++ b/sysutils/nix/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1612780772 -SHA256 (NixOS-nix-2.3.10_GH0.tar.gz) = 04e1c7c625b753df35bf0e0a952d1a886fd6c6b582190832d57a7269241b4b50 -SIZE (NixOS-nix-2.3.10_GH0.tar.gz) = 903852 +TIMESTAMP = 1661019919 +SHA256 (NixOS-nix-2.3.11_GH0.tar.gz) = 3980c8c84f9d8969d949a05557819686c8ddedb9217e18a26396f67fc353b6e4 +SIZE (NixOS-nix-2.3.11_GH0.tar.gz) = 904939 SHA256 (7c112351d9e941567e64063638396259546d9a48.patch) = 22d513a2337a61d5cebf7ed1542b9d72d6cbc57f99bcd10f3e311870e71d9e3a SIZE (7c112351d9e941567e64063638396259546d9a48.patch) = 2050 diff --git a/sysutils/nix/files/patch-src_libstore_s3-binary-cache-store.cc b/sysutils/nix/files/patch-src_libstore_s3-binary-cache-store.cc deleted file mode 100644 index 8c9de342292f..000000000000 --- a/sysutils/nix/files/patch-src_libstore_s3-binary-cache-store.cc +++ /dev/null @@ -1,104 +0,0 @@ ---- src/libstore/s3-binary-cache-store.cc.orig 2019-10-10 13:03:46 UTC -+++ src/libstore/s3-binary-cache-store.cc -@@ -44,7 +44,7 @@ R && checkAws(const FormatOrString & fs, Aws::Utils::O - if (!outcome.IsSuccess()) - throw S3Error( - outcome.GetError().GetErrorType(), -- fs.s + ": " + outcome.GetError().GetMessage()); -+ fs.s + ": " + outcome.GetError().GetMessage().c_str()); - return outcome.GetResultWithOwnership(); - } - -@@ -54,8 +54,10 @@ class AwsLogger : public Aws::Utils::Logging::Formatte - - void ProcessFormattedStatement(Aws::String && statement) override - { -- debug("AWS: %s", chomp(statement)); -+ debug("AWS: %s", chomp((const std::string &)statement)); - } -+ -+ void Flush() override {} - }; - - static void initAWS() -@@ -139,8 +141,8 @@ S3Helper::DownloadResult S3Helper::getObject( - - auto request = - Aws::S3::Model::GetObjectRequest() -- .WithBucket(bucketName) -- .WithKey(key); -+ .WithBucket(bucketName.c_str()) -+ .WithKey(key.c_str()); - - request.SetResponseStreamFactory([&]() { - return Aws::New("STRINGSTREAM"); -@@ -155,7 +157,7 @@ S3Helper::DownloadResult S3Helper::getObject( - auto result = checkAws(fmt("AWS error fetching '%s'", key), - client->GetObject(request)); - -- res.data = decompress(result.GetContentEncoding(), -+ res.data = decompress(result.GetContentEncoding().c_str(), - dynamic_cast(result.GetBody()).str()); - - } catch (S3Error & e) { -@@ -238,8 +240,8 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheSt - - auto res = s3Helper.client->HeadObject( - Aws::S3::Model::HeadObjectRequest() -- .WithBucket(bucketName) -- .WithKey(path)); -+ .WithBucket(bucketName.c_str()) -+ .WithKey(path.c_str())); - - if (!res.IsSuccess()) { - auto & error = res.GetError(); -@@ -302,7 +304,7 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheSt - - std::shared_ptr transferHandle = - transferManager->UploadFile( -- stream, bucketName, path, mimeType, -+ stream, bucketName.c_str(), path.c_str(), mimeType.c_str(), - Aws::Map(), - nullptr /*, contentEncoding */); - -@@ -320,13 +322,13 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheSt - - auto request = - Aws::S3::Model::PutObjectRequest() -- .WithBucket(bucketName) -- .WithKey(path); -+ .WithBucket(bucketName.c_str()) -+ .WithKey(path.c_str()); - -- request.SetContentType(mimeType); -+ request.SetContentType(mimeType.c_str()); - - if (contentEncoding != "") -- request.SetContentEncoding(contentEncoding); -+ request.SetContentEncoding(contentEncoding.c_str()); - - auto stream = std::make_shared(data); - -@@ -393,9 +395,9 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheSt - auto res = checkAws(format("AWS error listing bucket '%s'") % bucketName, - s3Helper.client->ListObjects( - Aws::S3::Model::ListObjectsRequest() -- .WithBucket(bucketName) -+ .WithBucket(bucketName.c_str()) - .WithDelimiter("/") -- .WithMarker(marker))); -+ .WithMarker(marker.c_str()))); - - auto & contents = res.GetContents(); - -@@ -404,8 +406,8 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheSt - - for (auto object : contents) { - auto & key = object.GetKey(); -- if (key.size() != 40 || !hasSuffix(key, ".narinfo")) continue; -- paths.insert(storeDir + "/" + key.substr(0, key.size() - 8)); -+ if (key.size() != 40 || !hasSuffix(key.c_str(), ".narinfo")) continue; -+ paths.insert(storeDir + "/" + key.substr(0, key.size() - 8).c_str()); - } - - marker = res.GetNextMarker();