Unverified Commit 266c6139 authored by Thomas Gerbet's avatar Thomas Gerbet Committed by GitHub
Browse files

Merge pull request #300629 from raphaelr/update/mbedtls 

mbedtls: 3.5.2 -> 3.6.0, mbedtls_2: 2.28.7 -> 2.28.8
parents 3541c762 bdfdf2c6

pkgs/development/libraries/mbedtls/2.nix

+2 −2
Original line number Diff line number Diff line 
{ callPackage }:



callPackage ./generic.nix {

  version = "2.28.7";

  hash = "sha256-JI0Frbz4HkPqrLQNrSIj1ikN8201h4kd1wTwyPotERw=";

  version = "2.28.8";

  hash = "sha256-A1DYZrvJ8SRujroVwqPfcTOSgLnT5xRat/RVdq2fL/o=";

}

pkgs/development/libraries/mbedtls/3.nix

+15 −3
Original line number Diff line number Diff line 
{ callPackage }:

{ callPackage

, fetchpatch

}:



callPackage ./generic.nix {

  version = "3.5.2";

  hash = "sha256-lVGmnSYccNmRS6vfF/fDiny5cYRPc/wJBpgciFLPUvM=";

  version = "3.6.0";

  hash = "sha256-tCwAKoTvY8VCjcTPNwS3DeitflhpKHLr6ygHZDbR6wQ=";



  patches = [

    # https://github.com/Mbed-TLS/mbedtls/pull/9000

    # Remove at next version update

    (fetchpatch {

      name = "fix-darwin-memcpy-error.patch";

      url = "https://github.com/Mbed-TLS/mbedtls/commit/b32d7ae0fee2f906be59780b42a0cd4468a39bd1.patch";

      hash = "sha256-BTkJs9NEkCl+/Q8EwB/LW9uwF95jQOKWmoCK4B/7/sU=";

    })

  ];

}

pkgs/development/libraries/mbedtls/generic.nix

+5 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
, stdenv

, version

, hash

, patches ? []

, fetchFromGitHub



, cmake
@@ -21,8 +22,12 @@ stdenv.mkDerivation rec { 
    repo = "mbedtls";

    rev = "${pname}-${version}";

    inherit hash;

    # mbedtls >= 3.6.0 uses git submodules

    fetchSubmodules = true;

  };



  inherit patches;



  nativeBuildInputs = [ cmake ninja perl python3 ];



  strictDeps = true;