From a7c30eb7cec5c1dbea57de7f7a2a1e32fc3e38ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Jan 2024 04:05:16 +0000 Subject: [PATCH 1/2] python310Packages.pycaption: 2.2.0 -> 2.2.1 --- pkgs/development/python-modules/pycaption/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix index db90dcce9492..833eb9f6b088 100644 --- a/pkgs/development/python-modules/pycaption/default.nix +++ b/pkgs/development/python-modules/pycaption/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pycaption"; - version = "2.2.0"; + version = "2.2.1"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-W/sD/Nh2k1z7YvFVnQB9dGa1bXoCTb4QrPk/1mi4Hdk="; + hash = "sha256-fYhxHC2pQD16GF6fm7ZiyljaLtORa0yuV9hcKntzPAI="; }; propagatedBuildInputs = [ From 1608e01ab4092cf9519bc826a0f71475c9cfd06e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 10 Jan 2024 04:24:10 -0800 Subject: [PATCH 2/2] python311Packages.pycaption: refactor --- .../python-modules/pycaption/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix index 833eb9f6b088..7df7ed1f70ad 100644 --- a/pkgs/development/python-modules/pycaption/default.nix +++ b/pkgs/development/python-modules/pycaption/default.nix @@ -1,7 +1,8 @@ { lib , buildPythonPackage , pythonOlder -, fetchPypi +, fetchFromGitHub +, setuptools , beautifulsoup4 , lxml , cssutils @@ -16,13 +17,19 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-fYhxHC2pQD16GF6fm7ZiyljaLtORa0yuV9hcKntzPAI="; + src = fetchFromGitHub { + owner = "pbs"; + repo = "pycaption"; + rev = version; + hash = "sha256-IPCU9MsBY+Vsk6SrR9+3j4Izfhw5LeUrK0KUa3seSs4="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ beautifulsoup4 lxml @@ -38,8 +45,6 @@ buildPythonPackage rec { pytestCheckHook ]; - doCheck = false; - meta = with lib; { changelog = "https://github.com/pbs/pycaption/blob/${version}/docs/changelog.rst"; description = "Closed caption converter";