From bd383ac0e3a51cf5d3b5c102bbef6745c976a0cb Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 29 May 2025 23:43:48 +0200 Subject: [PATCH] python312Packages.weasyprint: cleanup --- .../python-modules/weasyprint/default.nix | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index 696bee47ac5f..1061e7e56f47 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -1,26 +1,32 @@ { - stdenv, lib, + stdenv, pkgs, buildPythonPackage, - cffi, - cssselect2, - fetchPypi, - flit-core, + fetchFromGitHub, fontconfig, - fonttools, glib, harfbuzz, pango, + + # build-system + flit-core, + + # dependencies + cffi, + cssselect2, + fonttools, pillow, pydyf, pyphen, - pytest-cov-stub, - pytestCheckHook, - pythonOlder, - replaceVars, tinycss2, tinyhtml5, + + # tests + pytest-cov-stub, + pytestCheckHook, + replaceVars, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { @@ -28,12 +34,11 @@ buildPythonPackage rec { version = "65.1"; pyproject = true; - disabled = pythonOlder "3.9"; - - src = fetchPypi { - inherit version; - pname = "weasyprint"; - hash = "sha256-EgKBvb1C/6p9flztvjGCos7zbqWtl/6fNX5DvmoeWOo="; + src = fetchFromGitHub { + owner = "Kozea"; + repo = "WeasyPrint"; + tag = "v${version}"; + hash = "sha256-iSeuRX1dnnrGZbcb1yTxOJPD5kgIWY6oz/0v02QJqSs="; }; patches = [ @@ -64,6 +69,7 @@ buildPythonPackage rec { pkgs.ghostscript pytest-cov-stub pytestCheckHook + writableTmpDirAsHomeHook ]; disabledTests = [ @@ -93,11 +99,6 @@ buildPythonPackage rec { # Set env variable explicitly for Darwin, but allow overriding when invoking directly makeWrapperArgs = [ "--set-default FONTCONFIG_FILE ${FONTCONFIG_FILE}" ]; - preCheck = '' - # Fontconfig wants to create a cache. - export HOME=$TMPDIR - ''; - pythonImportsCheck = [ "weasyprint" ]; meta = {