From af48f8f0c69779b8074147cc7cf304c22901188b Mon Sep 17 00:00:00 2001 From: Jess Kay Date: Thu, 18 Jul 2024 23:06:27 +0100 Subject: [PATCH 1/4] python312Packages.brother-ql: switch to maintained fork Switches upstream to https://github.com/LunarEclipse363/brother_ql_next, and make the appropriate changes to version, format, and dependencies to follow upstream's changes. This fork incorporates the pillow patch that was previously required, so it has been removed. --- .../python-modules/brother-ql/default.nix | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/brother-ql/default.nix b/pkgs/development/python-modules/brother-ql/default.nix index ccf512a05db2..045ca469daf2 100644 --- a/pkgs/development/python-modules/brother-ql/default.nix +++ b/pkgs/development/python-modules/brother-ql/default.nix @@ -1,7 +1,7 @@ { fetchPypi, - fetchpatch, buildPythonPackage, + setuptools, future, packbits, pillow, @@ -10,36 +10,30 @@ mock, click, attrs, + jsons, lib, }: buildPythonPackage rec { pname = "brother-ql"; - version = "0.9.4"; - format = "setuptools"; + version = "0.11.1"; + format = "pyproject"; src = fetchPypi { - pname = "brother_ql"; + pname = "brother_ql_next"; inherit version; - hash = "sha256-H1xXoDnwEsnCBDl/RwAB9267dINCHr3phdDLPGFOhmA="; + hash = "sha256-jG8OvzDy2+2OpdVVixNguLsSwRbSIyvVEbVvorcgxfU="; }; propagatedBuildInputs = [ + setuptools future packbits pillow pyusb click attrs - ]; - - patches = [ - (fetchpatch { - # Make compatible with Pillow>=10.0; https://github.com/pklaus/brother_ql/pull/143 - name = "brother-ql-pillow10-compat.patch"; - url = "https://github.com/pklaus/brother_ql/commit/a7e1b94b41f3a6e0f8b365598bc34fb47ca95a6d.patch"; - hash = "sha256-v3YhmsUWBwE/Vli1SbTQO8q1zbtWYI9iMlVFvz5sxmg="; - }) + jsons ]; meta = with lib; { @@ -48,7 +42,7 @@ buildPythonPackage rec { Python package for the raster language protocol of the Brother QL series label printers (QL-500, QL-550, QL-570, QL-700, QL-710W, QL-720NW, QL-800, QL-820NWB, QL-1050 and more) ''; - homepage = "https://github.com/pklaus/brother_ql"; + homepage = "https://github.com/LunarEclipse363/brother_ql_next"; license = licenses.gpl3; maintainers = with maintainers; [ grahamc ]; mainProgram = "brother_ql"; From a2ca508592569366c94531bbd850b36a113228f6 Mon Sep 17 00:00:00 2001 From: Jessica Kay Date: Fri, 6 Sep 2024 15:18:57 +0100 Subject: [PATCH 2/4] python312Packages.brother-ql: 0.11.1 -> 0.11.2 --- pkgs/development/python-modules/brother-ql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/brother-ql/default.nix b/pkgs/development/python-modules/brother-ql/default.nix index 045ca469daf2..77988d86fa44 100644 --- a/pkgs/development/python-modules/brother-ql/default.nix +++ b/pkgs/development/python-modules/brother-ql/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "brother-ql"; - version = "0.11.1"; + version = "0.11.2"; format = "pyproject"; src = fetchPypi { pname = "brother_ql_next"; inherit version; - hash = "sha256-jG8OvzDy2+2OpdVVixNguLsSwRbSIyvVEbVvorcgxfU="; + hash = "sha256-3rTf+4W5KK7zSGIE3bBHXHE0hjyvpjB0IiEtbax6mkU="; }; propagatedBuildInputs = [ From fb8f922cc534153513ae96337e661649c1038d09 Mon Sep 17 00:00:00 2001 From: Jess Kay Date: Fri, 6 Sep 2024 22:43:47 +0100 Subject: [PATCH 3/4] python312Packages.brother-ql: Correct license from gpl3 to gpl3only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: éclairevoyant <848000+eclairevoyant@users.noreply.github.com> --- pkgs/development/python-modules/brother-ql/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/brother-ql/default.nix b/pkgs/development/python-modules/brother-ql/default.nix index 77988d86fa44..b1d27d882cdd 100644 --- a/pkgs/development/python-modules/brother-ql/default.nix +++ b/pkgs/development/python-modules/brother-ql/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { (QL-500, QL-550, QL-570, QL-700, QL-710W, QL-720NW, QL-800, QL-820NWB, QL-1050 and more) ''; homepage = "https://github.com/LunarEclipse363/brother_ql_next"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ grahamc ]; mainProgram = "brother_ql"; }; From 5bc1418a2b31c70a8c0b6f7aea8c8b8899c2b8ff Mon Sep 17 00:00:00 2001 From: Jess Kay Date: Fri, 6 Sep 2024 22:51:38 +0100 Subject: [PATCH 4/4] python312Packages.brother-ql: Use pypa infrastructure to build Co-authored-by: kirillrdy --- pkgs/development/python-modules/brother-ql/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/brother-ql/default.nix b/pkgs/development/python-modules/brother-ql/default.nix index b1d27d882cdd..fe305d140960 100644 --- a/pkgs/development/python-modules/brother-ql/default.nix +++ b/pkgs/development/python-modules/brother-ql/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "brother-ql"; version = "0.11.2"; - format = "pyproject"; + pyproject = true; src = fetchPypi { pname = "brother_ql_next";