Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0828ace09b99
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3a6a2f88f263
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Dec 26, 2020

  1. Fix compatibility with newer AWS SDKs (#4316)

    Tested against AWS SDK 1.8.99. Fixes #3201.
    
    (cherry picked from commit e20a3ec)
    stephank authored and orivej committed Dec 26, 2020
    Copy the full SHA
    024c0ea View commit details

Commits on Dec 28, 2020

  1. Merge pull request #4404 from orivej/2.3-aws-sdk-cpp

    Backport compatibility with newer AWS SDKs to 2.3 (#4316)
    edolstra authored Dec 28, 2020
    Copy the full SHA
    3a6a2f8 View commit details
Showing with 5 additions and 0 deletions.
  1. +1 −0 configure.ac
  2. +4 −0 src/libstore/s3-binary-cache-store.cc
1 change: 1 addition & 0 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -238,6 +238,7 @@ if test -n "$enable_s3"; then
declare -a aws_version_tokens=($(printf '#include <aws/core/VersionConfig.h>\nAWS_SDK_VERSION_STRING' | $CPP $CPPFLAGS - | grep -v '^#.*' | sed 's/"//g' | tr '.' ' '))
AC_DEFINE_UNQUOTED([AWS_VERSION_MAJOR], ${aws_version_tokens@<:@0@:>@}, [Major version of aws-sdk-cpp.])
AC_DEFINE_UNQUOTED([AWS_VERSION_MINOR], ${aws_version_tokens@<:@1@:>@}, [Minor version of aws-sdk-cpp.])
AC_DEFINE_UNQUOTED([AWS_VERSION_PATCH], ${aws_version_tokens@<:@2@:>@}, [Patch version of aws-sdk-cpp.])
fi


4 changes: 4 additions & 0 deletions src/libstore/s3-binary-cache-store.cc
Original file line number Diff line number Diff line change
@@ -56,6 +56,10 @@ class AwsLogger : public Aws::Utils::Logging::FormattedLogSystem
{
debug("AWS: %s", chomp(statement));
}

#if !(AWS_VERSION_MAJOR <= 1 && AWS_VERSION_MINOR <= 7 && AWS_VERSION_PATCH <= 115)
void Flush() override {}
#endif
};

static void initAWS()