From e7354669dad1b32e18cfb875e8d55611dc3573e3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 Apr 2024 11:36:26 +0200 Subject: [PATCH 1/3] python312Packages.nextdns: refactor --- pkgs/development/python-modules/nextdns/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nextdns/default.nix b/pkgs/development/python-modules/nextdns/default.nix index 7d81eccbcabf..eb9e06f192d6 100644 --- a/pkgs/development/python-modules/nextdns/default.nix +++ b/pkgs/development/python-modules/nextdns/default.nix @@ -8,12 +8,13 @@ , pytest-error-for-skips , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "nextdns"; version = "2.1.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +25,11 @@ buildPythonPackage rec { hash = "sha256-haw6t7pepMN77LFVgDFBbV4StRqcRMvnCaup8K38kEg="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ aiohttp orjson ]; From 67e38923cf906d5b0eff1b732dcdecc730dab1cf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 Apr 2024 11:37:08 +0200 Subject: [PATCH 2/3] python312Packages.nextdns: 2.1.0 -> 3.0.0 Diff: https://github.com/bieniu/nextdns/compare/refs/tags/2.1.0...3.0.0 Changelog: https://github.com/bieniu/nextdns/releases/tag/3.0.0 --- pkgs/development/python-modules/nextdns/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nextdns/default.nix b/pkgs/development/python-modules/nextdns/default.nix index eb9e06f192d6..caa98835c81f 100644 --- a/pkgs/development/python-modules/nextdns/default.nix +++ b/pkgs/development/python-modules/nextdns/default.nix @@ -9,11 +9,12 @@ , pytestCheckHook , pythonOlder , setuptools +, syrupy }: buildPythonPackage rec { pname = "nextdns"; - version = "2.1.0"; + version = "3.0.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = "nextdns"; rev = "refs/tags/${version}"; - hash = "sha256-haw6t7pepMN77LFVgDFBbV4StRqcRMvnCaup8K38kEg="; + hash = "sha256-ka/VT7c72la4z/BVAWnV06MxVmu52ZcJ4GsEeP7vbKA="; }; build-system = [ @@ -39,6 +40,7 @@ buildPythonPackage rec { pytest-asyncio pytest-error-for-skips pytestCheckHook + syrupy ]; pythonImportsCheck = [ From 7377ee13d05b251adf1ebe21ae855f9e3006e813 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 Apr 2024 11:37:37 +0200 Subject: [PATCH 3/3] python312Packages.nextdns: format with nixfmt --- .../python-modules/nextdns/default.nix | 35 +++++++++---------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/nextdns/default.nix b/pkgs/development/python-modules/nextdns/default.nix index caa98835c81f..9b84c400e529 100644 --- a/pkgs/development/python-modules/nextdns/default.nix +++ b/pkgs/development/python-modules/nextdns/default.nix @@ -1,15 +1,16 @@ -{ lib -, aiohttp -, aioresponses -, buildPythonPackage -, fetchFromGitHub -, orjson -, pytest-asyncio -, pytest-error-for-skips -, pytestCheckHook -, pythonOlder -, setuptools -, syrupy +{ + lib, + aiohttp, + aioresponses, + buildPythonPackage, + fetchFromGitHub, + orjson, + pytest-asyncio, + pytest-error-for-skips, + pytestCheckHook, + pythonOlder, + setuptools, + syrupy, }: buildPythonPackage rec { @@ -17,7 +18,7 @@ buildPythonPackage rec { version = "3.0.0"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "bieniu"; @@ -26,9 +27,7 @@ buildPythonPackage rec { hash = "sha256-ka/VT7c72la4z/BVAWnV06MxVmu52ZcJ4GsEeP7vbKA="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ aiohttp @@ -43,9 +42,7 @@ buildPythonPackage rec { syrupy ]; - pythonImportsCheck = [ - "nextdns" - ]; + pythonImportsCheck = [ "nextdns" ]; meta = with lib; { description = "Module for the NextDNS API";