From 3c468f4cee3cbe403c52ac7550c348ad38e5f3fc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 00:47:28 +0200 Subject: [PATCH 1/2] python312Packages.elasticsearch8: 8.13.0 -> 8.13.1 Changelog: https://github.com/elastic/elasticsearch-py/releases/tag/v8.13.1 --- pkgs/development/python-modules/elasticsearch8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elasticsearch8/default.nix b/pkgs/development/python-modules/elasticsearch8/default.nix index 9b9f77d177b0..611a1de2f08d 100644 --- a/pkgs/development/python-modules/elasticsearch8/default.nix +++ b/pkgs/development/python-modules/elasticsearch8/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "elasticsearch8"; - version = "8.13.0"; + version = "8.13.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NWg+/dr8jXCCLeXBAXY1yL6/2CB0xCO5tswY4y/5erw="; + hash = "sha256-jVi5yYPll7ej8lmDEbvcLCEdBbpMiZUi2n4AORre81E="; }; nativeBuildInputs = [ elastic-transport ]; From b22d9f589d03252a8ca8db4e6820c4f724ef11fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 00:50:40 +0200 Subject: [PATCH 2/2] python312Packages.elasticsearch8: refactor --- .../python-modules/elasticsearch8/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/elasticsearch8/default.nix b/pkgs/development/python-modules/elasticsearch8/default.nix index 611a1de2f08d..27760df9b8e7 100644 --- a/pkgs/development/python-modules/elasticsearch8/default.nix +++ b/pkgs/development/python-modules/elasticsearch8/default.nix @@ -4,15 +4,17 @@ buildPythonPackage, elastic-transport, fetchPypi, + orjson, pythonOlder, requests, + setuptools, urllib3, }: buildPythonPackage rec { pname = "elasticsearch8"; version = "8.13.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -21,12 +23,14 @@ buildPythonPackage rec { hash = "sha256-jVi5yYPll7ej8lmDEbvcLCEdBbpMiZUi2n4AORre81E="; }; - nativeBuildInputs = [ elastic-transport ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ requests ]; + dependencies = [ elastic-transport ]; passthru.optional-dependencies = { async = [ aiohttp ]; + requests = [ requests ]; + orjson = [ orjson ]; }; # Check is disabled because running them destroy the content of the local cluster!