From f960d7534c0a92a532fb5a483d49c200c4bb39cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Sep 2024 16:39:06 +0000 Subject: [PATCH 1/4] python312Packages.manimpango: 0.5.0 -> 0.6.0 --- pkgs/development/python-modules/manimpango/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index 8218dcce9a6c..7c285f8fff9a 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { version = "0.6.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ManimCommunity"; From fd1d12a791cdba5e8893f8734acad897ee596c56 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 21 Sep 2024 15:01:25 +0900 Subject: [PATCH 2/4] python312Packages.manimpango: switch to pypaBuildHook --- .../python-modules/manimpango/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index 7c285f8fff9a..d16c1dd29e6f 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -3,8 +3,8 @@ stdenv, buildPythonPackage, fetchFromGitHub, - python, pkg-config, + setuptools, pango, cython, AppKit, @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "manimpango"; version = "0.6.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -30,19 +30,22 @@ buildPythonPackage rec { buildInputs = [ pango ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; - propagatedBuildInputs = [ cython ]; + build-system = [ + setuptools + cython + ]; nativeCheckInputs = [ pytestCheckHook ]; + preCheck = '' + rm -r manimpango + ''; + postPatch = '' substituteInPlace setup.cfg \ --replace "--cov --no-cov-on-fail" "" ''; - preBuild = '' - ${python.pythonOnBuildForHost.interpreter} setup.py build_ext --inplace - ''; - pythonImportsCheck = [ "manimpango" ]; meta = with lib; { From 74b5aa68dc7428d0f82da368343fa69b5cbbe57e Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 21 Sep 2024 15:02:53 +0900 Subject: [PATCH 3/4] python312Packages.manimpango: add pytest-cov-stub to nativeCheckInputs --- .../development/python-modules/manimpango/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index d16c1dd29e6f..383dfd40f327 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -8,6 +8,7 @@ pango, cython, AppKit, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: @@ -35,17 +36,15 @@ buildPythonPackage rec { cython ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; preCheck = '' rm -r manimpango ''; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov --no-cov-on-fail" "" - ''; - pythonImportsCheck = [ "manimpango" ]; meta = with lib; { From 59053abdf68730d6a0cd7fed3d8db3602e58e625 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 21 Sep 2024 15:05:12 +0900 Subject: [PATCH 4/4] python312Packages.manimpango: stop pname misuse --- pkgs/development/python-modules/manimpango/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index 383dfd40f327..9197d44043e8 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ManimCommunity"; - repo = pname; + repo = "manimpango"; rev = "refs/tags/v${version}"; hash = "sha256-nN+XOnki8fG7URMy2Fhs2X+yNi8Y7wDo53d61xaRa3w="; };