From 38642f3dce0fd419d6a822b367aba4d2af997698 Mon Sep 17 00:00:00 2001 From: Raphael Robatsch Date: Thu, 3 Aug 2023 20:26:36 +0200 Subject: [PATCH 1/3] mbedtls_2: 2.28.3 -> 2.28.4 Changelog: https://github.com/Mbed-TLS/mbedtls/blob/v2.28.4/ChangeLog --- pkgs/development/libraries/mbedtls/2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mbedtls/2.nix b/pkgs/development/libraries/mbedtls/2.nix index 2dd5ae6dae58..3711e2d2b4ff 100644 --- a/pkgs/development/libraries/mbedtls/2.nix +++ b/pkgs/development/libraries/mbedtls/2.nix @@ -1,6 +1,6 @@ { callPackage }: callPackage ./generic.nix { - version = "2.28.3"; - hash = "sha256-w5bJErCNRZLE8rHcuZlK3bOqel97gPPMKH2cPGUR6Zw="; + version = "2.28.4"; + hash = "sha256-88Lnj9NgS5PWg2hydvb9cwi6s6BG3UMvkUH2Ny1jmtE="; } From 48b67359a3c1af6978f8e3537f2aaae16c71228a Mon Sep 17 00:00:00 2001 From: Raphael Robatsch Date: Thu, 3 Aug 2023 20:27:28 +0200 Subject: [PATCH 2/3] mbedtls: 3.4.0 -> 3.4.1 Chanelog: https://github.com/Mbed-TLS/mbedtls/blob/v3.4.1/ChangeLog --- pkgs/development/libraries/mbedtls/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mbedtls/3.nix b/pkgs/development/libraries/mbedtls/3.nix index 67269717bb99..01df03bbbadb 100644 --- a/pkgs/development/libraries/mbedtls/3.nix +++ b/pkgs/development/libraries/mbedtls/3.nix @@ -1,6 +1,6 @@ { callPackage }: callPackage ./generic.nix { - version = "3.4.0"; - hash = "sha256-1YA4hp/VEjph5k0qJqhhH4nBbTP3Qu2pl7WpuvPkVfg="; + version = "3.4.1"; + hash = "sha256-NIjyRcVbg6lT6+RlTz5Jt6V9T85mvta5grOSLIAK9Ts="; } From 0d3898fdf62b27bf58f982c7a8435422bbee7184 Mon Sep 17 00:00:00 2001 From: Raphael Robatsch Date: Sun, 6 Aug 2023 12:22:57 +0200 Subject: [PATCH 3/3] mbedtls: run tests --- pkgs/development/libraries/mbedtls/generic.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/mbedtls/generic.nix b/pkgs/development/libraries/mbedtls/generic.nix index adc46adb75fb..3ca0b491fb89 100644 --- a/pkgs/development/libraries/mbedtls/generic.nix +++ b/pkgs/development/libraries/mbedtls/generic.nix @@ -42,6 +42,12 @@ stdenv.mkDerivation rec { "-DGEN_FILES=off" ]; + doCheck = true; + + # Parallel checking causes test failures + # https://github.com/Mbed-TLS/mbedtls/issues/4980 + enableParallelChecking = false; + meta = with lib; { homepage = "https://www.trustedfirmware.org/projects/mbed-tls/"; changelog = "https://github.com/Mbed-TLS/mbedtls/blob/${pname}-${version}/ChangeLog";