From ea6add9ecb45377e554bf736ae443442f66a08fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 13 May 2025 12:10:12 -0700 Subject: [PATCH 1/3] python313Packages.directv: fix build --- pkgs/development/python-modules/directv/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/directv/default.nix b/pkgs/development/python-modules/directv/default.nix index 43a1a1d0e655..57913059cfb9 100644 --- a/pkgs/development/python-modules/directv/default.nix +++ b/pkgs/development/python-modules/directv/default.nix @@ -21,6 +21,12 @@ buildPythonPackage rec { sha256 = "19jckf6qvl8fwi8yff1qy8c44xdz3zpi1ip1md6zl2c503qc91mk"; }; + postPatch = '' + # TypeError: 'Timeout' object does not support the context manager protocol + substituteInPlace directv/directv.py \ + --replace-fail "with async_timeout.timeout" "async with async_timeout.timeout" + ''; + propagatedBuildInputs = [ aiohttp yarl From 1da7a2be0c4adf48349c8e47d14e61844b99c3eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 13 May 2025 12:11:53 -0700 Subject: [PATCH 2/3] python313Packages.directv: modernize --- .../python-modules/directv/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/directv/default.nix b/pkgs/development/python-modules/directv/default.nix index 57913059cfb9..4765f5786570 100644 --- a/pkgs/development/python-modules/directv/default.nix +++ b/pkgs/development/python-modules/directv/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, aiohttp, yarl, aresponses, @@ -12,13 +13,13 @@ buildPythonPackage rec { pname = "directv"; version = "0.4.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "ctalkington"; repo = "python-directv"; - rev = version; - sha256 = "19jckf6qvl8fwi8yff1qy8c44xdz3zpi1ip1md6zl2c503qc91mk"; + tag = version; + hash = "sha256-s4bE8ACFCfpNq+HGEO8fv3VCGPI4OOdR5A7RjY2bTKY="; }; postPatch = '' @@ -27,7 +28,9 @@ buildPythonPackage rec { --replace-fail "with async_timeout.timeout" "async with async_timeout.timeout" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aiohttp yarl ]; @@ -45,10 +48,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "directv" ]; - meta = with lib; { + meta = { + changelog = "https://github.com/ctalkington/python-directv/releases/tag/${src.tag}"; description = "Asynchronous Python client for DirecTV (SHEF)"; homepage = "https://github.com/ctalkington/python-directv"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; }; } From 6c4d8d061bdf358a1b47b79d6cb3f1fb47277ceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 15 May 2025 09:18:44 -0700 Subject: [PATCH 3/3] python3Packages.directv: fix tests on Darwin --- pkgs/development/python-modules/directv/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/directv/default.nix b/pkgs/development/python-modules/directv/default.nix index 4765f5786570..dfc205beb077 100644 --- a/pkgs/development/python-modules/directv/default.nix +++ b/pkgs/development/python-modules/directv/default.nix @@ -41,6 +41,8 @@ buildPythonPackage rec { pytestCheckHook ]; + __darwinAllowLocalNetworking = true; + disabledTests = [ # ValueError: Host '#' cannot contain '#' (at position 0) "test_client_error"