From 2f9440a68a11b5671bf2b4d130856c7b4d6229a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Apr 2024 13:52:57 +0200 Subject: [PATCH 1/3] python312Pacakges.arsenic: refactor --- .../python-modules/arsenic/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/arsenic/default.nix b/pkgs/development/python-modules/arsenic/default.nix index e2c929b25147..5e9e61b69150 100644 --- a/pkgs/development/python-modules/arsenic/default.nix +++ b/pkgs/development/python-modules/arsenic/default.nix @@ -5,7 +5,6 @@ , fetchFromGitHub , fetchpatch , poetry-core -, pytestCheckHook , pythonRelaxDepsHook , pythonOlder , structlog @@ -14,13 +13,13 @@ buildPythonPackage rec { pname = "arsenic"; version = "21.8"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "HENNGE"; - repo = pname; + repo = "arsenic"; rev = "refs/tags/${version}"; hash = "sha256-fsLo22PR9WdX2FazPgr8B8dFq6EM1LLTpRFGEm/ymCE="; }; @@ -39,21 +38,20 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - poetry-core pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + build-system = [ + poetry-core + ]; + + dependencies = [ aiohttp attrs structlog ]; - nativeCheckInputs = [ - pytestCheckHook - ]; - - # Depends on asyncio_extras which is not longer maintained + # Test depends on asyncio_extras which is not longer maintained doCheck = false; pythonImportsCheck = [ From e3ed848326507b24a5a91f2ddfd17a164fb5c850 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Apr 2024 13:53:41 +0200 Subject: [PATCH 2/3] python312Pacakges.arsenic: format with nixfmt --- .../python-modules/arsenic/default.nix | 37 ++++++++----------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/arsenic/default.nix b/pkgs/development/python-modules/arsenic/default.nix index 5e9e61b69150..590373a2438f 100644 --- a/pkgs/development/python-modules/arsenic/default.nix +++ b/pkgs/development/python-modules/arsenic/default.nix @@ -1,13 +1,14 @@ -{ lib -, aiohttp -, attrs -, buildPythonPackage -, fetchFromGitHub -, fetchpatch -, poetry-core -, pythonRelaxDepsHook -, pythonOlder -, structlog +{ + lib, + aiohttp, + attrs, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + poetry-core, + pythonRelaxDepsHook, + pythonOlder, + structlog, }: buildPythonPackage rec { @@ -33,17 +34,11 @@ buildPythonPackage rec { }) ]; - pythonRelaxDeps = [ - "structlog" - ]; + pythonRelaxDeps = [ "structlog" ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; dependencies = [ aiohttp @@ -54,9 +49,7 @@ buildPythonPackage rec { # Test depends on asyncio_extras which is not longer maintained doCheck = false; - pythonImportsCheck = [ - "arsenic" - ]; + pythonImportsCheck = [ "arsenic" ]; meta = with lib; { description = "WebDriver implementation for asyncio and asyncio-compatible frameworks"; From 3bab20cfca3bbcf6a8777efe209aba8bdb66c86b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Apr 2024 13:57:18 +0200 Subject: [PATCH 3/3] python312Packages.arsenic: add patch to replace distutils --- pkgs/development/python-modules/arsenic/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/arsenic/default.nix b/pkgs/development/python-modules/arsenic/default.nix index 590373a2438f..2d742f943f79 100644 --- a/pkgs/development/python-modules/arsenic/default.nix +++ b/pkgs/development/python-modules/arsenic/default.nix @@ -5,6 +5,7 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, + packaging, poetry-core, pythonRelaxDepsHook, pythonOlder, @@ -32,6 +33,12 @@ buildPythonPackage rec { url = "https://github.com/HENNGE/arsenic/commit/ca82894a5f1e832ab9283a245258b334bdd48855.patch"; hash = "sha256-ECCUaJF4MRmFOKH1C6HowJ+zmbEPPiS7h9DlKw5otZc="; }) + # Replace distutils with packaging, https://github.com/HENNGE/arsenic/pull/166 + (fetchpatch { + name = "replace-distutils.patch"; + url = "https://github.com/HENNGE/arsenic/commit/440faed7d2a8fbd635a135c007051ea494e72873.patch"; + hash = "sha256-QbOH6EdFKZxm1VaXRiTbJ3zIzEKVet9GUQDaJnmSNQw="; + }) ]; pythonRelaxDeps = [ "structlog" ]; @@ -43,6 +50,7 @@ buildPythonPackage rec { dependencies = [ aiohttp attrs + packaging structlog ];