b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #141014 from r-burns/aws-bump-to-end-all-bumps

Browse source
This commit is contained in:
Sandro 2021-10-16 19:12:17 +02:00 committed by GitHub
parent 53047012ab abbb7c6e60
commit 9ff962dd55
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 359 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
pkgs/development/libraries/aws-c-auth/default.nix Normal file
View file

@ -0,0 +1,48 @@
{ lib, stdenv
, fetchFromGitHub
, aws-c-cal
, aws-c-common
, aws-c-compression
, aws-c-http
, aws-c-io
, cmake
, s2n-tls
}:
stdenv.mkDerivation rec {
pname = "aws-c-auth";
version = "0.6.4";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-auth";
rev = "v${version}";
sha256 = "120p69lj279yq3d2b81f45kgfrvf32j6m7s03m8hh27w8yd4vbfp";
};
nativeBuildInputs = [
cmake
];
buildInputs = [
aws-c-cal
aws-c-common
aws-c-compression
aws-c-http
aws-c-io
s2n-tls
];
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DBUILD_SHARED_LIBS=ON"
];
meta = with lib; {
description = "C99 library implementation of AWS client-side authentication";
homepage = "https://github.com/awslabs/aws-c-auth";
license = licenses.asl20;
platforms = platforms.unix;
maintainers = with maintainers; [ r-burns ];
};
}

1
pkgs/development/libraries/aws-c-cal/default.nix
View file

@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
"-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake"
];
meta = with lib; {

18
pkgs/development/libraries/aws-c-common/default.nix
View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-common";
version = "0.6.9";
version = "0.6.12";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-bnKIL51AW+0T87BxEazXDZElYqiwOUHQVEDKOCUzsbM=";
sha256 = "sha256-Bbb6YbPMpzVy+Pa9OGe62TXihTbUeKTlPS29sa70aQ8=";
};
nativeBuildInputs = [ cmake ];
@ -23,10 +23,20 @@ stdenv.mkDerivation rec {
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
];
# aws-c-common misuses cmake modules, so we need
# to manually add a MODULE_PATH to its consumers
setupHook = ./setup-hook.sh;
# Prevent the execution of tests known to be flaky.
preCheck = ''
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
SET(CTEST_CUSTOM_TESTS_IGNORE promise_test_multiple_waiters)
SET(CTEST_CUSTOM_TESTS_IGNORE ${toString ignoreTests})
EOW
'';

5
pkgs/development/libraries/aws-c-common/setup-hook.sh Normal file
View file

@ -0,0 +1,5 @@
addAwsCCommonModuleDir() {
cmakeFlags="-DCMAKE_MODULE_PATH=@out@/lib/cmake ${cmakeFlags:-}"
}
postHooks+=(addAwsCCommonModuleDir)

38
pkgs/development/libraries/aws-c-compression/default.nix Normal file
View file

@ -0,0 +1,38 @@
{ lib, stdenv
, fetchFromGitHub
, aws-c-common
, cmake
}:
stdenv.mkDerivation rec {
pname = "aws-c-compression";
version = "0.2.14";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-compression";
rev = "v${version}";
sha256 = "0fs3zhhzxsb9nfcjpvfbcq79hal7si2ia1c09scab9a8m264f4vd";
};
nativeBuildInputs = [
cmake
];
buildInputs = [
aws-c-common
];
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DBUILD_SHARED_LIBS=ON"
];
meta = with lib; {
description = "C99 implementation of huffman encoding/decoding";
homepage = "https://github.com/awslabs/aws-c-compression";
license = licenses.asl20;
platforms = platforms.unix;
maintainers = with maintainers; [ r-burns ];
};
}

1
pkgs/development/libraries/aws-c-event-stream/default.nix
View file

@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_SHARED_LIBS:BOOL=ON"
"-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake"
];
meta = with lib; {

46
pkgs/development/libraries/aws-c-http/default.nix Normal file
View file

@ -0,0 +1,46 @@
{ lib, stdenv
, fetchFromGitHub
, aws-c-cal
, aws-c-common
, aws-c-compression
, aws-c-io
, cmake
, s2n-tls
}:
stdenv.mkDerivation rec {
pname = "aws-c-http";
version = "0.6.7";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-http";
rev = "v${version}";
sha256 = "1s06bz6w7355ldyhwjidcpbff7591ch4lwwjcj47a6k2kczdmiz4";
};
nativeBuildInputs = [
cmake
];
buildInputs = [
aws-c-cal
aws-c-common
aws-c-compression
aws-c-io
s2n-tls
];
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DBUILD_SHARED_LIBS=ON"
];
meta = with lib; {
description = "C99 implementation of the HTTP/1.1 and HTTP/2 specifications";
homepage = "https://github.com/awslabs/aws-c-http";
license = licenses.asl20;
platforms = platforms.unix;
maintainers = with maintainers; [ r-burns ];
};
}

5
pkgs/development/libraries/aws-c-io/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-io";
version = "0.10.5";
version = "0.10.9";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+H6dUKgpgXG1fh8r6k7TpVFMBso4G762zRfLAZD+Nss=";
sha256 = "sha256-16MhOQlvFwbiSBNI1NWGjrLh0z/fCnAGmc8JguZQPZM=";
};
nativeBuildInputs = [ cmake ];
@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
"-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake"
];
meta = with lib; {

50
pkgs/development/libraries/aws-c-mqtt/default.nix Normal file
View file

@ -0,0 +1,50 @@
{ lib, stdenv
, fetchFromGitHub
, aws-c-cal
, aws-c-common
, aws-c-compression
, aws-c-http
, aws-c-io
, cmake
, ninja
, s2n-tls
}:
stdenv.mkDerivation rec {
pname = "aws-c-mqtt";
version = "0.7.8";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-mqtt";
rev = "v${version}";
sha256 = "19j6nw2v36c4yff4p0fbf0748s06fd5r9cp2yakry9ybn1ada99c";
};
nativeBuildInputs = [
cmake
ninja
];
buildInputs = [
aws-c-cal
aws-c-common
aws-c-compression
aws-c-http
aws-c-io
s2n-tls
];
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DBUILD_SHARED_LIBS=ON"
];
meta = with lib; {
description = "C99 implementation of the MQTT 3.1.1 specification";
homepage = "https://github.com/awslabs/aws-c-mqtt";
license = licenses.asl20;
platforms = platforms.unix;
maintainers = with maintainers; [ r-burns ];
};
}

50
pkgs/development/libraries/aws-c-s3/default.nix Normal file
View file

@ -0,0 +1,50 @@
{ lib, stdenv
, fetchFromGitHub
, aws-c-auth
, aws-c-cal
, aws-c-common
, aws-c-compression
, aws-c-http
, aws-c-io
, cmake
, s2n-tls
}:
stdenv.mkDerivation rec {
pname = "aws-c-s3";
version = "0.1.27";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-s3";
rev = "v${version}";
sha256 = "sha256-GtBUC5cKMN9rd5GQbYoipVvxrUCCNKbb5vhHUGQpeH8=";
};
nativeBuildInputs = [
cmake
];
buildInputs = [
aws-c-auth
aws-c-cal
aws-c-common
aws-c-compression
aws-c-http
aws-c-io
s2n-tls
];
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DBUILD_SHARED_LIBS=ON"
];
meta = with lib; {
description = "C99 library implementation for communicating with the S3 service";
homepage = "https://github.com/awslabs/aws-c-s3";
license = licenses.asl20;
platforms = platforms.unix;
maintainers = with maintainers; [ r-burns ];
};
}

1
pkgs/development/libraries/aws-checksums/default.nix
View file

@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
"-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake"
];
meta = with lib; {

63
pkgs/development/libraries/aws-crt-cpp/default.nix Normal file
View file

@ -0,0 +1,63 @@
{ lib, stdenv
, fetchFromGitHub
, aws-c-auth
, aws-c-cal
, aws-c-common
, aws-c-compression
, aws-c-event-stream
, aws-c-http
, aws-c-io
, aws-c-mqtt
, aws-c-s3
, aws-checksums
, cmake
, s2n-tls
}:
stdenv.mkDerivation rec {
pname = "aws-crt-cpp";
version = "0.17.0";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-crt-cpp";
rev = "v${version}";
sha256 = "0ijvyg3hrh1d0npca62syz8qy6nkqh90fq54cqyln0p333z16q52";
};
postPatch = ''
substituteInPlace CMakeLists.txt --replace '-Werror' ""
'';
nativeBuildInputs = [
cmake
];
propagatedBuildInputs = [
aws-c-auth
aws-c-cal
aws-c-common
aws-c-compression
aws-c-event-stream
aws-c-http
aws-c-io
aws-c-mqtt
aws-c-s3
aws-checksums
s2n-tls
];
cmakeFlags = [
"-DBUILD_DEPS=OFF"
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DBUILD_SHARED_LIBS=ON"
];
meta = with lib; {
description = "C++ wrapper around the aws-c-* libraries";
homepage = "https://github.com/awslabs/aws-crt-cpp";
license = licenses.asl20;
platforms = platforms.unix;
maintainers = with maintainers; [ r-burns ];
};
}

14
pkgs/development/libraries/aws-sdk-cpp/default.nix
View file

@ -1,4 +1,5 @@
{ 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
, # Allow building a limited set of APIs, e.g. ["s3" "ec2"].
@ -17,15 +18,23 @@ in
stdenv.mkDerivation rec {
pname = "aws-sdk-cpp";
version = "1.8.130";
version = "1.9.121";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-sdk-cpp";
rev = version;
sha256 = "sha256-5T4l0KYB0utFTdEOtYT9trQ/JehQbXxk/IhI6YavErs=";
sha256 = "sha256-VQpWauk0tdJ1QU0HmtdTwQdKbiAuTTXXsUo2cqpqmdU=";
};
postPatch = ''
# Includes aws-c-auth private headers, so only works with submodule build
rm aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
# TestRandomURLMultiThreaded fails
rm aws-cpp-sdk-core-tests/http/HttpClientTest.cpp
'';
# FIXME: might be nice to put different APIs in different outputs
# (e.g. libaws-cpp-sdk-s3.so in output "s3").
outputs = [ "out" "dev" ];
@ -33,6 +42,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake curl ];
buildInputs = [
aws-crt-cpp
curl openssl zlib
] ++ lib.optionals (stdenv.isDarwin &&
((builtins.elem "text-to-speech" apis) ||

22
pkgs/development/libraries/s2n-tls/default.nix
View file

@ -1,4 +1,9 @@
{ lib, stdenv, fetchFromGitHub, cmake, openssl }:
{ lib, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, openssl
}:
stdenv.mkDerivation rec {
pname = "s2n-tls";
@ -11,6 +16,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-6XqBpNURU8fzGkTt4jsijgMiOkzMebmLmPAq8yQsTg4=";
};
patches = [
# Fix FindLibCrypto paths (https://github.com/aws/s2n-tls/pull/3067)
(fetchpatch {
url = "https://github.com/aws/s2n-tls/commit/bda649524402be4018c44bff07f6c64502a351ec.patch";
sha256 = "02jmxsrd506vhjzlrgh1p2z1f1sn4v8klks25zisiykyqkyaczkv";
})
];
nativeBuildInputs = [ cmake ];
outputs = [ "out" "dev"];
@ -26,8 +39,11 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ openssl ]; # s2n-config has find_dependency(LibCrypto).
postInstall = ''
substituteInPlace $out/lib/s2n/cmake/shared/s2n-targets.cmake \
--replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES ""'
# Glob for 'shared' or 'static' subdir
for f in $out/lib/s2n/cmake/*/s2n-targets.cmake; do
substituteInPlace "$f" \
--replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES ""'
done
'';
meta = with lib; {

12
pkgs/top-level/all-packages.nix
View file

@ -15390,20 +15390,32 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AudioUnit CoreServices;
};
aws-c-auth = callPackage ../development/libraries/aws-c-auth { };
aws-c-cal = callPackage ../development/libraries/aws-c-cal {
inherit (darwin.apple_sdk.frameworks) Security;
};
aws-c-common = callPackage ../development/libraries/aws-c-common { };
aws-c-compression = callPackage ../development/libraries/aws-c-compression { };
aws-c-event-stream = callPackage ../development/libraries/aws-c-event-stream { };
aws-c-http = callPackage ../development/libraries/aws-c-http { };
aws-c-io = callPackage ../development/libraries/aws-c-io {
inherit (darwin.apple_sdk.frameworks) Security;
};
aws-c-mqtt = callPackage ../development/libraries/aws-c-mqtt { };
aws-c-s3 = callPackage ../development/libraries/aws-c-s3 { };
aws-checksums = callPackage ../development/libraries/aws-checksums { };
aws-crt-cpp = callPackage ../development/libraries/aws-crt-cpp { };
aws-sdk-cpp = callPackage ../development/libraries/aws-sdk-cpp {
inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox;
};