From dac41491e8329c92dbd9e46415660b988d19f437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 10 Feb 2025 15:10:12 +0100 Subject: [PATCH 01/11] python313Packages.marshmallow: 3.21.1 -> 3.26.1 netapp-ontap requires at least 3.21.3 --- pkgs/development/python-modules/marshmallow/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index f062aafee9e9..4b67ac402089 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -5,23 +5,19 @@ flit-core, packaging, pytestCheckHook, - pythonOlder, - pytz, simplejson, }: buildPythonPackage rec { pname = "marshmallow"; - version = "3.21.1"; + version = "3.26.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "marshmallow-code"; repo = "marshmallow"; tag = version; - hash = "sha256-KhXasYKooZRokRoFlWKOaQzSUe6tXDtUlrf65eGGUi8="; + hash = "sha256-l5pEhv8D6jRlU24SlsGQEkXda/b7KUdP9mAqrZCbl38="; }; nativeBuildInputs = [ flit-core ]; @@ -30,7 +26,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytz simplejson ]; From b22a08744b284084181fe6170c73369a3d2f73c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 10 Feb 2025 15:14:46 +0100 Subject: [PATCH 02/11] python313Packages.netapp-ontap: cleanup dependencies, update homepage --- pkgs/development/python-modules/netapp-ontap/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/netapp-ontap/default.nix b/pkgs/development/python-modules/netapp-ontap/default.nix index af38e04ce87e..f4d2e29a2396 100644 --- a/pkgs/development/python-modules/netapp-ontap/default.nix +++ b/pkgs/development/python-modules/netapp-ontap/default.nix @@ -1,11 +1,9 @@ { lib, buildPythonPackage, - cliche, fetchPypi, marshmallow, pythonOlder, - recline, requests, requests-toolbelt, setuptools, @@ -32,9 +30,6 @@ buildPythonPackage rec { requests requests-toolbelt urllib3 - # required for cli - cliche - recline ]; # No tests in sdist and no other download available @@ -44,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for working with ONTAP's REST APIs simply in Python"; - homepage = "https://devnet.netapp.com/restapi.php"; + homepage = "https://library.netapp.com/ecmdocs/ECMLP3331665/html/index.html"; license = licenses.bsd3; maintainers = with maintainers; [ SuperSandro2000 ]; mainProgram = "ontap-cli"; From 30d200056dccc0164f9420efe715b3f347527d6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 10 Feb 2025 17:54:19 +0100 Subject: [PATCH 03/11] ansible-doctor: fix build by removing outdated rm --- pkgs/tools/admin/ansible/doctor.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/tools/admin/ansible/doctor.nix b/pkgs/tools/admin/ansible/doctor.nix index 31468f7e9ffa..7f73118ba3db 100644 --- a/pkgs/tools/admin/ansible/doctor.nix +++ b/pkgs/tools/admin/ansible/doctor.nix @@ -46,10 +46,6 @@ python3.pkgs.buildPythonApplication rec { ruamel-yaml ]; - postInstall = '' - rm $out/lib/python*/site-packages/LICENSE - ''; - # Module has no tests doCheck = false; From 1f866cbd88b5b3cf5e0ad8613a91badea28dde8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 10 Feb 2025 19:03:50 +0100 Subject: [PATCH 04/11] python313Packages.webtest-aiohttp: fix build by replacing removed loop pytest fixture with event_loop --- pkgs/development/python-modules/webtest-aiohttp/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/webtest-aiohttp/default.nix b/pkgs/development/python-modules/webtest-aiohttp/default.nix index 228dab2dae80..4958b0d53ebc 100644 --- a/pkgs/development/python-modules/webtest-aiohttp/default.nix +++ b/pkgs/development/python-modules/webtest-aiohttp/default.nix @@ -32,6 +32,12 @@ buildPythonPackage rec { }) ]; + postPatch = '' + substituteInPlace test_webtest_aiohttp.py \ + --replace-fail '(app, loop)' '(app, event_loop)' \ + --replace-fail 'WebTestApp(app, loop=loop)' 'WebTestApp(app, loop=event_loop)' + ''; + propagatedBuildInputs = [ webtest ]; nativeCheckInputs = [ From e512915e2a16762b1827e498ea35be4613762cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 10 Feb 2025 19:10:49 +0100 Subject: [PATCH 05/11] python313Packages.aiohttp-apispec: fix build by replacing removed loop pytest fixture with event_loop --- pkgs/development/python-modules/aiohttp-apispec/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/aiohttp-apispec/default.nix b/pkgs/development/python-modules/aiohttp-apispec/default.nix index 95d1ee3d3010..f0aa60cd4028 100644 --- a/pkgs/development/python-modules/aiohttp-apispec/default.nix +++ b/pkgs/development/python-modules/aiohttp-apispec/default.nix @@ -26,6 +26,12 @@ buildPythonPackage rec { hash = "sha256-C+/M25oCLTNGGEUj2EyXn3UjcvPvDYFmmUW8IOoF1uU="; }; + postPatch = '' + substituteInPlace tests/conftest.py \ + --replace-fail 'aiohttp_app(loop,' 'aiohttp_app(event_loop,' \ + --replace-fail 'return loop.run_until_complete' 'return event_loop.run_until_complete' + ''; + propagatedBuildInputs = [ aiohttp apispec From 076b4aacee63188aa2bbb9d87e5665698df76e94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 10 Feb 2025 19:11:18 +0100 Subject: [PATCH 06/11] python313Packages.aiohttp-apispec: general cleanup --- .../python-modules/aiohttp-apispec/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp-apispec/default.nix b/pkgs/development/python-modules/aiohttp-apispec/default.nix index f0aa60cd4028..ec0b6391daa4 100644 --- a/pkgs/development/python-modules/aiohttp-apispec/default.nix +++ b/pkgs/development/python-modules/aiohttp-apispec/default.nix @@ -9,20 +9,21 @@ pytest-aiohttp, pytestCheckHook, pythonOlder, + setuptools, webargs, }: buildPythonPackage rec { pname = "aiohttp-apispec"; version = "3.0.0b2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "maximdanilchenko"; - repo = pname; - rev = "v${version}"; + repo = "aiohttp-apispec"; + tag = "v${version}"; hash = "sha256-C+/M25oCLTNGGEUj2EyXn3UjcvPvDYFmmUW8IOoF1uU="; }; @@ -32,7 +33,9 @@ buildPythonPackage rec { --replace-fail 'return loop.run_until_complete' 'return event_loop.run_until_complete' ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aiohttp apispec jinja2 From b7d2ed75ccff8834f00c6abf5abebe8ad30bd35f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 10 Feb 2025 19:11:31 +0100 Subject: [PATCH 07/11] python313Packages.webtest-aiohttp: general cleanup --- .../python-modules/webtest-aiohttp/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/webtest-aiohttp/default.nix b/pkgs/development/python-modules/webtest-aiohttp/default.nix index 4958b0d53ebc..0f915980724c 100644 --- a/pkgs/development/python-modules/webtest-aiohttp/default.nix +++ b/pkgs/development/python-modules/webtest-aiohttp/default.nix @@ -6,21 +6,19 @@ fetchpatch, pytest-aiohttp, pytestCheckHook, - pythonOlder, + setuptools, webtest, }: buildPythonPackage rec { pname = "webtest-aiohttp"; version = "2.0.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchFromGitHub { owner = "sloria"; - repo = pname; - rev = version; + repo = "webtest-aiohttp"; + tag = version; hash = "sha256-UuAz/k/Tnumupv3ybFR7PkYHwG3kH7M5oobZykEP+ao="; }; @@ -38,7 +36,9 @@ buildPythonPackage rec { --replace-fail 'WebTestApp(app, loop=loop)' 'WebTestApp(app, loop=event_loop)' ''; - propagatedBuildInputs = [ webtest ]; + build-system = [ setuptools ]; + + dependencies = [ webtest ]; nativeCheckInputs = [ aiohttp From 7b0efc17edfb871fcb184a9e8e2cec28ab91fbea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 10 Feb 2025 19:23:43 +0100 Subject: [PATCH 08/11] libtorrent-rasterbar-1_2_x: fix build by using older boost --- pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix b/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix index 9bc236b5ec3c..b04840fb6a95 100644 --- a/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix +++ b/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook -, zlib, boost, openssl, python311, libiconv, ncurses, darwin +, zlib, boost186, openssl, python311, libiconv, ncurses, darwin , boost-build }: @@ -8,7 +8,7 @@ let # Make sure we override python, so the correct version is chosen # for the bindings, if overridden - boostPython = boost.override (_: { + boostPython = boost186.override (_: { enablePython = true; python = python311; enableStatic = true; From 7ec5e385ef4473f11dc49482d006054fed7d182e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 11 Feb 2025 13:48:34 +0100 Subject: [PATCH 09/11] python313Packages.private-gpt: fix dependencies --- pkgs/development/python-modules/private-gpt/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/private-gpt/default.nix b/pkgs/development/python-modules/private-gpt/default.nix index 827c02e36797..d814ad05ab5e 100644 --- a/pkgs/development/python-modules/private-gpt/default.nix +++ b/pkgs/development/python-modules/private-gpt/default.nix @@ -8,6 +8,7 @@ poetry-core, # dependencies + cryptography, docx2txt, fastapi, injector, @@ -16,7 +17,6 @@ python-multipart, pyyaml, transformers, - uvicorn, watchdog, # optional-dependencies @@ -48,9 +48,11 @@ buildPythonPackage rec { "llama-index-core" "llama-index-readers-file" "python-multipart" + "watchdog" ]; dependencies = [ + cryptography docx2txt fastapi injector @@ -59,7 +61,6 @@ buildPythonPackage rec { python-multipart pyyaml transformers - uvicorn watchdog ] ++ lib.flatten (builtins.attrValues optional-dependencies); From 4f4a5b83d7eb1c242a0cbb9b16d8b1a2ba4ad36f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 11 Feb 2025 15:11:41 +0100 Subject: [PATCH 10/11] python313Packages.htmlmin: mark broken on python 3.13 --- pkgs/development/python-modules/htmlmin/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/htmlmin/default.nix b/pkgs/development/python-modules/htmlmin/default.nix index fd19103e41ac..be5f6c485cfa 100644 --- a/pkgs/development/python-modules/htmlmin/default.nix +++ b/pkgs/development/python-modules/htmlmin/default.nix @@ -2,12 +2,14 @@ lib, buildPythonPackage, fetchPypi, + pythonAtLeast, }: buildPythonPackage rec { pname = "htmlmin"; version = "0.1.12"; format = "setuptools"; + src = fetchPypi { inherit pname version; sha256 = "50c1ef4630374a5d723900096a961cff426dff46b48f34d194a81bbe14eca178"; @@ -22,5 +24,6 @@ buildPythonPackage rec { homepage = "https://pypi.python.org/pypi/htmlmin"; license = licenses.bsd3; maintainers = [ ]; + broken = pythonAtLeast "3.13"; # requires removed cgi module }; } From 78e4c32395829655f9640f2d6c30c8dada7af609 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 11 Feb 2025 15:11:51 +0100 Subject: [PATCH 11/11] python313Packages.type-infer: mark broken --- pkgs/development/python-modules/type-infer/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/type-infer/default.nix b/pkgs/development/python-modules/type-infer/default.nix index 80bc703c8405..cf940f9727ad 100644 --- a/pkgs/development/python-modules/type-infer/default.nix +++ b/pkgs/development/python-modules/type-infer/default.nix @@ -87,5 +87,7 @@ buildPythonPackage rec { homepage = "https://github.com/mindsdb/type_infer"; license = licenses.gpl3Only; maintainers = with maintainers; [ mbalatsko ]; + # ModuleNotFoundError: No module named 'imghdr', unrelated + broken = true; }; }