From 9263c48e1ba662ecc1953ac1fd093baefaa2ed6a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 May 2024 13:19:03 +0200 Subject: [PATCH 1/2] python312Packages.html2text: refactor --- .../python-modules/html2text/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/html2text/default.nix b/pkgs/development/python-modules/html2text/default.nix index bda7879eab0a..51d13c960a29 100644 --- a/pkgs/development/python-modules/html2text/default.nix +++ b/pkgs/development/python-modules/html2text/default.nix @@ -10,29 +10,34 @@ buildPythonPackage rec { pname = "html2text"; version = "2024.2.26"; pyproject = true; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Alir3z4"; repo = "html2text"; rev = "refs/tags/${version}"; - sha256 = "sha256-1CLkTFR+/XQ428WjMF7wliyAG6CB+n8JSsLDdLHPO7I="; + hash = "sha256-1CLkTFR+/XQ428WjMF7wliyAG6CB+n8JSsLDdLHPO7I="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "html2text" ]; + pythonImportsCheck = [ + "html2text" + ]; meta = with lib; { - changelog = "https://github.com/Alir3z4/html2text/blob/${src.rev}/ChangeLog.rst"; description = "Turn HTML into equivalent Markdown-structured text"; homepage = "https://github.com/Alir3z4/html2text/"; + changelog = "https://github.com/Alir3z4/html2text/blob/${src.rev}/ChangeLog.rst"; license = licenses.gpl3Only; + maintainers = with maintainers; [ ]; mainProgram = "html2text"; - maintainers = [ ]; }; } From 94e8c64a87888c69d8dd770f640abb7cd327bee5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 May 2024 13:19:56 +0200 Subject: [PATCH 2/2] python312Packages.html2text: format with nixfmt --- .../python-modules/html2text/default.nix | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/html2text/default.nix b/pkgs/development/python-modules/html2text/default.nix index 51d13c960a29..236b312e343d 100644 --- a/pkgs/development/python-modules/html2text/default.nix +++ b/pkgs/development/python-modules/html2text/default.nix @@ -1,9 +1,10 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, pytestCheckHook -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + pytestCheckHook, + setuptools, }: buildPythonPackage rec { @@ -20,17 +21,11 @@ buildPythonPackage rec { hash = "sha256-1CLkTFR+/XQ428WjMF7wliyAG6CB+n8JSsLDdLHPO7I="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "html2text" - ]; + pythonImportsCheck = [ "html2text" ]; meta = with lib; { description = "Turn HTML into equivalent Markdown-structured text";