JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #115004 from dougch/s2n_version_bump

Browse Source 
s2n: 0.10.23->1.0.0, rename package to s2n-tls
This commit is contained in:
Sandro 2021-03-04 01:54:44 +01:00 committed by GitHub
commit 4b9404cea1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/aws-c-event-stream/default.nix
View File

@ -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 = [

4
pkgs/development/libraries/aws-c-io/default.nix
View File

@ -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"

4
pkgs/development/libraries/aws-sdk-cpp/default.nix
View File

@ -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) ||

10
pkgs/development/libraries/s2n/default.nix → pkgs/development/libraries/s2n-tls/default.nix
View File

@ -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 ];

1
pkgs/top-level/aliases.nix
View File

@ -603,6 +603,7 @@ mapAliases ({
urxvt_theme_switch = rxvt-unicode-plugins.theme-switch; # added 2020-02-02
urxvt_vtwheel = rxvt-unicode-plugins.vtwheel; # added 2020-02-02
urxvt_bidi = rxvt-unicode-plugins.bidi; # added 2020-02-02
s2n = s2n-tls; # added 2021-03-03
s6Dns = s6-dns; # added 2018-07-23
s6Networking = s6-networking; # added 2018-07-23
s6LinuxUtils = s6-linux-utils; # added 2018-07-23

2
pkgs/top-level/all-packages.nix
View File

@ -16822,7 +16822,7 @@ in
graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {};
s2n = callPackage ../development/libraries/s2n { };
s2n-tls = callPackage ../development/libraries/s2n-tls { };
simavr = callPackage ../development/tools/simavr {
avrgcc = pkgsCross.avr.buildPackages.gcc;