From 025a29c9b12aa1b09ef26cbf42590eaae8d30b37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Mar 2024 07:12:49 +0000 Subject: [PATCH 1/2] python311Packages.elastic-apm: 6.21.2 -> 6.21.3 --- pkgs/development/python-modules/elastic-apm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index a17ea5234bed..6e3245cfe2f3 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.21.2"; + version = "6.21.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "apm-agent-python"; rev = "refs/tags/v${version}"; - hash = "sha256-QVgRymjj+k3W+5UfJGv1JJIAAxUA5DMXAnfk6ml8Pb8="; + hash = "sha256-Ejix31cMyHOc/IGe4bRp/Nchm9Ps1cRYE8jIaIYlJjs="; }; propagatedBuildInputs = [ From a2729ed9ddd80bd85b412d3b53005ee2c6ba5f90 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 10 Mar 2024 11:28:39 +0100 Subject: [PATCH 2/2] python311Packages.elastic-apm: refactor --- pkgs/development/python-modules/elastic-apm/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index 6e3245cfe2f3..61ad6705fe9b 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -20,6 +20,7 @@ , pythonOlder , sanic , sanic-testing +, setuptools , starlette , structlog , tornado @@ -31,7 +32,7 @@ buildPythonPackage rec { pname = "elastic-apm"; version = "6.21.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -42,6 +43,10 @@ buildPythonPackage rec { hash = "sha256-Ejix31cMyHOc/IGe4bRp/Nchm9Ps1cRYE8jIaIYlJjs="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp blinker