From 2c7b66f91d811089403b891b174fdd179bc3e448 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Feb 2023 09:43:31 +0100 Subject: [PATCH 1/2] python310Packages.tld: 0.12.6 -> 0.12.7 --- pkgs/development/python-modules/tld/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix index a19858c46e7b..48288a68ab57 100644 --- a/pkgs/development/python-modules/tld/default.nix +++ b/pkgs/development/python-modules/tld/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "tld"; - version = "0.12.6"; + version = "0.12.7"; src = fetchPypi { inherit pname version; - sha256 = "69fed19d26bb3f715366fb4af66fdeace896c55c052b00e8aaba3a7b63f3e7f0"; + sha256 = "sha256-tvdynhnODrx3ugpltw1iE665UsAf9gXhKZquX7diHF4="; }; nativeCheckInputs = [ From 3cd742a408606f5edb5b44df95a6c6a4124e6a19 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Feb 2023 09:47:17 +0100 Subject: [PATCH 2/2] python310Packages.tld: add changelog to meta - disable on unsupported Python relases --- .../python-modules/tld/default.nix | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix index 48288a68ab57..2166be051172 100644 --- a/pkgs/development/python-modules/tld/default.nix +++ b/pkgs/development/python-modules/tld/default.nix @@ -4,34 +4,45 @@ , faker , fetchPypi , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "tld"; version = "0.12.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-tvdynhnODrx3ugpltw1iE665UsAf9gXhKZquX7diHF4="; + hash = "sha256-tvdynhnODrx3ugpltw1iE665UsAf9gXhKZquX7diHF4="; }; nativeCheckInputs = [ - factory_boy - faker pytestCheckHook ]; - # these tests require network access, but disabledTestPaths doesn't work. - # the file needs to be `import`ed by another python test file, so it + checkInputs = [ + factory_boy + faker + ]; + + # These tests require network access, but disabledTestPaths doesn't work. + # the file needs to be `import`ed by another Python test file, so it # can't simply be removed. preCheck = '' echo > src/tld/tests/test_commands.py ''; - pythonImportsCheck = [ "tld" ]; + + pythonImportsCheck = [ + "tld" + ]; meta = with lib; { - homepage = "https://github.com/barseghyanartur/tld"; description = "Extracts the top level domain (TLD) from the URL given"; + homepage = "https://github.com/barseghyanartur/tld"; + changelog = "https://github.com/barseghyanartur/tld/blob/${version}/CHANGELOG.rst"; # https://github.com/barseghyanartur/tld/blob/master/README.rst#license # MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later license = with licenses; [ lgpl21Plus mpl11 gpl2Only ];