From 920b92bdbb06ad456cd4193ac7d2c4fb31b15439 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 25 Oct 2024 09:58:44 +0200 Subject: [PATCH] python311Packages.xhtml2pdf: fix build - Remove the patch, it was already included in 0.2.16. - Remove `pythonRelaxDeps`, it's not needed anymore --- .../python-modules/xhtml2pdf/default.nix | 22 +++++-------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix index 73ac283ca349a5..fa05dc938d7e99 100644 --- a/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -3,7 +3,6 @@ arabic-reshaper, buildPythonPackage, fetchFromGitHub, - fetchpatch2, html5lib, pillow, pyhanko, @@ -31,22 +30,11 @@ buildPythonPackage rec { hash = "sha256-sva1Oqz4FsLz/www8IPVxol3D0hx5F5hQ0I/rSRP9sE="; }; - patches = [ - # https://github.com/xhtml2pdf/xhtml2pdf/pull/754 - (fetchpatch2 { - name = "reportlab-compat.patch"; - url = "https://github.com/xhtml2pdf/xhtml2pdf/commit/1252510bd23b833b45b4d252aeac62c1eb51eeef.patch"; - hash = "sha256-9Fkn086uh2biabmiChbBna8Q4lJV/604yX1ng9j5TGs="; - }) - ]; - nativeBuildInputs = [ setuptools ]; - pythonRelaxDeps = [ "reportlab" ]; - - propagatedBuildInputs = [ + dependencies = [ arabic-reshaper html5lib pillow @@ -71,12 +59,12 @@ buildPythonPackage rec { "xhtml2pdf.pisa" ]; - meta = with lib; { + meta = { + changelog = "https://github.com/xhtml2pdf/xhtml2pdf/releases/tag/v${version}"; description = "PDF generator using HTML and CSS"; homepage = "https://github.com/xhtml2pdf/xhtml2pdf"; - changelog = "https://github.com/xhtml2pdf/xhtml2pdf/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = [ ]; + license = lib.licenses.asl20; mainProgram = "xhtml2pdf"; + maintainers = with lib.maintainers; [ drupol ]; }; }