From f5eece7db4a8c5ea96e116eafdcc1672e153628f Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Mon, 18 Oct 2021 01:23:33 -0700 Subject: [PATCH 1/2] aws-c-sdkutils: init at 0.1.1 --- .../libraries/aws-c-sdkutils/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/libraries/aws-c-sdkutils/default.nix diff --git a/pkgs/development/libraries/aws-c-sdkutils/default.nix b/pkgs/development/libraries/aws-c-sdkutils/default.nix new file mode 100644 index 000000000000..f5b5dfaeebc9 --- /dev/null +++ b/pkgs/development/libraries/aws-c-sdkutils/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv +, fetchFromGitHub +, aws-c-common +, cmake +}: + +stdenv.mkDerivation rec { + pname = "aws-c-sdkutils"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-c-sdkutils"; + rev = "v${version}"; + sha256 = "sha256-jYeyNEoJsF67XQAkmC7oegnIRBRD3FXKf5wF/NCVb4o="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + aws-c-common + ]; + + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DBUILD_SHARED_LIBS=ON" + ]; + + doCheck = true; + + meta = with lib; { + description = "AWS SDK utility library"; + homepage = "https://github.com/awslabs/aws-c-sdkutils"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e32568306c09..ec76224dac96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15431,6 +15431,8 @@ with pkgs; aws-c-s3 = callPackage ../development/libraries/aws-c-s3 { }; + aws-c-sdkutils = callPackage ../development/libraries/aws-c-sdkutils { }; + aws-checksums = callPackage ../development/libraries/aws-checksums { }; aws-crt-cpp = callPackage ../development/libraries/aws-crt-cpp { }; From 1c2965a9cbb67f19d251bff577b8f8a35060de0b Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Mon, 18 Oct 2021 01:23:42 -0700 Subject: [PATCH 2/2] aws-c-auth: 0.6.4 -> 0.6.5 --- pkgs/development/libraries/aws-c-auth/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/development/libraries/aws-c-auth/default.nix index 5969de54682e..7de352328100 100644 --- a/pkgs/development/libraries/aws-c-auth/default.nix +++ b/pkgs/development/libraries/aws-c-auth/default.nix @@ -5,19 +5,20 @@ , aws-c-compression , aws-c-http , aws-c-io +, aws-c-sdkutils , cmake , s2n-tls }: stdenv.mkDerivation rec { pname = "aws-c-auth"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - sha256 = "120p69lj279yq3d2b81f45kgfrvf32j6m7s03m8hh27w8yd4vbfp"; + sha256 = "sha256-d3UdZucicp+Z0EjWNE5Xa/EMIGPk6GtQc7f0H8RBHA8="; }; nativeBuildInputs = [ @@ -33,6 +34,10 @@ stdenv.mkDerivation rec { s2n-tls ]; + propagatedBuildInputs = [ + aws-c-sdkutils + ]; + cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_SHARED_LIBS=ON"