diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-04-28 14:39:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-10 08:52:36 +0000 |
| commit | 693e64ef7421374338ddb1dc12b9573feec75972 (patch) | |
| tree | 2526ac075d248699c35d63e04499890ee4381f5f /nixpkgs/pkgs/development/libraries/mbedtls | |
| parent | 7014df2256694d97093d6f2bb1db340d346dea88 (diff) | |
| parent | 8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17 (diff) | |
| download | nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.gz nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.bz2 nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.lz nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.xz nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.zst nixlib-693e64ef7421374338ddb1dc12b9573feec75972.zip | |
Merge commit '8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/mbedtls')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/mbedtls/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/mbedtls/default.nix b/nixpkgs/pkgs/development/libraries/mbedtls/default.nix index 2e25399d9797..90e2c9bd9a73 100644 --- a/nixpkgs/pkgs/development/libraries/mbedtls/default.nix +++ b/nixpkgs/pkgs/development/libraries/mbedtls/default.nix @@ -11,13 +11,17 @@ stdenv.mkDerivation rec { pname = "mbedtls"; - version = "2.16.9"; # nixpkgs-update: no auto update + # Auto updates are disabled due to repology listing dev releases as release + # versions. See + # * https://github.com/NixOS/nixpkgs/pull/119838#issuecomment-822100428 + # * https://github.com/NixOS/nixpkgs/commit/0ee02a9d42b5fe1825b0f7cee7a9986bb4ba975d + version = "2.26.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "ARMmbed"; repo = "mbedtls"; rev = "${pname}-${version}"; - sha256 = "0mz7n373b8d287crwi6kq2hb8ryyi228j38h25744lqai23qj5cf"; + sha256 = "0scwpmrgvg6q7rvqkc352d2fqlsx0aylcbyibcp1f1rsn8iiif2m"; }; nativeBuildInputs = [ cmake ninja perl python3 ]; @@ -30,6 +34,10 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ "-DUSE_SHARED_MBEDTLS_LIBRARY=on" ]; + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ + "-Wno-error=format" + "-Wno-error=format-truncation" + ]; meta = with lib; { homepage = "https://tls.mbed.org/"; |