From ac27176316752d40f61e29f6efbfd9932e384746 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Sun, 18 Apr 2021 16:52:18 -0700 Subject: [PATCH 1/2] mbedtls: 2.16.9 -> 2.26.0 --- pkgs/development/libraries/mbedtls/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index 2e25399d979..90baec04e22 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "mbedtls"; - version = "2.16.9"; # nixpkgs-update: no auto update + 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 +30,10 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ "-DUSE_SHARED_MBEDTLS_LIBRARY=on" ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=format" + "-Wno-error=format-truncation" + ]; meta = with lib; { homepage = "https://tls.mbed.org/"; From ffe009394a8537c18daffebde3d6ff282b4d196a Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Sun, 18 Apr 2021 18:02:35 -0700 Subject: [PATCH 2/2] mbedtls: add comment clarifying `no auto update` --- pkgs/development/libraries/mbedtls/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index 90baec04e22..057e8694529 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { pname = "mbedtls"; + # 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 {