git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #115157 from r-burns/aws-c-common-musl
commita97a7cd1683c50d287fec3a28b45caf10d901371 authorJörg Thalheim <Mic92@users.noreply.github.com> dateSat 6 Mar 2021, 11:11 (6 years ago) parent158578dbd6d4d4
3 files changed+9−8
pkgs/development/libraries/aws-c-common/default.nix+6−5 pkgs/development/libraries/aws-c-io/default.nix+2−2 pkgs/tools/package-management/nix/default.nix+1−1
pkgs/development/libraries/aws-c-common/default.nix+6−5
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "aws-c-common";
5− version = "0.4.64";
5+ version = "0.5.2";
66
77 src = fetchFromGitHub {
88 owner = "awslabs";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "sha256-izEZMOPHj/9EL78b/t3M0Tki6eA8eRrpG7DO2tkpf1A=";
11+ sha256 = "0rd2qzaa9mmn5f6f2bl1wgv54f17pqx3vwyy9f8ylh59qfnilpmg";
1212 };
1313
1414 patches = [
@@ -23,18 +23,19 @@ stdenv.mkDerivation rec {
2323
2424 cmakeFlags = [
2525 "-DBUILD_SHARED_LIBS=ON"
26+ "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
2627 ];
2728
2829 NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin
2930 "-Wno-nullability-extension -Wno-typedef-redefinition";
3031
32+ doCheck = true;
33+
3134 meta = with lib; {
3235 description = "AWS SDK for C common core";
3336 homepage = "https://github.com/awslabs/aws-c-common";
3437 license = licenses.asl20;
3538 platforms = platforms.unix;
36− maintainers = with maintainers; [ orivej eelco ];
37− # https://github.com/awslabs/aws-c-common/issues/754
38− broken = stdenv.hostPlatform.isMusl;
39+ maintainers = with maintainers; [ orivej eelco r-burns ];
3940 };
4041}
pkgs/development/libraries/aws-c-io/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "aws-c-io";
5− version = "0.7.1";
5+ version = "0.9.1";
66
77 src = fetchFromGitHub {
88 owner = "awslabs";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "sha256-dDvq5clOUaPR7lOCJ/1g0lrCzVOmzwCnqHrBZfBewO4=";
11+ sha256 = "0lx72p9xmmnjkz4zkfb1lz0ibw0jsy52qpydhvn56bq85nv44rwx";
1212 };
1313
1414 nativeBuildInputs = [ cmake ];
pkgs/tools/package-management/nix/default.nix+1−1
@@ -22,7 +22,7 @@ common =
2222 , stateDir
2323 , confDir
2424 , withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp
25− , withAWS ? !enableStatic && !stdenv.hostPlatform.isMusl && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp
25+ , withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp
2626 , enableStatic ? stdenv.hostPlatform.isStatic
2727 , name, suffix ? "", src
2828 , patches ? [ ]