Date: Fri, 9 Sep 2022 21:17:17 GMT From: Mateusz Piotrowski <0mp@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d2bf901d4386 - main - sysutils/nix: Update to 2.3.11 Message-ID: <202209092117.289LHH3R044032@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=d2bf901d4386be8c01c363d47a9513b22a452f83 commit d2bf901d4386be8c01c363d47a9513b22a452f83 Author: Lincoln Auster <lincolnauster@gmail.com> AuthorDate: 2022-08-22 18:44:17 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2022-09-09 21:13:53 +0000 sysutils/nix: Update to 2.3.11 --- sysutils/nix/Makefile | 3 +- sysutils/nix/distinfo | 6 +- .../patch-src_libstore_s3-binary-cache-store.cc | 104 --------------------- 3 files changed, 4 insertions(+), 109 deletions(-) diff --git a/sysutils/nix/Makefile b/sysutils/nix/Makefile index e0e506509d47..666d4acc01fb 100644 --- a/sysutils/nix/Makefile +++ b/sysutils/nix/Makefile @@ -1,6 +1,5 @@ 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 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<std::stringstream>("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<std::stringstream &>(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> transferHandle = - transferManager->UploadFile( -- stream, bucketName, path, mimeType, -+ stream, bucketName.c_str(), path.c_str(), mimeType.c_str(), - Aws::Map<Aws::String, Aws::String>(), - 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<istringstream_nocopy>(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();
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202209092117.289LHH3R044032>