diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
| commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
| tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/development/libraries/s2n-tls | |
| parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
| parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
| download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip | |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/s2n-tls')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/s2n-tls/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix b/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix index c22ff6c37309..3d3193f7e108 100644 --- a/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix +++ b/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.6"; + version = "1.3.12"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - hash = "sha256-i1RbyHw+Fr1QABra6fskRpIbYxEfhOVToeesyax4NtU="; + sha256 = "1n1bak4s67cfizh8j5wpf05kfdcjvwqaca4rq9qys25z52bbpn9f"; }; nativeBuildInputs = [ cmake ]; @@ -23,8 +23,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF" # disable -Werror + ] ++ lib.optionals stdenv.hostPlatform.isMips64 [ + # See https://github.com/aws/s2n-tls/issues/1592 and https://github.com/aws/s2n-tls/pull/1609 + "-DS2N_NO_PQ=ON" ]; propagatedBuildInputs = [ openssl ]; # s2n-config has find_dependency(LibCrypto). |