From cc3f01efc1ec9afb48b9ae2a0ca2b085558e4196 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Apr 2024 10:48:31 +0200 Subject: [PATCH 1/3] rst2html5: 2.0 -> 2.0.1 --- pkgs/by-name/rs/rst2html5/package.nix | 29 ++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/rs/rst2html5/package.nix b/pkgs/by-name/rs/rst2html5/package.nix index 82def912da99..67aecab19996 100644 --- a/pkgs/by-name/rs/rst2html5/package.nix +++ b/pkgs/by-name/rs/rst2html5/package.nix @@ -1,26 +1,41 @@ -{ lib, python3Packages, fetchPypi }: +{ lib +, python3 +, fetchPypi +}: -python3Packages.buildPythonPackage rec { +python3.pkgs.buildPythonPackage rec { pname = "rst2html5"; - version = "2.0"; + version = "2.0.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Ejjja/fm6wXTf9YtjCYZsNDB8X5oAtyPoUIsYFDuZfc="; + hash = "sha256-MJmYyF+rAo8vywGizNyIbbCvxDmCYueVoC6pxNDzKuk="; }; - buildInputs = with python3Packages; [ + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ beautifulsoup4 docutils genshi pygments ]; + # Tests are not shipped as PyPI releases + doCheck = false; + + pythonImportsCheck = [ + "rst2html5" + ]; + meta = with lib;{ - homepage = "https://rst2html5.readthedocs.io/en/latest/"; description = "Converts ReSTructuredText to (X)HTML5"; - mainProgram = "rst2html5"; + homepage = "https://rst2html5.readthedocs.io/"; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; + mainProgram = "rst2html5"; }; } From c0d4e83369bd8828ae43974e91bfde3dab299ea9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Apr 2024 10:48:52 +0200 Subject: [PATCH 2/3] rst2html5: refactor --- pkgs/by-name/rs/rst2html5/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rs/rst2html5/package.nix b/pkgs/by-name/rs/rst2html5/package.nix index 67aecab19996..17e814bfea3a 100644 --- a/pkgs/by-name/rs/rst2html5/package.nix +++ b/pkgs/by-name/rs/rst2html5/package.nix @@ -13,11 +13,11 @@ python3.pkgs.buildPythonPackage rec { hash = "sha256-MJmYyF+rAo8vywGizNyIbbCvxDmCYueVoC6pxNDzKuk="; }; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ poetry-core ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ beautifulsoup4 docutils genshi From f8565279a1c8382697809d849d2fc35c8edd0585 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Apr 2024 10:49:10 +0200 Subject: [PATCH 3/3] rst2html5: use nixfmt --- pkgs/by-name/rs/rst2html5/package.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/rs/rst2html5/package.nix b/pkgs/by-name/rs/rst2html5/package.nix index 17e814bfea3a..988484237490 100644 --- a/pkgs/by-name/rs/rst2html5/package.nix +++ b/pkgs/by-name/rs/rst2html5/package.nix @@ -1,6 +1,7 @@ -{ lib -, python3 -, fetchPypi +{ + lib, + python3, + fetchPypi, }: python3.pkgs.buildPythonPackage rec { @@ -13,9 +14,7 @@ python3.pkgs.buildPythonPackage rec { hash = "sha256-MJmYyF+rAo8vywGizNyIbbCvxDmCYueVoC6pxNDzKuk="; }; - build-system = with python3.pkgs; [ - poetry-core - ]; + build-system = with python3.pkgs; [ poetry-core ]; dependencies = with python3.pkgs; [ beautifulsoup4 @@ -27,11 +26,9 @@ python3.pkgs.buildPythonPackage rec { # Tests are not shipped as PyPI releases doCheck = false; - pythonImportsCheck = [ - "rst2html5" - ]; + pythonImportsCheck = [ "rst2html5" ]; - meta = with lib;{ + meta = with lib; { description = "Converts ReSTructuredText to (X)HTML5"; homepage = "https://rst2html5.readthedocs.io/"; license = licenses.mit;