diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-10-19 14:40:23 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-01-07 10:22:32 +0000 |
| commit | cc62bcb55359ba8c5e0fe3a48e778444c89060d8 (patch) | |
| tree | ca0e21d44eaf8837b687395e614445f7761d7bbd /nixpkgs/pkgs/development/libraries/aws-c-common | |
| parent | d6625e8d25efd829c3cfa227d025ca4e606ae4b7 (diff) | |
| parent | a323570a264da96a0b0bcc1c9aa017794acdc752 (diff) | |
| download | nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.gz nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.bz2 nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.lz nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.xz nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.zst nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.zip | |
Merge commit 'a323570a264da96a0b0bcc1c9aa017794acdc752'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/aws-c-common')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/aws-c-common/default.nix | 18 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/aws-c-common/setup-hook.sh | 5 |
2 files changed, 19 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix index ae47959dd3aa..c927ca53336a 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.6.9"; + version = "0.6.14"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bnKIL51AW+0T87BxEazXDZElYqiwOUHQVEDKOCUzsbM="; + sha256 = "sha256-JEaRB0k6zyk5UKuB2hEZUAsnp2SuI9mrok/EvwclUJk="; }; 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 ''; diff --git a/nixpkgs/pkgs/development/libraries/aws-c-common/setup-hook.sh b/nixpkgs/pkgs/development/libraries/aws-c-common/setup-hook.sh new file mode 100644 index 000000000000..e670f7cf8529 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/aws-c-common/setup-hook.sh @@ -0,0 +1,5 @@ +addAwsCCommonModuleDir() { + cmakeFlags="-DCMAKE_MODULE_PATH=@out@/lib/cmake ${cmakeFlags:-}" +} + +postHooks+=(addAwsCCommonModuleDir) |