From 3e84523ed74a51e2a463c5811bbfc162d6f4e34f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 29 Dec 2016 16:25:58 +0100
Subject: aws-sdk-cpp: 1.0.43 -> 1.0.48

---
 pkgs/development/libraries/aws-sdk-cpp/default.nix     |  6 ++----
 .../libraries/aws-sdk-cpp/s3-encryption-headers.patch  | 18 ------------------
 2 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/development/libraries/aws-sdk-cpp/s3-encryption-headers.patch

(limited to 'pkgs/development/libraries/aws-sdk-cpp')

diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index bb07b41b059..54d490b77af 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -7,17 +7,15 @@
 
 stdenv.mkDerivation rec {
   name = "aws-sdk-cpp-${version}";
-  version = "1.0.43";
+  version = "1.0.48";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-sdk-cpp";
     rev = version;
-    sha256 = "0sa0pkkbxxfn3h7b19yf296r5g5nqm4aqpwrkij0rq7jix9lxqj6";
+    sha256 = "1k73ir1w6457y9mdv2xnk8cr1y1xxhzzd4095rzvn2y7fr3zgz01";
   };
 
-  patches = [ ./s3-encryption-headers.patch ];
-
   # FIXME: might be nice to put different APIs in different outputs
   # (e.g. libaws-cpp-sdk-s3.so in output "s3").
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/aws-sdk-cpp/s3-encryption-headers.patch b/pkgs/development/libraries/aws-sdk-cpp/s3-encryption-headers.patch
deleted file mode 100644
index 10e427a1509..00000000000
--- a/pkgs/development/libraries/aws-sdk-cpp/s3-encryption-headers.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/aws-cpp-sdk-s3-encryption/CMakeLists.txt b/aws-cpp-sdk-s3-encryption/CMakeLists.txt
-index 0a1a907..cf9ce0e 100644
---- a/aws-cpp-sdk-s3-encryption/CMakeLists.txt
-+++ b/aws-cpp-sdk-s3-encryption/CMakeLists.txt
-@@ -69,9 +69,9 @@ target_link_libraries(${PROJECT_NAME} ${PROJECT_LIBS})
- 
- setup_install()
- 
--install (FILES ${S3ENCRYPTION_HEADERS} DESTINATION include/aws/s3-encryption)
--install (FILES ${S3ENCRYPTION_MATERIALS_HEADERS} DESTINATION include/aws/s3-encryption/materials)
--install (FILES ${S3ENCRYPTION_HANDLERS_HEADERS} DESTINATION include/aws/s3-encryption/handlers)
--install (FILES ${S3ENCRYPTION_MODULES_HEADERS} DESTINATION include/aws/s3-encryption/modules)
-+install (FILES ${S3ENCRYPTION_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/s3-encryption)
-+install (FILES ${S3ENCRYPTION_MATERIALS_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/s3-encryption/materials)
-+install (FILES ${S3ENCRYPTION_HANDLERS_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/s3-encryption/handlers)
-+install (FILES ${S3ENCRYPTION_MODULES_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/s3-encryption/modules)
- 
- do_packaging()
-- 
cgit 1.4.1