From eff8fa7c48553a54f5494a200aac8eb7dc0bc421 Mon Sep 17 00:00:00 2001
From: Raphael Robatsch <raphael-git@tapesoftware.net>
Date: Thu, 5 Sep 2024 20:06:59 +0200
Subject: [PATCH] mbedtls: 3.6.0 -> 3.6.1

Changelog: https://github.com/Mbed-TLS/mbedtls/releases/tag/mbedtls-3.6.1
Fixes CVE-2024-45157, CVE-2024-45158, CVE-2024-45159

(cherry picked from commit e15a8972864d48442ae298646f74da3a2e019c68)
---
 pkgs/development/libraries/mbedtls/3.nix | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/mbedtls/3.nix b/pkgs/development/libraries/mbedtls/3.nix
index d672e218f577..f8f53522db13 100644
--- a/pkgs/development/libraries/mbedtls/3.nix
+++ b/pkgs/development/libraries/mbedtls/3.nix
@@ -1,18 +1,6 @@
-{ callPackage
-, fetchpatch
-}:
+{ callPackage }:
 
 callPackage ./generic.nix {
-  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=";
-    })
-  ];
+  version = "3.6.1";
+  hash = "sha256-SVWz2uOvGIplnBr4g6nwfxKMWVpzdZjusseAhw6GOJ8=";
 }