From 413cf1955d9f22c5172ca34181a5ddb898fa631e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 11 Sep 2025 21:25:32 +0200
Subject: [PATCH] python313Packages.elastic-apm: 6.23.0 -> 6.24.0

Changelog: https://github.com/elastic/apm-agent-python/releases/tag/v6.24.0
---
 .../python-modules/elastic-apm/default.nix    | 23 +++++--------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix
index e8ec4ac3dbf6..1eb06f0f6066 100644
--- a/pkgs/development/python-modules/elastic-apm/default.nix
+++ b/pkgs/development/python-modules/elastic-apm/default.nix
@@ -19,7 +19,6 @@
   pytest-mock,
   pytest-random-order,
   pytestCheckHook,
-  pythonOlder,
   sanic,
   sanic-testing,
   setuptools,
@@ -33,28 +32,16 @@
 
 buildPythonPackage rec {
   pname = "elastic-apm";
-  version = "6.23.0";
+  version = "6.24.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "elastic";
     repo = "apm-agent-python";
     tag = "v${version}";
-    hash = "sha256-S1Ebo9AWN+Mf3OFwxNTiR/AZtje3gNiYkZnVqGb7D4c=";
+    hash = "sha256-mHDUcIII1gERlGMJvXPe3Hb38wNAylfMQpeLjA1Xbuk=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "fix-tests-with-latest-starlette-and-sanic.patch";
-      url = "https://github.com/elastic/apm-agent-python/commit/80d167f54b6bf1db8b6e7ee52e2ac6803bc64f54.patch";
-      hash = "sha256-VtA7+SyEZiL3aqpikyYJQ4tmdmsUpIdkSx6RtC1AzqY=";
-    })
-  ];
-
-  pythonRelaxDeps = [ "wrapt" ];
-
   build-system = [ setuptools ];
 
   dependencies = [
@@ -94,6 +81,8 @@ buildPythonPackage rec {
   disabledTestPaths = [
     # Exclude tornado tests
     "tests/contrib/asyncio/tornado/tornado_tests.py"
+    # Exclude client tests
+    "tests/instrumentation/asyncio_tests/aiohttp_client_tests.py"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # Flaky tests on Darwin
@@ -105,8 +94,8 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python agent for the Elastic APM";
     homepage = "https://github.com/elastic/apm-agent-python";
-    changelog = "https://github.com/elastic/apm-agent-python/releases/tag/v${version}";
-    license = with licenses; [ bsd3 ];
+    changelog = "https://github.com/elastic/apm-agent-python/releases/tag/${src.tag}";
+    license = licenses.bsd3;
     maintainers = with maintainers; [ fab ];
     mainProgram = "elasticapm-run";
   };