Merge pull request #300629 from raphaelr/update/mbedtls

mbedtls: 3.5.2 -> 3.6.0, mbedtls_2: 2.28.7 -> 2.28.8

authored by Thomas Gerbet and committed by GitHub 266c6139 3541c762

+22 -5
+2 -2
pkgs/development/libraries/mbedtls/2.nix
··· 1 1 { callPackage }: 2 2 3 3 callPackage ./generic.nix { 4 - version = "2.28.7"; 5 - hash = "sha256-JI0Frbz4HkPqrLQNrSIj1ikN8201h4kd1wTwyPotERw="; 4 + version = "2.28.8"; 5 + hash = "sha256-A1DYZrvJ8SRujroVwqPfcTOSgLnT5xRat/RVdq2fL/o="; 6 6 }
+15 -3
pkgs/development/libraries/mbedtls/3.nix
··· 1 - { callPackage }: 1 + { callPackage 2 + , fetchpatch 3 + }: 2 4 3 5 callPackage ./generic.nix { 4 - version = "3.5.2"; 5 - hash = "sha256-lVGmnSYccNmRS6vfF/fDiny5cYRPc/wJBpgciFLPUvM="; 6 + version = "3.6.0"; 7 + hash = "sha256-tCwAKoTvY8VCjcTPNwS3DeitflhpKHLr6ygHZDbR6wQ="; 8 + 9 + patches = [ 10 + # https://github.com/Mbed-TLS/mbedtls/pull/9000 11 + # Remove at next version update 12 + (fetchpatch { 13 + name = "fix-darwin-memcpy-error.patch"; 14 + url = "https://github.com/Mbed-TLS/mbedtls/commit/b32d7ae0fee2f906be59780b42a0cd4468a39bd1.patch"; 15 + hash = "sha256-BTkJs9NEkCl+/Q8EwB/LW9uwF95jQOKWmoCK4B/7/sU="; 16 + }) 17 + ]; 6 18 }
+5
pkgs/development/libraries/mbedtls/generic.nix
··· 2 2 , stdenv 3 3 , version 4 4 , hash 5 + , patches ? [] 5 6 , fetchFromGitHub 6 7 7 8 , cmake ··· 21 22 repo = "mbedtls"; 22 23 rev = "${pname}-${version}"; 23 24 inherit hash; 25 + # mbedtls >= 3.6.0 uses git submodules 26 + fetchSubmodules = true; 24 27 }; 28 + 29 + inherit patches; 25 30 26 31 nativeBuildInputs = [ cmake ninja perl python3 ]; 27 32