From 6323b0729a27f312ba8cce6279de68181644823e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 1 Nov 2018 15:17:35 +0100
Subject: Disable the S3 content-encoding patch

Since we're not using multi-part uploads at the moment, we can drop
this patch.
---
 release-common.nix                    | 2 ++
 shell.nix                             | 2 +-
 src/libstore/s3-binary-cache-store.cc | 5 ++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/release-common.nix b/release-common.nix
index ace2a4f9b91f..9f584993daa1 100644
--- a/release-common.nix
+++ b/release-common.nix
@@ -64,10 +64,12 @@ rec {
         apis = ["s3" "transfer"];
         customMemoryManagement = false;
       }).overrideDerivation (args: {
+        /*
         patches = args.patches or [] ++ [ (fetchpatch {
           url = https://github.com/edolstra/aws-sdk-cpp/commit/3e07e1f1aae41b4c8b340735ff9e8c735f0c063f.patch;
           sha256 = "1pij0v449p166f9l29x7ppzk8j7g9k9mp15ilh5qxp29c7fnvxy2";
         }) ];
+        */
       }));
 
   perlDeps =
diff --git a/shell.nix b/shell.nix
index c04bcd151309..817684b7646e 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,6 +1,6 @@
 { useClang ? false }:
 
-with import (builtins.fetchGit { url = https://github.com/NixOS/nixpkgs-channels.git; ref = "nixos-18.03"; }) {};
+with import (builtins.fetchGit { url = https://github.com/NixOS/nixpkgs-channels.git; ref = "nixos-18.09"; }) {};
 
 with import ./release-common.nix { inherit pkgs; };
 
diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc
index 1f755ba9eee7..4f1e23198ffe 100644
--- a/src/libstore/s3-binary-cache-store.cc
+++ b/src/libstore/s3-binary-cache-store.cc
@@ -292,11 +292,14 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore
 
         if (transferManager) {
 
+            if (contentEncoding != "")
+                throw Error("setting a content encoding is not supported with S3 multi-part uploads");
+
             std::shared_ptr<TransferHandle> transferHandle =
                 transferManager->UploadFile(
                     stream, bucketName, path, mimeType,
                     Aws::Map<Aws::String, Aws::String>(),
-                    nullptr, contentEncoding);
+                    nullptr /*, contentEncoding */);
 
             transferHandle->WaitUntilFinished();
 
-- 
cgit 1.4.1