diff options
author | Doug Chapman <dougch@amazon.com> | 2021-03-03 06:38:54 -0800 |
---|---|---|
committer | Doug Chapman <dougch@amazon.com> | 2021-03-03 19:45:40 +0000 |
commit | fc970213065bcfb5d9c0ff49842874f6f8cb598d (patch) | |
tree | b5c01a632147eeb914191553cf7732cd01859a32 /pkgs/development/libraries | |
parent | 8316093fd7dd626b43fbbecb2435339ebcb28f5b (diff) | |
download | nixpkgs-fc970213065bcfb5d9c0ff49842874f6f8cb598d.tar nixpkgs-fc970213065bcfb5d9c0ff49842874f6f8cb598d.tar.gz nixpkgs-fc970213065bcfb5d9c0ff49842874f6f8cb598d.tar.bz2 nixpkgs-fc970213065bcfb5d9c0ff49842874f6f8cb598d.tar.lz nixpkgs-fc970213065bcfb5d9c0ff49842874f6f8cb598d.tar.xz nixpkgs-fc970213065bcfb5d9c0ff49842874f6f8cb598d.tar.zst nixpkgs-fc970213065bcfb5d9c0ff49842874f6f8cb598d.zip |
s2n: 0.10.23->1.0.0, rename package to s2n-tls
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/aws-c-event-stream/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/aws-c-io/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/aws-sdk-cpp/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/s2n-tls/default.nix (renamed from pkgs/development/libraries/s2n/default.nix) | 10 |
4 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/development/libraries/aws-c-event-stream/default.nix b/pkgs/development/libraries/aws-c-event-stream/default.nix index 4cfabc77bb2..18dddee6bde 100644 --- a/pkgs/development/libraries/aws-c-event-stream/default.nix +++ b/pkgs/development/libraries/aws-c-event-stream/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, aws-c-io, aws-checksums, s2n, libexecinfo }: +{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, aws-c-io, aws-checksums, s2n-tls, libexecinfo }: stdenv.mkDerivation rec { pname = "aws-c-event-stream"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ aws-c-cal aws-c-common aws-c-io aws-checksums s2n ] + buildInputs = [ aws-c-cal aws-c-common aws-c-io aws-checksums s2n-tls ] ++ lib.optional stdenv.hostPlatform.isMusl libexecinfo; cmakeFlags = [ diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index 9c7fcf11af8..373ea66a4b6 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, s2n, Security }: +{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, s2n-tls, Security }: stdenv.mkDerivation rec { pname = "aws-c-io"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ aws-c-cal aws-c-common s2n] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ aws-c-cal aws-c-common s2n-tls] ++ lib.optionals stdenv.isDarwin [ Security ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 7b10fc463dd..d6fbb97014d 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, s2n, zlib +{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, s2n-tls, zlib , 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"]. @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake curl ]; buildInputs = [ - curl openssl s2n zlib + curl openssl s2n-tls zlib aws-c-cal aws-c-common aws-c-event-stream aws-c-io aws-checksums ] ++ lib.optionals (stdenv.isDarwin && ((builtins.elem "text-to-speech" apis) || diff --git a/pkgs/development/libraries/s2n/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index 3ec66ebf52d..2d3ebc6cb41 100644 --- a/pkgs/development/libraries/s2n/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, openssl }: stdenv.mkDerivation rec { - pname = "s2n"; - version = "0.10.23"; + pname = "s2n-tls"; + version = "1.0.0"; src = fetchFromGitHub { - owner = "awslabs"; + owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "063wqpszhfcbxm7a7s6d6kinqd6b6dxij85lk9jjkrslg5fgqbki"; + sha256 = "1q6kmgwb8jxmc4ijzk9pkqzz8lsbfsv9hyzqvy944w7306zx1r5h"; }; nativeBuildInputs = [ cmake ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C99 implementation of the TLS/SSL protocols"; - homepage = "https://github.com/awslabs/s2n"; + homepage = "https://github.com/aws/s2n-tls"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ orivej ]; |