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

Merge #206139: mbedtls: 3.2.1 -> 3.3.0, mbedtls_2: 2.28.1 -> 2.28.2

Browse Source
This commit is contained in:
Vladimír Čunát 2022-12-17 09:46:23 +01:00
commit 97ffa54184
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/mbedtls/2.nix
View File

@ -1,6 +1,6 @@
{ callPackage }:
callPackage ./generic.nix {
version = "2.28.1";
hash = "sha256-brbZB3fINDeVWXf50ct4bxYkoBVyD6bBBijZyFQSnyw=";
version = "2.28.2";
hash = "sha256-rbWvPrFoY31QyW/TbMndPXTzAJS6qT/bo6J0IL6jRvQ=";
}

4
pkgs/development/libraries/mbedtls/3.nix
View File

@ -1,6 +1,6 @@
{ callPackage }:
callPackage ./generic.nix {
version = "3.2.1";
hash = "sha256-+M36NvFe4gw2PRbld/2JV3yBGrqK6soWcmrSEkUNcrc=";
version = "3.3.0";
hash = "sha256-yb5migP5Tcw99XHFzJkCct4f5R6ztxPR43VQcfTGRtE=";
}

12
pkgs/development/libraries/mbedtls/generic.nix
View File

@ -32,10 +32,14 @@ stdenv.mkDerivation rec {
perl scripts/config.pl set MBEDTLS_THREADING_PTHREAD # POSIX thread wrapper layer for the threading layer.
'';
cmakeFlags = [ "-DUSE_SHARED_MBEDTLS_LIBRARY=on" ];
NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
"-Wno-error=format"
"-Wno-error=format-truncation"
cmakeFlags = [
"-DUSE_SHARED_MBEDTLS_LIBRARY=on"
# Avoid a dependency on jsonschema and jinja2 by not generating source code
# using python. In releases, these generated files are already present in
# the repository and do not need to be regenerated. See:
# https://github.com/Mbed-TLS/mbedtls/releases/tag/v3.3.0 below "Requirement changes".
"-DGEN_FILES=off"
];
meta = with lib; {