From 3bc7f6ab37f6a768aee43bc571ee6e1fb3fa2871 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Jan 2025 12:19:57 +0100 Subject: [PATCH 1/4] python312Packages.fe25519: refactor --- pkgs/development/python-modules/fe25519/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/fe25519/default.nix b/pkgs/development/python-modules/fe25519/default.nix index 4f47b634030e..8e8435c8165b 100644 --- a/pkgs/development/python-modules/fe25519/default.nix +++ b/pkgs/development/python-modules/fe25519/default.nix @@ -8,13 +8,12 @@ pytestCheckHook, pythonOlder, setuptools, - wheel, }: buildPythonPackage rec { pname = "fe25519"; version = "1.5.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -23,12 +22,9 @@ buildPythonPackage rec { hash = "sha256-la+17tPHjceMTe7Wk8DGVaSptk8XJa+l7GTeqLIFDvs="; }; - nativeBuildInputs = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ bitlist fountains parts From 699ce1676cb43bf908415410b904848e1fa545e1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Jan 2025 12:21:44 +0100 Subject: [PATCH 2/4] python312Packages.ge25519: refactor --- pkgs/development/python-modules/ge25519/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/ge25519/default.nix b/pkgs/development/python-modules/ge25519/default.nix index d3e92913b128..24d2d4f15030 100644 --- a/pkgs/development/python-modules/ge25519/default.nix +++ b/pkgs/development/python-modules/ge25519/default.nix @@ -9,13 +9,12 @@ pytestCheckHook, pythonOlder, setuptools, - wheel, }: buildPythonPackage rec { pname = "ge25519"; version = "1.5.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -24,12 +23,9 @@ buildPythonPackage rec { hash = "sha256-VKDPiSdufWwrNcZSRTByFU4YGoJrm48TDm1nt4VyclA="; }; - nativeBuildInputs = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ fe25519 parts bitlist From b3c1431629dd12d44e3e0b5a290df5b6addef2da Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Jan 2025 12:27:01 +0100 Subject: [PATCH 3/4] python312Packages.fe25519: migrate to pytest-cov-stub --- pkgs/development/python-modules/fe25519/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/fe25519/default.nix b/pkgs/development/python-modules/fe25519/default.nix index 8e8435c8165b..a19efc6be1c6 100644 --- a/pkgs/development/python-modules/fe25519/default.nix +++ b/pkgs/development/python-modules/fe25519/default.nix @@ -5,6 +5,7 @@ fetchPypi, fountains, parts, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools, @@ -30,12 +31,10 @@ buildPythonPackage rec { parts ]; - nativeCheckInputs = [ pytestCheckHook ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "--doctest-modules --ignore=docs --cov=fe25519 --cov-report term-missing" "" - ''; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "fe25519" ]; From d98510f4c69b986eeb0eb2eb610fcfd9a77240b4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Jan 2025 12:29:02 +0100 Subject: [PATCH 4/4] python312Packages.ge25519: migrate to pytest-cov-stub --- pkgs/development/python-modules/ge25519/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/ge25519/default.nix b/pkgs/development/python-modules/ge25519/default.nix index 24d2d4f15030..d8bf085d7142 100644 --- a/pkgs/development/python-modules/ge25519/default.nix +++ b/pkgs/development/python-modules/ge25519/default.nix @@ -6,6 +6,7 @@ fetchPypi, fountains, parts, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools, @@ -32,12 +33,10 @@ buildPythonPackage rec { fountains ]; - nativeCheckInputs = [ pytestCheckHook ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "--doctest-modules --ignore=docs --cov=ge25519 --cov-report term-missing" "" - ''; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "ge25519" ];