gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Aws updates (#340368)

Browse Source
This commit is contained in:
Artturin
2024-11-19 19:41:25 +02:00
committed by GitHub
parent 5dbdfc00df 83c4a9c338
commit 535a417c32
14 changed files with 52 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/aw/aws-c-auth/package.nix
+3 -2
View File
@@ -14,13 +14,14 @@
stdenv.mkDerivation rec {
pname = "aws-c-auth";
version = "0.7.26";
# nixpkgs-update: no auto update
version = "0.8.0";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-auth";
rev = "v${version}";
hash = "sha256-02dy2xgMGWkLf+HyBztbkCcazfZNAMwpJPU2gGBPokY=";
hash = "sha256-wVHTfiAejAra8LnytxSJijUXHDmEwAj5D+wXOKq32B4=";
};
nativeBuildInputs = [
pkgs/by-name/aw/aws-c-common/package.nix
+3 -4
View File
@@ -7,13 +7,14 @@
stdenv.mkDerivation rec {
pname = "aws-c-common";
version = "0.9.27";
# nixpkgs-update: no auto update
version = "0.10.3";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
hash = "sha256-VbF+R2LB5M2luOoQ/HsAOqk/ujHSW4QJC0OTzNnu9PM=";
hash = "sha256-sA6CsLLHh4Ce/+ffl4OhisMSgdrD+EmXvTNGSq7/vvk=";
};
nativeBuildInputs = [ cmake ];
@@ -32,8 +33,6 @@ stdenv.mkDerivation rec {
preCheck = let
ignoreTests = [
"promise_test_multiple_waiters"
] ++ lib.optionals stdenv.hostPlatform.isMusl [
"sba_metrics" # https://github.com/awslabs/aws-c-common/issues/839
];
in ''
cat <<EOW >CTestCustom.cmake
pkgs/by-name/aw/aws-c-compression/package.nix
+3 -2
View File
@@ -7,13 +7,14 @@
stdenv.mkDerivation rec {
pname = "aws-c-compression";
version = "0.2.19";
# nixpkgs-update: no auto update
version = "0.3.0";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-compression";
rev = "v${version}";
sha256 = "sha256-Zr1C47YaTkMlG7r2WtAkxRfjZRuBKeTXzNIGspdLap4=";
sha256 = "sha256-EjvOf2UMju6pycPdYckVxqQ34VOhrIIyvK+O3AVRED4=";
};
nativeBuildInputs = [
pkgs/by-name/aw/aws-c-event-stream/package.nix
+3 -2
View File
@@ -2,13 +2,14 @@
stdenv.mkDerivation rec {
pname = "aws-c-event-stream";
version = "0.4.3";
# nixpkgs-update: no auto update
version = "0.5.0";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
hash = "sha256-xLgPFy+wFtUe3GawICrAHyji+mkfxC2jw7lsL+p7pl4=";
hash = "sha256-lg1qS/u5Fi8nt/tv2ekd8dgQ7rlrF3DrRxqidAoEywY=";
};
nativeBuildInputs = [ cmake ];
pkgs/by-name/aw/aws-c-http/package.nix
+3 -2
View File
@@ -11,13 +11,14 @@
stdenv.mkDerivation rec {
pname = "aws-c-http";
version = "0.8.2";
# nixpkgs-update: no auto update
version = "0.9.2";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-http";
rev = "v${version}";
hash = "sha256-86auAZGoaYIpoTVlB9uC+nKMNt1QRNor+/68B5D36r8=";
hash = "sha256-3nT64dFUcuwPfhQDwY5MTe/xPdr7XZMBpVL7V0y9tng=";
};
nativeBuildInputs = [
pkgs/by-name/aw/aws-c-mqtt/package.nix
+3 -2
View File
@@ -13,13 +13,14 @@
stdenv.mkDerivation rec {
pname = "aws-c-mqtt";
version = "0.10.5";
# nixpkgs-update: no auto update
version = "0.11.0";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-mqtt";
rev = "v${version}";
hash = "sha256-PByF0P+4gwSQKk7qHc79p025TbWZ0QeFXqO2GOtuaII=";
hash = "sha256-gIoC3OG6VFzNH9/DjuC42eCIuN+w1AikaGAbx6ao8qQ=";
};
nativeBuildInputs = [
pkgs/by-name/aw/aws-c-s3/package.nix
+3 -2
View File
@@ -14,13 +14,14 @@
stdenv.mkDerivation rec {
pname = "aws-c-s3";
version = "0.6.0";
# nixpkgs-update: no auto update
version = "0.7.1";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-s3";
rev = "v${version}";
hash = "sha256-qPVITirqhExIeayh6AWEyAXPlkUtk7gkIcmT/IpNisw=";
hash = "sha256-UE42U3UszobaUdo0ry9IlwTbSbGqmYkux19ILrVgUZY=";
};
nativeBuildInputs = [
pkgs/by-name/aw/aws-c-sdkutils/package.nix
+3 -2
View File
@@ -7,13 +7,14 @@
stdenv.mkDerivation rec {
pname = "aws-c-sdkutils";
version = "0.1.16";
# nixpkgs-update: no auto update
version = "0.2.1";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-sdkutils";
rev = "v${version}";
hash = "sha256-ih7U2uP5FrBx6or1Rp/k+HWDE6evEZyNM//wsPxH9Qo=";
hash = "sha256-Z9c+uBiGMXW5v+khdNaElhno16ikBO4voTzwd2mP6rA=";
};
nativeBuildInputs = [
pkgs/by-name/aw/aws-checksums/package.nix
+3 -2
View File
@@ -2,13 +2,14 @@
stdenv.mkDerivation rec {
pname = "aws-checksums";
version = "0.1.18";
# nixpkgs-update: no auto update
version = "0.2.2";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-EhIVa8/IK4evGt4vYECunLpxrCMSOsr1RZ/8hFbRi9M=";
sha256 = "sha256-hiqV6FrOZ19YIxL3UKBuexLJwoC2mY7lqysnV7ze0gg=";
};
nativeBuildInputs = [ cmake ];
pkgs/by-name/aw/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch
+13 -7
View File
@@ -1,15 +1,17 @@
From fd3f3a28e7fce7fe4e10ed2d7edc4bfda8ab27df Mon Sep 17 00:00:00 2001
From b3a46b9a2a9f86ff416a0ff5f84882c0dedebd14 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 9 Jan 2022 01:57:18 +0100
Subject: [PATCH] build: Make includedir properly overrideable
This is required by some package managers like Nix.
Co-authored-by: Artturin <Artturin@artturin.com>
---
CMakeLists.txt | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
CMakeLists.txt | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec6d172..6514c23 100644
index 9f062ca..b28f13c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,6 +49,10 @@ if(${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
@@ -23,7 +25,7 @@ index ec6d172..6514c23 100644
if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 11)
endif()
@@ -307,7 +311,7 @@ endif()
@@ -329,7 +333,7 @@ endif()
target_include_directories(${PROJECT_NAME} PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${GENERATED_INCLUDE_DIR}>
@@ -32,28 +34,32 @@ index ec6d172..6514c23 100644
aws_use_package(aws-c-http)
aws_use_package(aws-c-mqtt)
@@ -324,14 +328,14 @@ aws_add_sanitizers(${PROJECT_NAME})
@@ -346,16 +350,16 @@ aws_add_sanitizers(${PROJECT_NAME})
target_link_libraries(${PROJECT_NAME} PUBLIC ${DEP_AWS_LIBS})
-install(FILES ${AWS_CRT_HEADERS} DESTINATION "include/aws/crt" COMPONENT Development)
-install(FILES ${AWS_CRT_AUTH_HEADERS} DESTINATION "include/aws/crt/auth" COMPONENT Development)
-install(FILES ${AWS_CRT_CHECKSUM_HEADERS} DESTINATION "include/aws/crt/checksum" COMPONENT Development)
-install(FILES ${AWS_CRT_CRYPTO_HEADERS} DESTINATION "include/aws/crt/crypto" COMPONENT Development)
-install(FILES ${AWS_CRT_IO_HEADERS} DESTINATION "include/aws/crt/io" COMPONENT Development)
-install(FILES ${AWS_CRT_IOT_HEADERS} DESTINATION "include/aws/iot" COMPONENT Development)
-install(FILES ${AWS_CRT_MQTT_HEADERS} DESTINATION "include/aws/crt/mqtt" COMPONENT Development)
-install(FILES ${AWS_CRT_HTTP_HEADERS} DESTINATION "include/aws/crt/http" COMPONENT Development)
-install(FILES ${AWS_CRT_ENDPOINT_HEADERS} DESTINATION "include/aws/crt/endpoints" COMPONENT Development)
-install(FILES ${AWS_CRT_CBOR_HEADERS} DESTINATION "include/aws/crt/cbor" COMPONENT Development)
+install(FILES ${AWS_CRT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt" COMPONENT Development)
+install(FILES ${AWS_CRT_AUTH_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/auth" COMPONENT Development)
+install(FILES ${AWS_CRT_CHECKSUM_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/checksum" COMPONENT Development)
+install(FILES ${AWS_CRT_CRYPTO_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/crypto" COMPONENT Development)
+install(FILES ${AWS_CRT_IO_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/io" COMPONENT Development)
+install(FILES ${AWS_CRT_IOT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/iot" COMPONENT Development)
+install(FILES ${AWS_CRT_MQTT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/mqtt" COMPONENT Development)
+install(FILES ${AWS_CRT_HTTP_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/http" COMPONENT Development)
+install(FILES ${AWS_CRT_ENDPOINT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/endpoints" COMPONENT Development)
+install(FILES ${AWS_CRT_CBOR_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/cbor" COMPONENT Development)
install(
TARGETS ${PROJECT_NAME}
--
2.42.0
2.46.0
pkgs/by-name/aw/aws-crt-cpp/package.nix
+3 -2
View File
@@ -17,7 +17,8 @@
stdenv.mkDerivation rec {
pname = "aws-crt-cpp";
version = "0.26.12";
# nixpkgs-update: no auto update
version = "0.29.4";
outputs = [ "out" "dev" ];
@@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
owner = "awslabs";
repo = "aws-crt-cpp";
rev = "v${version}";
sha256 = "sha256-mVihmcl24gFLnF3A/qLSvr2npOotMlBH7TqU5vOwI9g=";
sha256 = "sha256-Uv1BHM39f9soq7kziedqRhHqQ/xwnqcz++1UM5nuo8g=";
};
patches = [
pkgs/development/libraries/aws-c-cal/default.nix
+3 -2
View File
@@ -2,13 +2,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "aws-c-cal";
version = "0.6.15";
# nixpkgs-update: no auto update
version = "0.8.0";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-cal";
rev = "v${finalAttrs.version}";
hash = "sha256-RrUJz3IqwbBJ8NuJTIWqK33FlJHolcaid55PT2EhO24=";
hash = "sha256-dYFUYdMQMT8CZFMrCrhQ8JPEhA4CVf+f7VLFt3JNmn8=";
};
patches = [
pkgs/development/libraries/aws-c-io/default.nix
+3 -2
View File
@@ -2,13 +2,14 @@
stdenv.mkDerivation rec {
pname = "aws-c-io";
version = "0.14.18";
# nixpkgs-update: no auto update
version = "0.15.3";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
hash = "sha256-dKZOgbufmPfksSOvOmzSTR/WjoSzmX8edMiuKAOyoyY=";
hash = "sha256-/pG/+MHAu/TYTtY/RQrr1U1ev2FZ1p/O8kIRUDDOcvQ=";
};
nativeBuildInputs = [ cmake ];
pkgs/development/libraries/aws-sdk-cpp/default.nix
+3 -2
View File
@@ -27,13 +27,14 @@ in
stdenv.mkDerivation rec {
pname = "aws-sdk-cpp";
version = "1.11.336";
# nixpkgs-update: no auto update
version = "1.11.448";
src = fetchFromGitHub {
owner = "aws";
repo = "aws-sdk-cpp";
rev = version;
hash = "sha256-hetXtXM8HG6V3rAuyf+w+DtlxEcpsyaroZsw0nIJoAw=";
hash = "sha256-K0UFs7vOeZeQIs3G5L4FfEWXDGTXT9ssr/vQwa1l2lw=";
};
postPatch = ''