From 0939e71a7f8e7e7a68b7b9f9d71f45079275f40d Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 10 Jan 2025 22:40:52 +0900 Subject: [PATCH 1/2] python312Packages.freetype-py: 2.1.0.post1 -> 2.3.0 freetype-py 2.4.0 breaks fontbakery --- .../python-modules/freetype-py/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/freetype-py/default.nix b/pkgs/development/python-modules/freetype-py/default.nix index 5ec8f6c1b0ff..d8722ae7f0e8 100644 --- a/pkgs/development/python-modules/freetype-py/default.nix +++ b/pkgs/development/python-modules/freetype-py/default.nix @@ -11,12 +11,13 @@ buildPythonPackage rec { pname = "freetype-py"; - version = "2.1.0.post1"; + version = "2.3.0"; format = "setuptools"; src = fetchPypi { - inherit pname version; - sha256 = "1k62fx53qrv9nb73mpqi2r11wzbx41qfv5qppvh6rylywnrknf3n"; + inherit pname version; + hash = "sha256-+bZM4ycqXDWNzugkgAoy1wmX+4cqCWWlV63KIPznpdA="; + extension = "zip"; }; patches = [ @@ -26,6 +27,11 @@ buildPythonPackage rec { }) ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail ', "certifi", "cmake"' "" + ''; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ freetype ]; From 817fab270c14f395616d58653ff84280321edabb Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 10 Jan 2025 22:46:55 +0900 Subject: [PATCH 2/2] python312Packages.freetype-py: refactor --- .../python-modules/freetype-py/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/freetype-py/default.nix b/pkgs/development/python-modules/freetype-py/default.nix index d8722ae7f0e8..58fc8c10a93f 100644 --- a/pkgs/development/python-modules/freetype-py/default.nix +++ b/pkgs/development/python-modules/freetype-py/default.nix @@ -3,7 +3,8 @@ stdenv, buildPythonPackage, fetchPypi, - substituteAll, + replaceVars, + setuptools, setuptools-scm, freetype, pytestCheckHook, @@ -12,17 +13,16 @@ buildPythonPackage rec { pname = "freetype-py"; version = "2.3.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit pname version; hash = "sha256-+bZM4ycqXDWNzugkgAoy1wmX+4cqCWWlV63KIPznpdA="; extension = "zip"; }; patches = [ - (substituteAll { - src = ./library-paths.patch; + (replaceVars ./library-paths.patch { freetype = "${freetype.out}/lib/libfreetype${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; @@ -32,9 +32,12 @@ buildPythonPackage rec { --replace-fail ', "certifi", "cmake"' "" ''; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ freetype ]; + dependencies = [ freetype ]; preCheck = '' cd tests @@ -44,10 +47,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "freetype" ]; - meta = with lib; { + meta = { homepage = "https://github.com/rougier/freetype-py"; description = "FreeType (high-level Python API)"; - license = licenses.bsd3; - maintainers = with maintainers; [ goertzenator ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ goertzenator ]; }; }