From 0d7a058a1c0931de7218d3d145b0256a22be4936 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Jul 2022 13:29:18 +0000 Subject: [PATCH 1/2] python310Packages.dominate: 2.6.0 -> 2.7.0 --- pkgs/development/python-modules/dominate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dominate/default.nix b/pkgs/development/python-modules/dominate/default.nix index 3f0cca295dcb..61662c596fd4 100644 --- a/pkgs/development/python-modules/dominate/default.nix +++ b/pkgs/development/python-modules/dominate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dominate"; - version = "2.6.0"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "76ec2cde23700a6fc4fee098168b9dee43b99c2f1dd0ca6a711f683e8eb7e1e4"; + sha256 = "sha256-UgEBNgiS6/nQVT9n0341n/kkA9ih4zgUAwUDCIoF2kk="; }; doCheck = !isPy3k; From f5c80b0c0f432a87245c1d3375de2d1300bd11c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Jul 2022 09:01:10 +0200 Subject: [PATCH 2/2] python310Packages.dominate: switch to pytestCheckHook - add pythonImportsCheck - specify license - update description --- .../python-modules/dominate/default.nix | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/dominate/default.nix b/pkgs/development/python-modules/dominate/default.nix index 61662c596fd4..aa840dc9ff51 100644 --- a/pkgs/development/python-modules/dominate/default.nix +++ b/pkgs/development/python-modules/dominate/default.nix @@ -1,20 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "dominate"; version = "2.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UgEBNgiS6/nQVT9n0341n/kkA9ih4zgUAwUDCIoF2kk="; + hash = "sha256-UgEBNgiS6/nQVT9n0341n/kkA9ih4zgUAwUDCIoF2kk="; }; - doCheck = !isPy3k; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "dominate" + ]; meta = with lib; { + description = "Library for creating and manipulating HTML documents using an elegant DOM API"; homepage = "https://github.com/Knio/dominate/"; - description = "Dominate is a Python library for creating and manipulating HTML documents using an elegant DOM API"; - license = licenses.lgpl3; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ ]; }; }