diff options
author | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2022-04-19 00:52:02 -0500 |
---|---|---|
committer | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2022-04-19 18:53:51 -0500 |
commit | f394cc6c547f1162dac673f0fba11eca75022a98 (patch) | |
tree | 5714379a2f624b575f5e7950a142bf3b8c2ddb12 | |
parent | 7d59bd47d2817c9998c0ceef871ec652f8754236 (diff) |
aws-sdk-cpp: 1.9.150 → 1.9.238
-rw-r--r-- | pkgs/development/libraries/aws-sdk-cpp/default.nix | 43 |
1 files changed, 32 insertions, 11 deletions
diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 769cc2d3bd29d..3cd846c87a13b 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -1,7 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, curl, openssl, s2n-tls, zlib +{ lib +, stdenv +, fetchFromGitHub +, cmake +, curl +, openssl +, s2n-tls +, zlib , aws-crt-cpp -, aws-c-cal, aws-c-common, aws-c-event-stream, aws-c-io, aws-checksums -, CoreAudio, AudioToolbox +, aws-c-cal +, aws-c-common +, aws-c-event-stream +, aws-c-io +, aws-checksums +, CoreAudio +, AudioToolbox , # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. apis ? ["*"] , # Whether to enable AWS' custom memory management. @@ -18,16 +30,31 @@ in stdenv.mkDerivation rec { pname = "aws-sdk-cpp"; - version = "1.9.150"; + version = "1.9.238"; src = fetchFromGitHub { owner = "aws"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "sha256-fgLdXWQKHaCwulrw9KV3vpQ71DjnQAL4heIRW7Rk7UY="; + sha256 = "sha256-pEmsTfZXsvJMV79dGkjDNbUVajwyoYgzE5DCsC53pGY="; }; postPatch = '' + # Missing includes for GCC11 + sed '5i#include <thread>' -i \ + aws-cpp-sdk-cloudfront-integration-tests/CloudfrontOperationTest.cpp \ + aws-cpp-sdk-cognitoidentity-integration-tests/IdentityPoolOperationTest.cpp \ + aws-cpp-sdk-dynamodb-integration-tests/TableOperationTest.cpp \ + aws-cpp-sdk-elasticfilesystem-integration-tests/ElasticFileSystemTest.cpp \ + aws-cpp-sdk-lambda-integration-tests/FunctionTest.cpp \ + aws-cpp-sdk-mediastore-data-integration-tests/MediaStoreDataTest.cpp \ + aws-cpp-sdk-queues/source/sqs/SQSQueue.cpp \ + aws-cpp-sdk-redshift-integration-tests/RedshiftClientTest.cpp \ + aws-cpp-sdk-s3-crt-integration-tests/BucketAndObjectOperationTest.cpp \ + aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp \ + aws-cpp-sdk-s3control-integration-tests/S3ControlTest.cpp \ + aws-cpp-sdk-sqs-integration-tests/QueueOperationTest.cpp \ + aws-cpp-sdk-transfer-tests/TransferTests.cpp # Flaky on Hydra rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp # Includes aws-c-auth private headers, so only works with submodule build @@ -82,12 +109,6 @@ stdenv.mkDerivation rec { patches = [ ./cmake-dirs.patch - - # fix cmake config - (fetchpatch { - url = "https://github.com/aws/aws-sdk-cpp/commit/b102aaf5693c4165c84b616ab9ffb9edfb705239.diff"; - sha256 = "sha256-38QBo3MEFpyHPb8jZEURRPkoeu4DqWhVeErJayiHKF0="; - }) ]; # Builds in 2+h with 2 cores, and ~10m with a big-parallel builder. |