From 4045aa876c9f941c8d09389058fb1a5de869ca27 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 27 Apr 2025 03:33:30 +0200 Subject: [PATCH 01/13] clairvoyance: unbreak with pythonRelaxDeps --- pkgs/by-name/cl/clairvoyance/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/cl/clairvoyance/package.nix b/pkgs/by-name/cl/clairvoyance/package.nix index f8bbe77a1402..c54c6db6bbe0 100644 --- a/pkgs/by-name/cl/clairvoyance/package.nix +++ b/pkgs/by-name/cl/clairvoyance/package.nix @@ -16,6 +16,8 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-CVXa2HvX7M0cwqnTeZVETg07j324ATQuMNreEgAC2QA="; }; + pythonRelaxDeps = [ "rich" ]; + nativeBuildInputs = with python3.pkgs; [ poetry-core ]; From 4905f36691b48ca527682763da44913322fd2a6d Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 27 Apr 2025 03:33:30 +0200 Subject: [PATCH 02/13] memtree: unbreak with pythonRelaxDeps --- pkgs/by-name/me/memtree/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/me/memtree/package.nix b/pkgs/by-name/me/memtree/package.nix index 7a6ed7a323af..cecc37df961c 100644 --- a/pkgs/by-name/me/memtree/package.nix +++ b/pkgs/by-name/me/memtree/package.nix @@ -17,6 +17,8 @@ python3Packages.buildPythonApplication { hash = "sha256-Ifp8hwkuyBw57fGer3GbDiJaRjL4TD3hzj+ecGXWqI0="; }; + pythonRelaxDeps = [ "rich" ]; + nativeBuildInputs = with python3Packages; [ poetry-core ]; From 54c9fb735ed45fcb5aa80962ab915fa241eeedef Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 27 Apr 2025 03:33:31 +0200 Subject: [PATCH 03/13] myfitnesspal: unbreak with pythonRelaxDeps --- pkgs/development/python-modules/myfitnesspal/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/myfitnesspal/default.nix b/pkgs/development/python-modules/myfitnesspal/default.nix index eec0de5766d5..79ff95e4a560 100644 --- a/pkgs/development/python-modules/myfitnesspal/default.nix +++ b/pkgs/development/python-modules/myfitnesspal/default.nix @@ -31,6 +31,8 @@ buildPythonPackage rec { hash = "sha256-eE807M8qFDlSMAcE+GFJyve1YfmlWmB3ML9VJhMUeIE="; }; + pythonRelaxDeps = [ "typing-extensions" ]; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ From 89f3e17f5fb739f1593acb31efe996908b0eec5a Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 27 Apr 2025 03:33:31 +0200 Subject: [PATCH 04/13] python313Packages.awswrangler: unbreak with pythonRelaxDeps --- pkgs/development/python-modules/awswrangler/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix index 9c614d27d542..dd1c755c047d 100644 --- a/pkgs/development/python-modules/awswrangler/default.nix +++ b/pkgs/development/python-modules/awswrangler/default.nix @@ -21,6 +21,7 @@ pythonOlder, redshift-connector, requests-aws4auth, + setuptools, }: buildPythonPackage rec { @@ -37,7 +38,10 @@ buildPythonPackage rec { hash = "sha256-dIdNrfhBrfrzXmspw25yd/y6MbXRrLfDveCQk+AERV0="; }; - pythonRelaxDeps = [ "packaging" ]; + pythonRelaxDeps = [ + "packaging" + "pyarrow" + ]; build-system = [ poetry-core ]; @@ -54,6 +58,7 @@ buildPythonPackage rec { pymysql redshift-connector requests-aws4auth + setuptools ]; optional-dependencies = { From d251222653394ff8a64ce8b285883d7033d793d2 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 27 Apr 2025 03:33:31 +0200 Subject: [PATCH 05/13] python313Packages.bilibili-api-python: unbreak with pythonRelaxDeps --- pkgs/development/python-modules/bilibili-api-python/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/bilibili-api-python/default.nix b/pkgs/development/python-modules/bilibili-api-python/default.nix index 79d7854d1edb..1f524dab9ce5 100644 --- a/pkgs/development/python-modules/bilibili-api-python/default.nix +++ b/pkgs/development/python-modules/bilibili-api-python/default.nix @@ -37,6 +37,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "beautifulsoup4" "lxml" + "pillow" ]; build-system = [ From 9530d7b9be82d327b1aca7e100aca07ac8b5fa82 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 27 Apr 2025 03:33:32 +0200 Subject: [PATCH 06/13] python313Packages.bloodyad: unbreak with pythonRelaxDeps --- pkgs/development/python-modules/bloodyad/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/bloodyad/default.nix b/pkgs/development/python-modules/bloodyad/default.nix index 1d56dee30547..2c148cc8fd54 100644 --- a/pkgs/development/python-modules/bloodyad/default.nix +++ b/pkgs/development/python-modules/bloodyad/default.nix @@ -28,6 +28,8 @@ buildPythonPackage rec { hash = "sha256-XqCP2GfS8hxlFU4Mndeh+7Ll2kXJ3Dei+AGp/oy0PUg="; }; + pythonRelaxDeps = [ "cryptography" ]; + build-system = [ hatchling ]; dependencies = [ From 1fa78f6be7ba4d8d604b9e124ef4295fa1c2ad38 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 27 Apr 2025 03:33:32 +0200 Subject: [PATCH 07/13] python313Packages.datamodel-code-generator: unbreak with pythonRelaxDeps --- .../python-modules/datamodel-code-generator/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/datamodel-code-generator/default.nix b/pkgs/development/python-modules/datamodel-code-generator/default.nix index d247304b8ee2..f4a8c4377666 100644 --- a/pkgs/development/python-modules/datamodel-code-generator/default.nix +++ b/pkgs/development/python-modules/datamodel-code-generator/default.nix @@ -35,7 +35,10 @@ buildPythonPackage rec { hash = "sha256-CYNEpQFIWR7i7I7YJ5q/34KNhtQ7cjya97Z0fyeO5g8="; }; - pythonRelaxDeps = [ "inflect" ]; + pythonRelaxDeps = [ + "inflect" + "isort" + ]; build-system = [ poetry-core From 39fbf9cb709c357e305edb07e8cae862992ffb15 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 27 Apr 2025 03:33:32 +0200 Subject: [PATCH 08/13] python313Packages.linien-common: unbreak with pythonRelaxDeps --- pkgs/development/python-modules/linien-common/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/linien-common/default.nix b/pkgs/development/python-modules/linien-common/default.nix index 18b2160d98a6..8220badafc79 100644 --- a/pkgs/development/python-modules/linien-common/default.nix +++ b/pkgs/development/python-modules/linien-common/default.nix @@ -31,7 +31,10 @@ buildPythonPackage rec { build-system = [ setuptools ]; - pythonRelaxDeps = [ "importlib-metadata" ]; + pythonRelaxDeps = [ + "importlib-metadata" + "numpy" + ]; dependencies = [ importlib-metadata From ca70ba25be6cc0cea19b1f13444ae0ac39597c58 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 27 Apr 2025 03:33:33 +0200 Subject: [PATCH 09/13] python313Packages.mistral-common: unbreak with pythonRelaxDeps --- .../python-modules/mistral-common/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/mistral-common/default.nix b/pkgs/development/python-modules/mistral-common/default.nix index 0ca7d66db6f1..c3b3ecabe620 100644 --- a/pkgs/development/python-modules/mistral-common/default.nix +++ b/pkgs/development/python-modules/mistral-common/default.nix @@ -25,12 +25,10 @@ buildPythonPackage rec { hash = "sha256-CvQSSrCdFAl2HpHsYWgUdogtRvlBjuqJCNOcASIuD2s="; }; - # relax dependencies - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail 'pillow = "^10.3.0"' 'pillow = ">=10.3.0"' \ - --replace-fail 'tiktoken = "^0.7.0"' 'tiktoken = ">=0.7.0"' \ - ''; + pythonRelaxDeps = [ + "pillow" + "tiktoken" + ]; build-system = [ poetry-core ]; From 0660f6e01cfef70119710337adeba0b6b3716662 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 27 Apr 2025 03:33:33 +0200 Subject: [PATCH 10/13] python313Packages.notifications-android-tv: unbreak with pythonRelaxDeps --- .../python-modules/notifications-android-tv/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/notifications-android-tv/default.nix b/pkgs/development/python-modules/notifications-android-tv/default.nix index ae5e5417d76c..ee52b7e54eab 100644 --- a/pkgs/development/python-modules/notifications-android-tv/default.nix +++ b/pkgs/development/python-modules/notifications-android-tv/default.nix @@ -23,6 +23,8 @@ buildPythonPackage rec { hash = "sha256-JUvxxVCiQtywAWU5AYnPm4SueIWIXkzLxPYveVXpc2E="; }; + pythonRelaxDeps = [ "httpx" ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ httpx ]; From f1da306515bbec78bf1fd364d4414c84284384cb Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 27 Apr 2025 03:33:33 +0200 Subject: [PATCH 11/13] python313Packages.pygount: unbreak with pythonRelaxDeps --- pkgs/development/python-modules/pygount/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pygount/default.nix b/pkgs/development/python-modules/pygount/default.nix index c6c01e6988d5..f6d8cd3d55e2 100644 --- a/pkgs/development/python-modules/pygount/default.nix +++ b/pkgs/development/python-modules/pygount/default.nix @@ -22,6 +22,8 @@ buildPythonPackage rec { hash = "sha256-PFqcSnJoGL4bXFy3hu3Iurbb8QK1NqCDs8aJmMxP4Hc="; }; + pythonRelaxDeps = [ "rich" ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ From d8e7795af25e48b89d43fe69cd73b1ace6e87e03 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 27 Apr 2025 03:33:34 +0200 Subject: [PATCH 12/13] python313Packages.sagemaker-core: unbreak with pythonRelaxDeps --- pkgs/development/python-modules/sagemaker-core/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/sagemaker-core/default.nix b/pkgs/development/python-modules/sagemaker-core/default.nix index 830451f1c4be..3f14d0c60b46 100644 --- a/pkgs/development/python-modules/sagemaker-core/default.nix +++ b/pkgs/development/python-modules/sagemaker-core/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { "boto3" "importlib-metadata" "mock" + "rich" ]; dependencies = [ From 2b1768ce7bb954989827963a6b2d4ad2998610ac Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 27 Apr 2025 03:33:34 +0200 Subject: [PATCH 13/13] unblob: unbreak with pythonRelaxDeps --- pkgs/by-name/un/unblob/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/un/unblob/package.nix b/pkgs/by-name/un/unblob/package.nix index 6bae7389f623..741d548a97f7 100644 --- a/pkgs/by-name/un/unblob/package.nix +++ b/pkgs/by-name/un/unblob/package.nix @@ -87,6 +87,8 @@ python3.pkgs.buildPythonApplication rec { "ubi-reader" ]; + pythonRelaxDeps = [ "rich" ]; + pythonImportsCheck = [ "unblob" ]; makeWrapperArgs = [